Tiff

src/ImageSharp/Formats/Tiff/Compression/Compressors/PackBitsCompressor.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.IO;
 using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.Memory;
@@ -10,7 +11,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff.Compression.Compressors
 {
     internal sealed class PackBitsCompressor : TiffBaseCompressor
     {
-        private IManagedByteBuffer pixelData;
+        private IMemoryOwner<byte> pixelData;
 
         public PackBitsCompressor(Stream output, MemoryAllocator allocator, int width, int bitsPerPixel)
             : base(output, allocator, width, bitsPerPixel)
@@ -24,7 +25,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff.Compression.Compressors
         public override void Initialize(int rowsPerStrip)
         {
             int additionalBytes = ((this.BytesPerRow + 126) / 127) + 1;
-            this.pixelData = this.Allocator.AllocateManagedByteBuffer(this.BytesPerRow + additionalBytes);
+            this.pixelData = this.Allocator.Allocate<byte>(this.BytesPerRow + additionalBytes);
         }
 
         /// <inheritdoc/>

src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColor{TPixel}.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.Buffers;
 using System.Numerics;
 using SixLabors.ImageSharp.Formats.Tiff.Utils;
 using SixLabors.ImageSharp.Memory;
@@ -46,7 +47,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff.PhotometricInterpretation
         /// <param name="top">The y-coordinate of the  top of the image block.</param>
         /// <param name="width">The width of the image block.</param>
         /// <param name="height">The height of the image block.</param>
-        public void Decode(IManagedByteBuffer[] data, Buffer2D<TPixel> pixels, int left, int top, int width, int height)
+        public void Decode(IMemoryOwner<byte>[] data, Buffer2D<TPixel> pixels, int left, int top, int width, int height)
         {
             var color = default(TPixel);
 

src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.Buffers;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -247,14 +248,14 @@ namespace SixLabors.ImageSharp.Formats.Tiff
 
             Buffer2D<TPixel> pixels = frame.PixelBuffer;
 
-            var stripBuffers = new IManagedByteBuffer[stripsPerPixel];
+            var stripBuffers = new IMemoryOwner<byte>[stripsPerPixel];
 
             try
             {
                 for (int stripIndex = 0; stripIndex < stripBuffers.Length; stripIndex++)
                 {
                     int uncompressedStripSize = this.CalculateStripBufferSize(frame.Width, rowsPerStrip, stripIndex);
-                    stripBuffers[stripIndex] = this.memoryAllocator.AllocateManagedByteBuffer(uncompressedStripSize);
+                    stripBuffers[stripIndex] = this.memoryAllocator.Allocate<byte>(uncompressedStripSize);
                 }
 
                 using TiffBaseDecompressor decompressor = TiffDecompressorsFactory.Create(this.CompressionType, this.memoryAllocator, this.PhotometricInterpretation, frame.Width, bitsPerPixel, this.Predictor, this.FaxCompressionOptions);
@@ -277,7 +278,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff
             }
             finally
             {
-                foreach (IManagedByteBuffer buf in stripBuffers)
+                foreach (IMemoryOwner<byte> buf in stripBuffers)
                 {
                     buf?.Dispose();
                 }
@@ -296,17 +297,27 @@ namespace SixLabors.ImageSharp.Formats.Tiff
             int uncompressedStripSize = this.CalculateStripBufferSize(frame.Width, rowsPerStrip);
             int bitsPerPixel = this.BitsPerPixel;
 
-            using IManagedByteBuffer stripBuffer = this.memoryAllocator.AllocateManagedByteBuffer(uncompressedStripSize, AllocationOptions.Clean);
-
+            using IMemoryOwner<byte> stripBuffer = this.memoryAllocator.Allocate<byte>(uncompressedStripSize, AllocationOptions.Clean);
+            System.Span<byte> stripBufferSpan = stripBuffer.GetSpan();
             Buffer2D<TPixel> pixels = frame.PixelBuffer;
 
-            using TiffBaseDecompressor decompressor = TiffDecompressorsFactory.Create(this.CompressionType, this.memoryAllocator, this.PhotometricInterpretation, frame.Width, bitsPerPixel, this.Predictor, this.FaxCompressionOptions);
+            using TiffBaseDecompressor decompressor = TiffDecompressorsFactory.Create(
+                this.CompressionType,
+                this.memoryAllocator,
+                this.PhotometricInterpretation,
+                frame.Width,
+                bitsPerPixel,
+                this.Predictor,
+                this.FaxCompressionOptions);
 
             TiffBaseColorDecoder<TPixel> colorDecoder = TiffColorDecoderFactory<TPixel>.Create(this.ColorType, this.BitsPerSample, this.ColorMap);
 
             for (int stripIndex = 0; stripIndex < stripOffsets.Length; stripIndex++)
             {
-                int stripHeight = stripIndex < stripOffsets.Length - 1 || frame.Height % rowsPerStrip == 0 ? rowsPerStrip : frame.Height % rowsPerStrip;
+                int stripHeight = stripIndex < stripOffsets.Length - 1 || frame.Height % rowsPerStrip == 0
+                    ? rowsPerStrip
+                    : frame.Height % rowsPerStrip;
+
                 int top = rowsPerStrip * stripIndex;
                 if (top + stripHeight > frame.Height)
                 {
@@ -314,9 +325,9 @@ namespace SixLabors.ImageSharp.Formats.Tiff
                     break;
                 }
 
-                decompressor.Decompress(this.inputStream, (uint)stripOffsets[stripIndex], (uint)stripByteCounts[stripIndex], stripBuffer.GetSpan());
+                decompressor.Decompress(this.inputStream, (uint)stripOffsets[stripIndex], (uint)stripByteCounts[stripIndex], stripBufferSpan);
 
-                colorDecoder.Decode(stripBuffer.GetSpan(), pixels, 0, top, frame.Width, stripHeight);
+                colorDecoder.Decode(stripBufferSpan, pixels, 0, top, frame.Width, stripHeight);
             }
         }
 

src/ImageSharp/Formats/Tiff/Writers/TiffCompositeColorWriter{TPixel}.cs

@@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff.Writers
     internal abstract class TiffCompositeColorWriter<TPixel> : TiffBaseColorWriter<TPixel>
         where TPixel : unmanaged, IPixel<TPixel>
     {
-        private IManagedByteBuffer rowBuffer;
+        private IMemoryOwner<byte> rowBuffer;
 
         protected TiffCompositeColorWriter(ImageFrame<TPixel> image, MemoryAllocator memoryAllocator, Configuration configuration, TiffEncoderEntriesCollector entriesCollector)
             : base(image, memoryAllocator, configuration, entriesCollector)
@@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff.Writers
         {
             if (this.rowBuffer == null)
             {
-                this.rowBuffer = this.MemoryAllocator.AllocateManagedByteBuffer(this.BytesPerRow * height);
+                this.rowBuffer = this.MemoryAllocator.Allocate<byte>(this.BytesPerRow * height);
             }
 
             this.rowBuffer.Clear();