From c44c67a18a1340d0a283315ef89d0a856323e632 Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Thu, 11 Jan 2018 18:58:10 +0200
Subject: [PATCH 01/70] - Make Buffer2D wrap Buffer

---
 src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs  |  6 +--
 src/ImageSharp/Image/PixelAccessor{TPixel}.cs |  6 +--
 src/ImageSharp/Memory/Buffer2D{T}.cs          | 40 ++++++++++++++-----
 src/ImageSharp/Memory/Buffer{T}.cs            |  6 +++
 .../ResamplingWeightedProcessor.Weights.cs    |  4 +-
 .../Processors/Transforms/ResizeProcessor.cs  |  2 +-
 .../General/PixelIndexing.cs                  | 10 ++---
 .../Formats/Jpg/SpectralJpegTests.cs          |  2 +-
 .../ImageSharp.Tests/Memory/Buffer2DTests.cs  | 16 ++++----
 .../TestUtilities/TestImageExtensions.cs      |  4 +-
 10 files changed, 60 insertions(+), 36 deletions(-)

diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
index 04176e033..4faccc58f 100644
--- a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
@@ -265,7 +265,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
 
             using (var buffer = Buffer2D<byte>.CreateClean(width, height))
             {
-                this.UncompressRle8(width, buffer);
+                this.UncompressRle8(width, buffer.Span);
 
                 for (int y = 0; y < height; y++)
                 {
@@ -385,7 +385,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
                 padding = 4 - padding;
             }
 
-            using (var row = Buffer<byte>.CreateClean(arrayWidth + padding))
+            using (var row = MemoryManager.Current.Allocate<byte>(arrayWidth + padding, true))
             {
                 var color = default(TPixel);
                 var rgba = new Rgba32(0, 0, 0, 255);
@@ -435,7 +435,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             var color = default(TPixel);
             var rgba = new Rgba32(0, 0, 0, 255);
 
-            using (var buffer = new Buffer<byte>(stride))
+            using (var buffer = MemoryManager.Current.Allocate<byte>(stride))
             {
                 for (int y = 0; y < height; y++)
                 {
diff --git a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
index 8dcb1f760..70d67954c 100644
--- a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
+++ b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
@@ -86,7 +86,7 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// Gets the pixel buffer array.
         /// </summary>
-        public TPixel[] PixelArray => this.PixelBuffer.Array;
+        public TPixel[] PixelArray => this.PixelBuffer.Buffer.Array;
 
         /// <summary>
         /// Gets the size of a single pixel in the number of bytes.
@@ -105,7 +105,7 @@ namespace SixLabors.ImageSharp
         public int Height { get; private set; }
 
         /// <inheritdoc />
-        Span<TPixel> IBuffer2D<TPixel>.Span => this.PixelBuffer;
+        Span<TPixel> IBuffer2D<TPixel>.Span => this.PixelBuffer.Span;
 
         private static PixelOperations<TPixel> Operations => PixelOperations<TPixel>.Instance;
 
@@ -158,7 +158,7 @@ namespace SixLabors.ImageSharp
         /// </summary>
         public void Reset()
         {
-            this.PixelBuffer.Clear();
+            this.PixelBuffer.Buffer.Clear();
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Memory/Buffer2D{T}.cs b/src/ImageSharp/Memory/Buffer2D{T}.cs
index 99b10cae7..6dd4c93a5 100644
--- a/src/ImageSharp/Memory/Buffer2D{T}.cs
+++ b/src/ImageSharp/Memory/Buffer2D{T}.cs
@@ -6,14 +6,15 @@ using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Memory
 {
+    using System;
+
     /// <summary>
     /// Represents a buffer of value type objects
     /// interpreted as a 2D region of <see cref="Width"/> x <see cref="Height"/> elements.
     /// </summary>
     /// <typeparam name="T">The value type.</typeparam>
-    internal class Buffer2D<T> : Buffer<T>, IBuffer2D<T>
-        where T : struct
-    {
+    internal class Buffer2D<T> : IBuffer2D<T>, IDisposable
+        where T : struct {
         public Buffer2D(Size size)
             : this(size.Width, size.Height)
         {
@@ -25,7 +26,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="width">The number of elements in a row</param>
         /// <param name="height">The number of rows</param>
         public Buffer2D(int width, int height)
-            : base(width * height)
+            : this(MemoryManager.Current.Allocate<T>(width * height), width, height) 
         {
             this.Width = width;
             this.Height = height;
@@ -37,9 +38,20 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="array">The array to pin</param>
         /// <param name="width">The number of elements in a row</param>
         /// <param name="height">The number of rows</param>
-        public Buffer2D(T[] array, int width, int height)
-            : base(array, width * height)
-        {
+        public Buffer2D(T[] array, int width, int height) {
+            this.Buffer = new Buffer<T>(array, width * height);
+            this.Width = width;
+            this.Height = height;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Buffer2D{T}"/> class.
+        /// </summary>
+        /// <param name="wrappedBuffer">The buffer to wrap</param>
+        /// <param name="width">The number of elements in a row</param>
+        /// <param name="height">The number of rows</param>
+        public Buffer2D(Buffer<T> wrappedBuffer, int width, int height) {
+            this.Buffer = wrappedBuffer;
             this.Width = width;
             this.Height = height;
         }
@@ -50,6 +62,10 @@ namespace SixLabors.ImageSharp.Memory
         /// <inheritdoc />
         public int Height { get; }
 
+        public Span<T> Span => this.Buffer.Span;
+
+        public Buffer<T> Buffer { get; }
+
         /// <summary>
         /// Gets a reference to the element at the specified position.
         /// </summary>
@@ -64,7 +80,7 @@ namespace SixLabors.ImageSharp.Memory
                 DebugGuard.MustBeLessThan(x, this.Width, nameof(x));
                 DebugGuard.MustBeLessThan(y, this.Height, nameof(y));
 
-                return ref this.Array[(this.Width * y) + x];
+                return ref this.Buffer.Array[(this.Width * y) + x];
             }
         }
 
@@ -76,9 +92,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <returns>The <see cref="Buffer{T}"/> instance</returns>
         public static Buffer2D<T> CreateClean(int width, int height)
         {
-            var buffer = new Buffer2D<T>(width, height);
-            buffer.Clear();
-            return buffer;
+            return new Buffer2D<T>(MemoryManager.Current.Allocate<T>(width*height, true), width, height);
         }
 
         /// <summary>
@@ -87,5 +101,9 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="size">The size of the buffer</param>
         /// <returns>The <see cref="Buffer2D{T}"/> instance</returns>
         public static Buffer2D<T> CreateClean(Size size) => CreateClean(size.Width, size.Height);
+
+        public void Dispose() {
+            this.Buffer?.Dispose();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/Buffer{T}.cs b/src/ImageSharp/Memory/Buffer{T}.cs
index f5c9ed00a..186a2212c 100644
--- a/src/ImageSharp/Memory/Buffer{T}.cs
+++ b/src/ImageSharp/Memory/Buffer{T}.cs
@@ -71,6 +71,12 @@ namespace SixLabors.ImageSharp.Memory
             this.isPoolingOwner = false;
         }
 
+        internal Buffer(T[] array, int length, MemoryManager memoryManager)
+            : this(array, length)
+        {
+            this.memoryManager = memoryManager;
+        }
+
         /// <summary>
         /// Finalizes an instance of the <see cref="Buffer{T}"/> class.
         /// </summary>
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs
index 22a7c90b7..9d76bf60f 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs
@@ -50,7 +50,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             {
                 this.flatStartIndex = (index * buffer.Width) + left;
                 this.Left = left;
-                this.buffer = buffer;
+                this.buffer = buffer.Buffer;
                 this.Length = length;
             }
 
@@ -69,7 +69,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             /// </summary>
             /// <returns>The <see cref="Span{T}"/></returns>
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Span<float> GetWindowSpan() => this.buffer.Slice(this.flatStartIndex, this.Length);
+            public Span<float> GetWindowSpan() => this.buffer.Span.Slice(this.flatStartIndex, this.Length);
 
             /// <summary>
             /// Computes the sum of vectors in 'rowSpan' weighted by weight values, pointed by this <see cref="WeightsWindow"/> instance.
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
index 17b42c504..bb0845776 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
@@ -123,7 +123,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             // TODO: Using a transposed variant of 'firstPassPixels' could eliminate the need for the WeightsWindow.ComputeWeightedColumnSum() method, and improve speed!
             using (var firstPassPixels = new Buffer2D<Vector4>(width, source.Height))
             {
-                firstPassPixels.Clear();
+                firstPassPixels.Buffer.Clear();
 
                 Parallel.For(
                     0,
diff --git a/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs b/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
index 0e21caffb..b0560b163 100644
--- a/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
+++ b/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
@@ -33,9 +33,9 @@
 
             public Data(Buffer2D<Vector4> buffer)
             {
-                this.pointer = (Vector4*)buffer.Pin();
-                this.pinnable = Unsafe.As<Pinnable<Vector4>>(buffer.Array);
-                this.array = buffer.Array;
+                this.pointer = (Vector4*)buffer.Buffer.Pin();
+                this.pinnable = Unsafe.As<Pinnable<Vector4>>(buffer.Buffer.Array);
+                this.array = buffer.Buffer.Array;
                 this.width = buffer.Width;
             }
 
@@ -150,8 +150,8 @@
         {
             this.width = 2048;
             this.buffer = new Buffer2D<Vector4>(2048, 2048);
-            this.pointer = (Vector4*)this.buffer.Pin();
-            this.array = this.buffer.Array;
+            this.pointer = (Vector4*)this.buffer.Buffer.Pin();
+            this.array = this.buffer.Buffer.Array;
             this.pinnable = Unsafe.As<Pinnable<Vector4>>(this.array);
 
             this.startIndex = 2048 / 2 - (this.Count / 2);
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs
index 6e68c43f2..46d832883 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs
@@ -106,7 +106,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 this.Output.WriteLine($"Component{i}: {diff}");
                 averageDifference += diff.average;
                 totalDifference += diff.total;
-                tolerance += libJpegComponent.SpectralBlocks.Length;
+                tolerance += libJpegComponent.SpectralBlocks.Buffer.Length;
             }
             averageDifference /= componentCount;
 
diff --git a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
index d662a1b3e..7ab0ed949 100644
--- a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
+++ b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
@@ -35,7 +35,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             {
                 Assert.Equal(width, buffer.Width);
                 Assert.Equal(height, buffer.Height);
-                Assert.Equal(width * height, buffer.Length);
+                Assert.Equal(width * height, buffer.Buffer.Length);
             }
         }
 
@@ -49,7 +49,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             {
                 Assert.Equal(width, buffer.Width);
                 Assert.Equal(height, buffer.Height);
-                Assert.Equal(width * height, buffer.Length);
+                Assert.Equal(width * height, buffer.Buffer.Length);
             }
         }
 
@@ -61,10 +61,10 @@ namespace SixLabors.ImageSharp.Tests.Memory
             {
                 using (Buffer2D<int> buffer = Buffer2D<int>.CreateClean(42, 42))
                 {
-                    for (int j = 0; j < buffer.Length; j++)
+                    for (int j = 0; j < buffer.Buffer.Length; j++)
                     {
-                        Assert.Equal(0, buffer.Array[j]);
-                        buffer.Array[j] = 666;
+                        Assert.Equal(0, buffer.Buffer.Array[j]);
+                        buffer.Buffer.Array[j] = 666;
                     }
                 }
             }
@@ -82,7 +82,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
 
                 // Assert.Equal(width * y, span.Start);
                 Assert.Equal(width, span.Length);
-                Assert.SpanPointsTo(span, buffer, width * y);
+                Assert.SpanPointsTo(span, buffer.Buffer, width * y);
             }
         }
 
@@ -98,7 +98,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
 
                 // Assert.Equal(width * y + x, span.Start);
                 Assert.Equal(width - x, span.Length);
-                Assert.SpanPointsTo(span, buffer, width * y + x);
+                Assert.SpanPointsTo(span, buffer.Buffer, width * y + x);
             }
         }
 
@@ -110,7 +110,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         {
             using (Buffer2D<TestStructs.Foo> buffer = new Buffer2D<TestStructs.Foo>(width, height))
             {
-                TestStructs.Foo[] array = buffer.Array;
+                TestStructs.Foo[] array = buffer.Buffer.Array;
 
                 ref TestStructs.Foo actual = ref buffer[x, y];
 
diff --git a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
index 2b3cb1bcc..fbada505a 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
@@ -233,9 +233,9 @@ namespace SixLabors.ImageSharp.Tests
 
             Span<Rgba32> pixels = image.Frames.RootFrame.GetPixelSpan();
 
-            for (int i = 0; i < buffer.Length; i++)
+            for (int i = 0; i < buffer.Buffer.Length; i++)
             {
-                float value = buffer[i] * scale;
+                float value = buffer.Buffer[i] * scale;
                 var v = new Vector4(value, value, value, 1f);
                 pixels[i].PackFromVector4(v);
             }

From 61b61709a908cb56f1d80c34415b555ce1edd0b2 Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Thu, 11 Jan 2018 18:44:01 +0200
Subject: [PATCH 02/70] - Allocate Buffers from memory manager

---
 .../Brushes/ImageBrush{TPixel}.cs             |  4 +-
 .../Brushes/PatternBrush{TPixel}.cs           |  4 +-
 .../Brushes/Processors/BrushApplicator.cs     |  4 +-
 .../Brushes/RecolorBrush{TPixel}.cs           |  4 +-
 .../Brushes/SolidBrush{TPixel}.cs             |  4 +-
 src/ImageSharp.Drawing/Paths/ShapeRegion.cs   |  2 +-
 .../Processors/DrawImageProcessor.cs          |  2 +-
 .../Processors/FillProcessor.cs               |  2 +-
 .../Processors/FillRegionProcessor.cs         |  2 +-
 src/ImageSharp/Configuration.cs               |  1 +
 src/ImageSharp/Formats/Gif/GifDecoderCore.cs  |  6 +--
 .../Common/Decoder/JpegImagePostProcessor.cs  |  2 +-
 .../Components/PdfJsFrameComponent.cs         |  2 +-
 .../PdfJsPort/Components/PdfJsHuffmanTable.cs | 12 +++---
 .../Components/PdfJsJpegPixelArea.cs          |  4 +-
 .../Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs    | 10 ++---
 src/ImageSharp/Formats/Png/PngDecoderCore.cs  | 14 +++---
 src/ImageSharp/Formats/Png/PngEncoderCore.cs  | 14 +++---
 src/ImageSharp/Image/Image.Decode.cs          |  2 +-
 src/ImageSharp/Image/PixelArea{TPixel}.cs     |  2 +-
 .../Memory/ArrayPoolMemoryManager.cs          | 28 ++++++++++++
 src/ImageSharp/Memory/Buffer2D{T}.cs          | 19 ++++----
 src/ImageSharp/Memory/Buffer{T}.cs            | 43 +++----------------
 src/ImageSharp/Memory/MemoryManager.cs        | 39 +++++++++++++++++
 .../DefaultPixelBlenders.Generated.cs         | 42 +++++++++---------
 .../DefaultPixelBlenders.Generated.tt         |  2 +-
 .../Effects/BackgroundColorProcessor.cs       |  4 +-
 .../Processors/Overlays/GlowProcessor.cs      |  4 +-
 .../Processors/Overlays/VignetteProcessor.cs  |  4 +-
 .../Processors/Transforms/ResizeProcessor.cs  |  2 +-
 .../Color/Bulk/PackFromVector4.cs             |  4 +-
 .../Bulk/PackFromVector4ReferenceVsPointer.cs |  4 +-
 .../Color/Bulk/PackFromXyzw.cs                |  4 +-
 .../Color/Bulk/ToVector4.cs                   |  4 +-
 .../ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs |  4 +-
 .../Color/Bulk/ToXyzw.cs                      |  4 +-
 .../General/ClearBuffer.cs                    |  2 +-
 .../General/IterateArray.cs                   |  2 +-
 .../PixelBlenders/PorterDuffBulkVsPixel.cs    |  6 +--
 tests/ImageSharp.Benchmarks/Samplers/Glow.cs  |  2 +-
 tests/ImageSharp.Tests/Memory/BufferTests.cs  | 22 +++++-----
 .../Memory/SpanUtilityTests.cs                |  2 +-
 .../PixelFormats/PixelOperationsTests.cs      |  6 +--
 .../ReferenceCodecs/SystemDrawingBridge.cs    | 12 +++---
 44 files changed, 200 insertions(+), 162 deletions(-)
 create mode 100644 src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
 create mode 100644 src/ImageSharp/Memory/MemoryManager.cs

diff --git a/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
index 2d29e23fe..d64225385 100644
--- a/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
@@ -122,8 +122,8 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             internal override void Apply(Span<float> scanline, int x, int y)
             {
                 // Create a span for colors
-                using (var amountBuffer = new Buffer<float>(scanline.Length))
-                using (var overlay = new Buffer<TPixel>(scanline.Length))
+                using (var amountBuffer = MemoryManager.Current.Allocate<float>(scanline.Length))
+                using (var overlay = MemoryManager.Current.Allocate<TPixel>(scanline.Length))
                 {
                     int sourceY = (y - this.offsetY) % this.yLength;
                     int offsetX = x - this.offsetX;
diff --git a/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
index 844df0e0e..4b26c4edc 100644
--- a/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
@@ -152,8 +152,8 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             internal override void Apply(Span<float> scanline, int x, int y)
             {
                 int patternY = y % this.pattern.Height;
-                using (var amountBuffer = new Buffer<float>(scanline.Length))
-                using (var overlay = new Buffer<TPixel>(scanline.Length))
+                using (var amountBuffer = MemoryManager.Current.Allocate<float>(scanline.Length))
+                using (var overlay = MemoryManager.Current.Allocate<TPixel>(scanline.Length))
                 {
                     for (int i = 0; i < scanline.Length; i++)
                     {
diff --git a/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs b/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
index ca6f7630d..5a50e12fb 100644
--- a/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
+++ b/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
@@ -65,8 +65,8 @@ namespace SixLabors.ImageSharp.Drawing.Brushes.Processors
         /// <remarks>scanlineBuffer will be > scanlineWidth but provide and offset in case we want to share a larger buffer across runs.</remarks>
         internal virtual void Apply(Span<float> scanline, int x, int y)
         {
-            using (var amountBuffer = new Buffer<float>(scanline.Length))
-            using (var overlay = new Buffer<TPixel>(scanline.Length))
+            using (var amountBuffer = MemoryManager.Current.Allocate<float>(scanline.Length))
+            using (var overlay = MemoryManager.Current.Allocate<TPixel>(scanline.Length))
             {
                 for (int i = 0; i < scanline.Length; i++)
                 {
diff --git a/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
index ba2fca4e4..1c02884f2 100644
--- a/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
@@ -144,8 +144,8 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             /// <inheritdoc />
             internal override void Apply(Span<float> scanline, int x, int y)
             {
-                using (var amountBuffer = new Buffer<float>(scanline.Length))
-                using (var overlay = new Buffer<TPixel>(scanline.Length))
+                using (var amountBuffer = MemoryManager.Current.Allocate<float>(scanline.Length))
+                using (var overlay = MemoryManager.Current.Allocate<TPixel>(scanline.Length))
                 {
                     for (int i = 0; i < scanline.Length; i++)
                     {
diff --git a/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
index 658164339..b935bbe36 100644
--- a/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
@@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             public SolidBrushApplicator(ImageFrame<TPixel> source, TPixel color, GraphicsOptions options)
                 : base(source, options)
             {
-                this.Colors = new Buffer<TPixel>(source.Width);
+                this.Colors = MemoryManager.Current.Allocate<TPixel>(source.Width);
                 for (int i = 0; i < this.Colors.Length; i++)
                 {
                     this.Colors[i] = color;
@@ -96,7 +96,7 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
                 {
                     Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
 
-                    using (var amountBuffer = new Buffer<float>(scanline.Length))
+                    using (var amountBuffer = MemoryManager.Current.Allocate<float>(scanline.Length))
                     {
                         for (int i = 0; i < scanline.Length; i++)
                         {
diff --git a/src/ImageSharp.Drawing/Paths/ShapeRegion.cs b/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
index a96b03dd0..7851bac50 100644
--- a/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
+++ b/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
@@ -46,7 +46,7 @@ namespace SixLabors.ImageSharp.Drawing
         {
             var start = new PointF(this.Bounds.Left - 1, y);
             var end = new PointF(this.Bounds.Right + 1, y);
-            using (var innerBuffer = new Buffer<PointF>(buffer.Length))
+            using (var innerBuffer = MemoryManager.Current.Allocate<PointF>(buffer.Length))
             {
                 PointF[] array = innerBuffer.Array;
                 int count = this.Shape.FindIntersections(start, end, array, 0);
diff --git a/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
index 47763c0aa..2d411e0b6 100644
--- a/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
@@ -84,7 +84,7 @@ namespace SixLabors.ImageSharp.Drawing.Processors
                 maxY = Math.Min(this.Location.Y + this.Size.Height, maxY);
 
                 int width = maxX - minX;
-                using (var amount = new Buffer<float>(width))
+                using (var amount = MemoryManager.Current.Allocate<float>(width))
                 {
                     for (int i = 0; i < width; i++)
                     {
diff --git a/src/ImageSharp.Drawing/Processors/FillProcessor.cs b/src/ImageSharp.Drawing/Processors/FillProcessor.cs
index 679ca6a22..f4763af1e 100644
--- a/src/ImageSharp.Drawing/Processors/FillProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/FillProcessor.cs
@@ -66,7 +66,7 @@ namespace SixLabors.ImageSharp.Drawing.Processors
 
             int width = maxX - minX;
 
-            using (var amount = new Buffer<float>(width))
+            using (var amount = MemoryManager.Current.Allocate<float>(width))
             using (BrushApplicator<TPixel> applicator = this.brush.CreateApplicator(source, sourceRectangle, this.options))
             {
                     for (int i = 0; i < width; i++)
diff --git a/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
index b6ef4be21..82ffea08e 100644
--- a/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
@@ -102,7 +102,7 @@ namespace SixLabors.ImageSharp.Drawing.Processors
             {
                 float[] buffer = arrayPool.Rent(maxIntersections);
                 int scanlineWidth = maxX - minX;
-                using (var scanline = new Buffer<float>(scanlineWidth))
+                using (var scanline = MemoryManager.Current.Allocate<float>(scanlineWidth))
                 {
                     try
                     {
diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs
index 740103533..8ea676d32 100644
--- a/src/ImageSharp/Configuration.cs
+++ b/src/ImageSharp/Configuration.cs
@@ -12,6 +12,7 @@ using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.IO;
+using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp
 {
diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
index ae20be7d5..0003dbc82 100644
--- a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
@@ -124,7 +124,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
                 if (this.logicalScreenDescriptor.GlobalColorTableFlag)
                 {
                     this.globalColorTableLength = this.logicalScreenDescriptor.GlobalColorTableSize * 3;
-                    this.globalColorTable = Buffer<byte>.CreateClean(this.globalColorTableLength);
+                    this.globalColorTable = MemoryManager.Current.Allocate<byte>(this.globalColorTableLength, true);
 
                     // Read the global color table from the stream
                     stream.Read(this.globalColorTable.Array, 0, this.globalColorTableLength);
@@ -320,11 +320,11 @@ namespace SixLabors.ImageSharp.Formats.Gif
                 if (imageDescriptor.LocalColorTableFlag)
                 {
                     int length = imageDescriptor.LocalColorTableSize * 3;
-                    localColorTable = Buffer<byte>.CreateClean(length);
+                    localColorTable = MemoryManager.Current.Allocate<byte>(length, true);
                     this.currentStream.Read(localColorTable.Array, 0, length);
                 }
 
-                indices = Buffer<byte>.CreateClean(imageDescriptor.Width * imageDescriptor.Height);
+                indices = MemoryManager.Current.Allocate<byte>(imageDescriptor.Width * imageDescriptor.Height, true);
 
                 this.ReadFrameIndices(imageDescriptor, indices);
                 this.ReadFrameColors(indices, localColorTable ?? this.globalColorTable, imageDescriptor);
diff --git a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
index 125ec5272..44deb6722 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
@@ -53,7 +53,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
             this.PostProcessorBufferSize = new Size(c0.SizeInBlocks.Width * 8, PixelRowsPerStep);
 
             this.ComponentProcessors = rawJpeg.Components.Select(c => new JpegComponentPostProcessor(this, c)).ToArray();
-            this.rgbaBuffer = new Buffer<Vector4>(rawJpeg.ImageSizeInPixels.Width);
+            this.rgbaBuffer = MemoryManager.Current.Allocate<Vector4>(rawJpeg.ImageSizeInPixels.Width);
             this.colorConverter = ColorConverters.JpegColorConverter.GetConverter(rawJpeg.ColorSpace);
         }
 
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs
index f60097dc9..5d51e2ad5 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs
@@ -114,7 +114,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
             int blocksBufferSize = 64 * this.BlocksPerColumnForMcu * (this.BlocksPerLineForMcu + 1);
 
             // Pooled. Disposed via frame disposal
-            this.BlockData = Buffer<short>.CreateClean(blocksBufferSize);
+            this.BlockData = MemoryManager.Current.Allocate<short>(blocksBufferSize, true);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
index 9dc831567..38f223dca 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
@@ -24,12 +24,12 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// <param name="values">The huffman values</param>
         public PdfJsHuffmanTable(byte[] lengths, byte[] values)
         {
-            this.lookahead = Buffer<short>.CreateClean(256);
-            this.valOffset = Buffer<short>.CreateClean(18);
-            this.maxcode = Buffer<long>.CreateClean(18);
+            this.lookahead = MemoryManager.Current.Allocate<short>(256, true);
+            this.valOffset = MemoryManager.Current.Allocate<short>(18, true);
+            this.maxcode = MemoryManager.Current.Allocate<long>(18, true);
 
-            using (var huffsize = Buffer<short>.CreateClean(257))
-            using (var huffcode = Buffer<short>.CreateClean(257))
+            using (var huffsize = MemoryManager.Current.Allocate<short>(257, true))
+            using (var huffcode = MemoryManager.Current.Allocate<short>(257, true))
             {
                 GenerateSizeTable(lengths, huffsize);
                 GenerateCodeTable(huffsize, huffcode);
@@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
                 GenerateLookaheadTables(lengths, values, this.lookahead);
             }
 
-            this.huffval = Buffer<byte>.CreateClean(values.Length);
+            this.huffval = MemoryManager.Current.Allocate<byte>(values.Length, true);
             Buffer.BlockCopy(values, 0, this.huffval.Array, 0, values.Length);
 
             this.MaxCode = this.maxcode.Array;
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
index 034986c2c..eb1680796 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
@@ -69,11 +69,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
             this.rowStride = width * numberOfComponents;
             var scale = new Vector2(this.imageWidth / (float)width, this.imageHeight / (float)height);
 
-            this.componentData = new Buffer<byte>(width * height * numberOfComponents);
+            this.componentData = MemoryManager.Current.Allocate<byte>(width * height * numberOfComponents);
             Span<byte> componentDataSpan = this.componentData;
             const uint Mask3Lsb = 0xFFFFFFF8; // Used to clear the 3 LSBs
 
-            using (var xScaleBlockOffset = new Buffer<int>(width))
+            using (var xScaleBlockOffset = MemoryManager.Current.Allocate<int>(width))
             {
                 Span<int> xScaleBlockOffsetSpan = xScaleBlockOffset;
                 for (int i = 0; i < numberOfComponents; i++)
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
index 211c24d20..917e3c7e3 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
@@ -673,14 +673,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
                 throw new ImageFormatException($"DHT has wrong length: {remaining}");
             }
 
-            using (var huffmanData = Buffer<byte>.CreateClean(256))
+            using (var huffmanData = MemoryManager.Current.Allocate<byte>(256, true))
             {
                 for (int i = 2; i < remaining;)
                 {
                     byte huffmanTableSpec = (byte)this.InputStream.ReadByte();
                     this.InputStream.Read(huffmanData.Array, 0, 16);
 
-                    using (var codeLengths = Buffer<byte>.CreateClean(17))
+                    using (var codeLengths = MemoryManager.Current.Allocate<byte>(17, true))
                     {
                         int codeLengthSum = 0;
 
@@ -689,7 +689,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
                             codeLengthSum += codeLengths[j] = huffmanData[j - 1];
                         }
 
-                        using (var huffmanValues = Buffer<byte>.CreateClean(256))
+                        using (var huffmanValues = MemoryManager.Current.Allocate<byte>(256, true))
                         {
                             this.InputStream.Read(huffmanValues.Array, 0, codeLengthSum);
 
@@ -784,8 +784,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
         {
             int blocksPerLine = component.BlocksPerLine;
             int blocksPerColumn = component.BlocksPerColumn;
-            using (var computationBuffer = Buffer<short>.CreateClean(64))
-            using (var multiplicationBuffer = Buffer<short>.CreateClean(64))
+            using (var computationBuffer = MemoryManager.Current.Allocate<short>(64, true))
+            using (var multiplicationBuffer = MemoryManager.Current.Allocate<short>(64, true))
             {
                 Span<short> quantizationTable = this.quantizationTables.Tables.GetRowSpan(frameComponent.QuantizationTableIndex);
                 Span<short> computationBufferSpan = computationBuffer;
diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index 7149b74d8..ebda05a1e 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -375,8 +375,8 @@ namespace SixLabors.ImageSharp.Formats.Png
                 this.bytesPerSample = this.header.BitDepth / 8;
             }
 
-            this.previousScanline = Buffer<byte>.CreateClean(this.bytesPerScanline);
-            this.scanline = Buffer<byte>.CreateClean(this.bytesPerScanline);
+            this.previousScanline = MemoryManager.Current.Allocate<byte>(this.bytesPerScanline, true);
+            this.scanline = MemoryManager.Current.Allocate<byte>(this.bytesPerScanline, true);
         }
 
         /// <summary>
@@ -669,7 +669,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                         if (this.header.BitDepth == 16)
                         {
                             int length = this.header.Width * 3;
-                            using (var compressed = new Buffer<byte>(length))
+                            using (var compressed = MemoryManager.Current.Allocate<byte>(length))
                             {
                                 // TODO: Should we use pack from vector here instead?
                                 this.From16BitTo8Bit(scanlineBuffer, compressed, length);
@@ -686,7 +686,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                         if (this.header.BitDepth == 16)
                         {
                             int length = this.header.Width * 3;
-                            using (var compressed = new Buffer<byte>(length))
+                            using (var compressed = MemoryManager.Current.Allocate<byte>(length))
                             {
                                 // TODO: Should we use pack from vector here instead?
                                 this.From16BitTo8Bit(scanlineBuffer, compressed, length);
@@ -727,7 +727,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                     if (this.header.BitDepth == 16)
                     {
                         int length = this.header.Width * 4;
-                        using (var compressed = new Buffer<byte>(length))
+                        using (var compressed = MemoryManager.Current.Allocate<byte>(length))
                         {
                             // TODO: Should we use pack from vector here instead?
                             this.From16BitTo8Bit(scanlineBuffer, compressed, length);
@@ -930,7 +930,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                     if (this.header.BitDepth == 16)
                     {
                         int length = this.header.Width * 3;
-                        using (var compressed = new Buffer<byte>(length))
+                        using (var compressed = MemoryManager.Current.Allocate<byte>(length))
                         {
                             // TODO: Should we use pack from vector here instead?
                             this.From16BitTo8Bit(scanlineBuffer, compressed, length);
@@ -998,7 +998,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                     if (this.header.BitDepth == 16)
                     {
                         int length = this.header.Width * 4;
-                        using (var compressed = new Buffer<byte>(length))
+                        using (var compressed = MemoryManager.Current.Allocate<byte>(length))
                         {
                             // TODO: Should we use pack from vector here instead?
                             this.From16BitTo8Bit(scanlineBuffer, compressed, length);
diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
index 0efd46ec7..9be0f5ee4 100644
--- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
@@ -620,16 +620,16 @@ namespace SixLabors.ImageSharp.Formats.Png
             this.bytesPerScanline = this.width * this.bytesPerPixel;
             int resultLength = this.bytesPerScanline + 1;
 
-            this.previousScanline = Buffer<byte>.CreateClean(this.bytesPerScanline);
-            this.rawScanline = Buffer<byte>.CreateClean(this.bytesPerScanline);
-            this.result = Buffer<byte>.CreateClean(resultLength);
+            this.previousScanline = MemoryManager.Current.Allocate<byte>(this.bytesPerScanline, true);
+            this.rawScanline = MemoryManager.Current.Allocate<byte>(this.bytesPerScanline, true);
+            this.result = MemoryManager.Current.Allocate<byte>(resultLength, true);
 
             if (this.pngColorType != PngColorType.Palette)
             {
-                this.sub = Buffer<byte>.CreateClean(resultLength);
-                this.up = Buffer<byte>.CreateClean(resultLength);
-                this.average = Buffer<byte>.CreateClean(resultLength);
-                this.paeth = Buffer<byte>.CreateClean(resultLength);
+                this.sub = MemoryManager.Current.Allocate<byte>(resultLength, true);
+                this.up = MemoryManager.Current.Allocate<byte>(resultLength, true);
+                this.average = MemoryManager.Current.Allocate<byte>(resultLength, true);
+                this.paeth = MemoryManager.Current.Allocate<byte>(resultLength, true);
             }
 
             byte[] buffer;
diff --git a/src/ImageSharp/Image/Image.Decode.cs b/src/ImageSharp/Image/Image.Decode.cs
index b4ab712d0..1bce23cfc 100644
--- a/src/ImageSharp/Image/Image.Decode.cs
+++ b/src/ImageSharp/Image/Image.Decode.cs
@@ -29,7 +29,7 @@ namespace SixLabors.ImageSharp
                 return null;
             }
 
-            using (var buffer = new Buffer<byte>(maxHeaderSize))
+            using (var buffer = MemoryManager.Current.Allocate<byte>(maxHeaderSize))
             {
                 long startPosition = stream.Position;
                 stream.Read(buffer.Array, 0, maxHeaderSize);
diff --git a/src/ImageSharp/Image/PixelArea{TPixel}.cs b/src/ImageSharp/Image/PixelArea{TPixel}.cs
index 1c7256455..e6ae556f7 100644
--- a/src/ImageSharp/Image/PixelArea{TPixel}.cs
+++ b/src/ImageSharp/Image/PixelArea{TPixel}.cs
@@ -116,7 +116,7 @@ namespace SixLabors.ImageSharp
             this.RowStride = (width * GetComponentCount(componentOrder)) + padding;
             this.Length = this.RowStride * height;
 
-            this.byteBuffer = Buffer<byte>.CreateClean(this.Length);
+            this.byteBuffer = MemoryManager.Current.Allocate<byte>(this.Length, true);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
new file mode 100644
index 000000000..c4ce7d299
--- /dev/null
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -0,0 +1,28 @@
+using System.Buffers;
+
+namespace SixLabors.ImageSharp.Memory
+{
+    /// <summary>
+    /// Implements <see cref="MemoryManager"/> by allocating memory from <see cref="ArrayPool{T}"/>.
+    /// </summary>
+    public class ArrayPoolMemoryManager : MemoryManager
+    {
+        /// <inheritdoc />
+        internal override Buffer<T> Allocate<T>(int size, bool clear = false)
+        {
+            var buffer = new Buffer<T>(PixelDataPool<T>.Rent(size), size, this);
+            if (clear)
+            {
+                buffer.Clear();
+            }
+
+            return buffer;
+        }
+
+        /// <inheritdoc />
+        internal override void Release<T>(Buffer<T> buffer)
+        {
+            PixelDataPool<T>.Return(buffer.Array);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/Buffer2D{T}.cs b/src/ImageSharp/Memory/Buffer2D{T}.cs
index 6dd4c93a5..a7de343f9 100644
--- a/src/ImageSharp/Memory/Buffer2D{T}.cs
+++ b/src/ImageSharp/Memory/Buffer2D{T}.cs
@@ -1,20 +1,20 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
 using System.Runtime.CompilerServices;
 using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Memory
 {
-    using System;
-
     /// <summary>
     /// Represents a buffer of value type objects
     /// interpreted as a 2D region of <see cref="Width"/> x <see cref="Height"/> elements.
     /// </summary>
     /// <typeparam name="T">The value type.</typeparam>
     internal class Buffer2D<T> : IBuffer2D<T>, IDisposable
-        where T : struct {
+        where T : struct
+    {
         public Buffer2D(Size size)
             : this(size.Width, size.Height)
         {
@@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="width">The number of elements in a row</param>
         /// <param name="height">The number of rows</param>
         public Buffer2D(int width, int height)
-            : this(MemoryManager.Current.Allocate<T>(width * height), width, height) 
+            : this(MemoryManager.Current.Allocate<T>(width * height), width, height)
         {
             this.Width = width;
             this.Height = height;
@@ -38,7 +38,8 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="array">The array to pin</param>
         /// <param name="width">The number of elements in a row</param>
         /// <param name="height">The number of rows</param>
-        public Buffer2D(T[] array, int width, int height) {
+        public Buffer2D(T[] array, int width, int height)
+        {
             this.Buffer = new Buffer<T>(array, width * height);
             this.Width = width;
             this.Height = height;
@@ -50,7 +51,8 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="wrappedBuffer">The buffer to wrap</param>
         /// <param name="width">The number of elements in a row</param>
         /// <param name="height">The number of rows</param>
-        public Buffer2D(Buffer<T> wrappedBuffer, int width, int height) {
+        public Buffer2D(Buffer<T> wrappedBuffer, int width, int height)
+        {
             this.Buffer = wrappedBuffer;
             this.Width = width;
             this.Height = height;
@@ -92,7 +94,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <returns>The <see cref="Buffer{T}"/> instance</returns>
         public static Buffer2D<T> CreateClean(int width, int height)
         {
-            return new Buffer2D<T>(MemoryManager.Current.Allocate<T>(width*height, true), width, height);
+            return new Buffer2D<T>(MemoryManager.Current.Allocate<T>(width * height, true), width, height);
         }
 
         /// <summary>
@@ -102,7 +104,8 @@ namespace SixLabors.ImageSharp.Memory
         /// <returns>The <see cref="Buffer2D{T}"/> instance</returns>
         public static Buffer2D<T> CreateClean(Size size) => CreateClean(size.Width, size.Height);
 
-        public void Dispose() {
+        public void Dispose()
+        {
             this.Buffer?.Dispose();
         }
     }
diff --git a/src/ImageSharp/Memory/Buffer{T}.cs b/src/ImageSharp/Memory/Buffer{T}.cs
index 186a2212c..16f4e8599 100644
--- a/src/ImageSharp/Memory/Buffer{T}.cs
+++ b/src/ImageSharp/Memory/Buffer{T}.cs
@@ -16,6 +16,8 @@ namespace SixLabors.ImageSharp.Memory
     internal class Buffer<T> : IBuffer<T>
         where T : struct
     {
+        private MemoryManager memoryManager;
+
         /// <summary>
         /// A pointer to the first element of <see cref="Array"/> when pinned.
         /// </summary>
@@ -26,23 +28,6 @@ namespace SixLabors.ImageSharp.Memory
         /// </summary>
         private GCHandle handle;
 
-        /// <summary>
-        /// A value indicating wheter <see cref="Array"/> should be returned to <see cref="PixelDataPool{T}"/>
-        /// when disposing this <see cref="Buffer{T}"/> instance.
-        /// </summary>
-        private bool isPoolingOwner;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Buffer{T}"/> class.
-        /// </summary>
-        /// <param name="length">The desired count of elements. (Minimum size for <see cref="Array"/>)</param>
-        public Buffer(int length)
-        {
-            this.Length = length;
-            this.Array = PixelDataPool<T>.Rent(length);
-            this.isPoolingOwner = true;
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Buffer{T}"/> class.
         /// </summary>
@@ -51,7 +36,6 @@ namespace SixLabors.ImageSharp.Memory
         {
             this.Length = array.Length;
             this.Array = array;
-            this.isPoolingOwner = false;
         }
 
         /// <summary>
@@ -68,7 +52,6 @@ namespace SixLabors.ImageSharp.Memory
 
             this.Length = length;
             this.Array = array;
-            this.isPoolingOwner = false;
         }
 
         internal Buffer(T[] array, int length, MemoryManager memoryManager)
@@ -140,19 +123,6 @@ namespace SixLabors.ImageSharp.Memory
             return new Span<T>(buffer.Array, 0, buffer.Length);
         }
 
-        /// <summary>
-        /// Creates a clean instance of <see cref="Buffer{T}"/> initializing it's elements with 'default(T)'.
-        /// </summary>
-        /// <param name="count">The desired count of elements. (Minimum size for <see cref="Array"/>)</param>
-        /// <returns>The <see cref="Buffer{T}"/> instance</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Buffer<T> CreateClean(int count)
-        {
-            Buffer<T> buffer = new Buffer<T>(count);
-            buffer.Clear();
-            return buffer;
-        }
-
         /// <summary>
         /// Gets a <see cref="Span{T}"/> to an offseted position inside the buffer.
         /// </summary>
@@ -190,12 +160,9 @@ namespace SixLabors.ImageSharp.Memory
             this.IsDisposedOrLostArrayOwnership = true;
             this.UnPin();
 
-            if (this.isPoolingOwner)
-            {
-                PixelDataPool<T>.Return(this.Array);
-            }
+            this.memoryManager?.Release(this);
 
-            this.isPoolingOwner = false;
+            this.memoryManager = null;
             this.Array = null;
             this.Length = 0;
 
@@ -220,7 +187,7 @@ namespace SixLabors.ImageSharp.Memory
             this.UnPin();
             T[] array = this.Array;
             this.Array = null;
-            this.isPoolingOwner = false;
+            this.memoryManager = null;
             return array;
         }
 
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
new file mode 100644
index 000000000..54b727b60
--- /dev/null
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SixLabors.ImageSharp.Memory
+{
+    /// <summary>
+    /// Memory managers are used to allocate memory for image processing operations.
+    /// </summary>
+    public abstract class MemoryManager
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="MemoryManager"/> that is currently in use.
+        /// </summary>
+        public static MemoryManager Current { get; set; } = new ArrayPoolMemoryManager();
+
+        /// <summary>
+        /// Allocates a <see cref="Buffer{T}"/> of size <paramref name="size"/>, optionally
+        /// clearing the buffer before it gets returned.
+        /// </summary>
+        /// <typeparam name="T">Type of the data stored in the buffer</typeparam>
+        /// <param name="size">Size of the buffer to allocate</param>
+        /// <param name="clear">True to clear the backing memory of the buffer</param>
+        /// <returns>A buffer of values of type <typeparamref name="T"/>.</returns>
+        internal abstract Buffer<T> Allocate<T>(int size, bool clear = false)
+            where T : struct;
+
+        /// <summary>
+        /// Releases the memory allocated for <paramref name="buffer"/>. After this, the buffer
+        /// is no longer usable.
+        /// </summary>
+        /// <typeparam name="T">Type of the data stored in the buffer</typeparam>
+        /// <param name="buffer">The buffer to release</param>
+        internal abstract void Release<T>(Buffer<T> buffer)
+            where T : struct;
+    }
+}
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
index 99a20516d..477281673 100644
--- a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
+++ b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -84,7 +84,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -123,7 +123,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -162,7 +162,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -201,7 +201,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -240,7 +240,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -279,7 +279,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -318,7 +318,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -357,7 +357,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -396,7 +396,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -435,7 +435,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -474,7 +474,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -513,7 +513,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -552,7 +552,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -591,7 +591,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -630,7 +630,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -669,7 +669,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -708,7 +708,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -747,7 +747,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -786,7 +786,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -825,7 +825,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
index 9d7d73db9..cb99237c4 100644
--- a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
+++ b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
@@ -87,7 +87,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
diff --git a/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
index 72e9b8f55..5f6fd4023 100644
--- a/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
@@ -67,8 +67,8 @@ namespace SixLabors.ImageSharp.Processing.Processors
 
             int width = maxX - minX;
 
-            using (var colors = new Buffer<TPixel>(width))
-            using (var amount = new Buffer<float>(width))
+            using (var colors = MemoryManager.Current.Allocate<TPixel>(width))
+            using (var amount = MemoryManager.Current.Allocate<float>(width))
             {
                 for (int i = 0; i < width; i++)
                 {
diff --git a/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
index b02585d8f..0cee4c0b2 100644
--- a/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
@@ -83,7 +83,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             }
 
             int width = maxX - minX;
-            using (var rowColors = new Buffer<TPixel>(width))
+            using (var rowColors = MemoryManager.Current.Allocate<TPixel>(width))
             {
                 for (int i = 0; i < width; i++)
                 {
@@ -96,7 +96,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                     configuration.ParallelOptions,
                     y =>
                     {
-                        using (var amounts = new Buffer<float>(width))
+                        using (var amounts = MemoryManager.Current.Allocate<float>(width))
                         {
                             int offsetY = y - startY;
                             int offsetX = minX - startX;
diff --git a/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
index 7b592a6a4..60915e6db 100644
--- a/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
@@ -104,7 +104,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             }
 
             int width = maxX - minX;
-            using (var rowColors = new Buffer<TPixel>(width))
+            using (var rowColors = MemoryManager.Current.Allocate<TPixel>(width))
             {
                 for (int i = 0; i < width; i++)
                 {
@@ -117,7 +117,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                     configuration.ParallelOptions,
                     y =>
                         {
-                            using (var amounts = new Buffer<float>(width))
+                            using (var amounts = MemoryManager.Current.Allocate<float>(width))
                             {
                                 int offsetY = y - startY;
                                 int offsetX = minX - startX;
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
index bb0845776..6dcffbbc0 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
@@ -132,7 +132,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                     y =>
                         {
                             // TODO: Without Parallel.For() this buffer object could be reused:
-                            using (var tempRowBuffer = new Buffer<Vector4>(source.Width))
+                            using (var tempRowBuffer = MemoryManager.Current.Allocate<Vector4>(source.Width))
                             {
                                 Span<Vector4> firstPassRow = firstPassPixels.GetRowSpan(y);
                                 Span<TPixel> sourceRow = source.GetPixelRowSpan(y);
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
index 83c2a2ee8..e00b94a2e 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
@@ -22,8 +22,8 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [GlobalSetup]
         public void Setup()
         {
-            this.destination = new Buffer<TPixel>(this.Count);
-            this.source = new Buffer<Vector4>(this.Count);
+            this.destination = MemoryManager.Current.Allocate<TPixel>(this.Count);
+            this.source = MemoryManager.Current.Allocate<Vector4>(this.Count);
         }
 
         [GlobalCleanup]
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
index b4f6ea9c0..593291ded 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
@@ -25,8 +25,8 @@
         [GlobalSetup]
         public void Setup()
         {
-            this.destination = new Buffer<Rgba32>(this.Count);
-            this.source = new Buffer<Vector4>(this.Count * 4);
+            this.destination = MemoryManager.Current.Allocate<Rgba32>(this.Count);
+            this.source = MemoryManager.Current.Allocate<Vector4>(this.Count * 4);
             this.source.Pin();
             this.destination.Pin();
         }
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
index 5c3648c2d..d273124b8 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
@@ -19,8 +19,8 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [GlobalSetup]
         public void Setup()
         {
-            this.destination = new Buffer<TPixel>(this.Count);
-            this.source = new Buffer<byte>(this.Count * 4);
+            this.destination = MemoryManager.Current.Allocate<TPixel>(this.Count);
+            this.source = MemoryManager.Current.Allocate<byte>(this.Count * 4);
         }
 
         [GlobalCleanup]
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
index 2bf4e0da6..7e29dfe3a 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
@@ -21,8 +21,8 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [GlobalSetup]
         public void Setup()
         {
-            this.source = new Buffer<TPixel>(this.Count);
-            this.destination = new Buffer<Vector4>(this.Count);
+            this.source = MemoryManager.Current.Allocate<TPixel>(this.Count);
+            this.destination = MemoryManager.Current.Allocate<Vector4>(this.Count);
         }
 
         [GlobalCleanup]
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
index 2d624c19f..adc374c1f 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
@@ -19,8 +19,8 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [GlobalSetup]
         public void Setup()
         {
-            this.source = new Buffer<TPixel>(this.Count);
-            this.destination = new Buffer<byte>(this.Count * 3);
+            this.source = MemoryManager.Current.Allocate<TPixel>(this.Count);
+            this.destination = MemoryManager.Current.Allocate<byte>(this.Count * 3);
         }
 
         [GlobalCleanup]
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
index 150b55aed..bead1384b 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
@@ -24,8 +24,8 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [GlobalSetup]
         public void Setup()
         {
-            this.source = new Buffer<TPixel>(this.Count);
-            this.destination = new Buffer<byte>(this.Count * 4);
+            this.source = MemoryManager.Current.Allocate<TPixel>(this.Count);
+            this.destination = MemoryManager.Current.Allocate<byte>(this.Count * 4);
         }
 
         [GlobalCleanup]
diff --git a/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs b/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
index 0ac1413be..47c812554 100644
--- a/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
+++ b/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
@@ -18,7 +18,7 @@ namespace SixLabors.ImageSharp.Benchmarks.General
         [GlobalSetup]
         public void Setup()
         {
-            this.buffer = new Buffer<Rgba32>(this.Count);
+            this.buffer = MemoryManager.Current.Allocate<Rgba32>(this.Count);
         }
 
         [GlobalCleanup]
diff --git a/tests/ImageSharp.Benchmarks/General/IterateArray.cs b/tests/ImageSharp.Benchmarks/General/IterateArray.cs
index 48ee266fe..383e7080c 100644
--- a/tests/ImageSharp.Benchmarks/General/IterateArray.cs
+++ b/tests/ImageSharp.Benchmarks/General/IterateArray.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Benchmarks.General
         [GlobalSetup]
         public void Setup()
         {
-            this.buffer = new Buffer<Vector4>(this.Length);
+            this.buffer = MemoryManager.Current.Allocate<Vector4>(this.Length);
             this.buffer.Pin();
             this.array = new Vector4[this.Length];
         }
diff --git a/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs b/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
index 5a3131f79..ef44d1e78 100644
--- a/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
+++ b/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
@@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.Benchmarks
             Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
             Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-            using (Buffer<Vector4> buffer = new Buffer<Vector4>(destination.Length * 3))
+            using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
             {
                 Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                 Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Benchmarks
         {
             using (Image<Rgba32> image = new Image<Rgba32>(800, 800))
             {
-                Buffer<float> amounts = new Buffer<float>(image.Width);
+                Buffer<float> amounts = MemoryManager.Current.Allocate<float>(image.Width);
 
                 for (int x = 0; x < image.Width; x++)
                 {
@@ -82,7 +82,7 @@ namespace SixLabors.ImageSharp.Benchmarks
         {
             using (Image<Rgba32> image = new Image<Rgba32>(800, 800))
             {
-                Buffer<float> amounts = new Buffer<float>(image.Width);
+                Buffer<float> amounts = MemoryManager.Current.Allocate<float>(image.Width);
 
                 for (int x = 0; x < image.Width; x++)
                 {
diff --git a/tests/ImageSharp.Benchmarks/Samplers/Glow.cs b/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
index 1f88c4fbf..0494db9b9 100644
--- a/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
+++ b/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
@@ -103,7 +103,7 @@ namespace SixLabors.ImageSharp.Benchmarks
                 }
 
                 int width = maxX - minX;
-                using (Buffer<TPixel> rowColors = new Buffer<TPixel>(width))
+                using (Buffer<TPixel> rowColors = MemoryManager.Current.Allocate<TPixel>(width))
                 using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     for (int i = 0; i < width; i++)
diff --git a/tests/ImageSharp.Tests/Memory/BufferTests.cs b/tests/ImageSharp.Tests/Memory/BufferTests.cs
index e1efeb24e..8669f2bb0 100644
--- a/tests/ImageSharp.Tests/Memory/BufferTests.cs
+++ b/tests/ImageSharp.Tests/Memory/BufferTests.cs
@@ -35,7 +35,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(1111)]
         public void ConstructWithOwnArray(int count)
         {
-            using (Buffer<TestStructs.Foo> buffer = new Buffer<TestStructs.Foo>(count))
+            using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(count))
             {
                 Assert.False(buffer.IsDisposedOrLostArrayOwnership);
                 Assert.NotNull(buffer.Array);
@@ -76,7 +76,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         {
             for (int i = 0; i < 100; i++)
             {
-                using (Buffer<int> buffer = Buffer<int>.CreateClean(42))
+                using (Buffer<int> buffer = MemoryManager.Current.Allocate<int>(42, true))
                 {
                     for (int j = 0; j < buffer.Length; j++)
                     {
@@ -129,7 +129,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [Fact]
         public void Dispose()
         {
-            Buffer<TestStructs.Foo> buffer = new Buffer<TestStructs.Foo>(42);
+            Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(42);
             buffer.Dispose();
 
             Assert.True(buffer.IsDisposedOrLostArrayOwnership);
@@ -140,7 +140,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(123)]
         public void CastToSpan(int bufferLength)
         {
-            using (Buffer<TestStructs.Foo> buffer = new Buffer<TestStructs.Foo>(bufferLength))
+            using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(bufferLength))
             {
                 Span<TestStructs.Foo> span = buffer;
 
@@ -154,7 +154,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [Fact]
         public void Span()
         {
-            using (Buffer<TestStructs.Foo> buffer = new Buffer<TestStructs.Foo>(42))
+            using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(42))
             {
                 Span<TestStructs.Foo> span = buffer.Span;
 
@@ -173,7 +173,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             [InlineData(123, 17)]
             public void WithStartOnly(int bufferLength, int start)
             {
-                using (Buffer<TestStructs.Foo> buffer = new Buffer<TestStructs.Foo>(bufferLength))
+                using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(bufferLength))
                 {
                     Span<TestStructs.Foo> span = buffer.Slice(start);
 
@@ -187,7 +187,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             [InlineData(123, 17, 42)]
             public void WithStartAndLength(int bufferLength, int start, int spanLength)
             {
-                using (Buffer<TestStructs.Foo> buffer = new Buffer<TestStructs.Foo>(bufferLength))
+                using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(bufferLength))
                 {
                     Span<TestStructs.Foo> span = buffer.Slice(start, spanLength);
 
@@ -201,7 +201,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         public void UnPinAndTakeArrayOwnership()
         {
             TestStructs.Foo[] data = null;
-            using (Buffer<TestStructs.Foo> buffer = new Buffer<TestStructs.Foo>(42))
+            using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(42))
             {
                 data = buffer.TakeArrayOwnership();
                 Assert.True(buffer.IsDisposedOrLostArrayOwnership);
@@ -216,7 +216,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             [Fact]
             public void ReturnsPinnedPointerToTheBeginningOfArray()
             {
-                using (Buffer<TestStructs.Foo> buffer = new Buffer<TestStructs.Foo>(42))
+                using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(42))
                 {
                     TestStructs.Foo* actual = (TestStructs.Foo*)buffer.Pin();
                     fixed (TestStructs.Foo* expected = buffer.Array)
@@ -229,7 +229,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             [Fact]
             public void SecondCallReturnsTheSamePointer()
             {
-                using (Buffer<TestStructs.Foo> buffer = new Buffer<TestStructs.Foo>(42))
+                using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(42))
                 {
                     IntPtr ptr1 = buffer.Pin();
                     IntPtr ptr2 = buffer.Pin();
@@ -241,7 +241,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             [Fact]
             public void WhenCalledOnDisposedBuffer_ThrowsInvalidOperationException()
             {
-                Buffer<TestStructs.Foo> buffer = new Buffer<TestStructs.Foo>(42);
+                Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(42);
                 buffer.Dispose();
 
                 Assert.Throws<InvalidOperationException>(() => buffer.Pin());
diff --git a/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs b/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs
index 395c32546..8b90295ce 100644
--- a/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs
+++ b/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs
@@ -424,7 +424,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 Rgba32[] colors = { new Rgba32(0, 1, 2, 3), new Rgba32(4, 5, 6, 7), new Rgba32(8, 9, 10, 11), };
 
                 using (Buffer<Rgba32> colorBuf = new Buffer<Rgba32>(colors))
-                using (Buffer<byte> byteBuf = new Buffer<byte>(colors.Length * 4))
+                using (Buffer<byte> byteBuf = MemoryManager.Current.Allocate<byte>(colors.Length * 4))
                 {
                     SpanHelper.Copy(colorBuf.Span.AsBytes(), byteBuf, colorBuf.Length * sizeof(Rgba32));
 
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
index 0fde67d28..c7227eb8a 100644
--- a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
@@ -50,8 +50,8 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
                 int times = 200000;
                 int count = 1024;
 
-                using (Buffer<ImageSharp.Rgba32> source = new Buffer<ImageSharp.Rgba32>(count))
-                using (Buffer<Vector4> dest = new Buffer<Vector4>(count))
+                using (Buffer<ImageSharp.Rgba32> source = MemoryManager.Current.Allocate<ImageSharp.Rgba32>(count))
+                using (Buffer<Vector4> dest = MemoryManager.Current.Allocate<Vector4>(count))
                 {
                     this.Measure(
                         times,
@@ -344,7 +344,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             {
                 this.SourceBuffer = new Buffer<TSource>(source);
                 this.ExpectedDestBuffer = new Buffer<TDest>(expectedDest);
-                this.ActualDestBuffer = new Buffer<TDest>(expectedDest.Length);
+                this.ActualDestBuffer = MemoryManager.Current.Allocate<TDest>(expectedDest.Length);
             }
 
             public void Dispose()
diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
index a201b39bd..babe148c8 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
@@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             int length = source.Length;
             Guard.MustBeSizedAtLeast(dest, length, nameof(dest));
 
-            using (var rgbaBuffer = new Buffer<Rgba32>(length))
+            using (var rgbaBuffer = MemoryManager.Current.Allocate<Rgba32>(length))
             {
                 PixelOperations<TPixel>.Instance.ToRgba32(source, rgbaBuffer, length);
 
@@ -39,7 +39,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             int length = source.Length;
             Guard.MustBeSizedAtLeast(dest, length, nameof(dest));
 
-            using (var rgbaBuffer = new Buffer<Rgba32>(length))
+            using (var rgbaBuffer = MemoryManager.Current.Allocate<Rgba32>(length))
             {
                 PixelOperations<Argb32>.Instance.ToRgba32(source, rgbaBuffer, length);
 
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             int length = source.Length;
             Guard.MustBeSizedAtLeast(dest, length, nameof(dest));
 
-            using (var rgbaBuffer = new Buffer<Rgb24>(length))
+            using (var rgbaBuffer = MemoryManager.Current.Allocate<Rgb24>(length))
             {
                 PixelOperations<Rgb24>.Instance.ToRgb24(source, rgbaBuffer, length);
 
@@ -96,7 +96,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
 
             var image = new Image<TPixel>(w, h);
 
-            using (var workBuffer = new Buffer<Argb32>(w))
+            using (var workBuffer = MemoryManager.Current.Allocate<Argb32>(w))
             {
                 var destPtr = (Argb32*)workBuffer.Pin();
                 for (int y = 0; y < h; y++)
@@ -138,7 +138,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
 
             var image = new Image<TPixel>(w, h);
 
-            using (var workBuffer = new Buffer<Rgb24>(w))
+            using (var workBuffer = MemoryManager.Current.Allocate<Rgb24>(w))
             {
                 var destPtr = (Rgb24*)workBuffer.Pin();
                 for (int y = 0; y < h; y++)
@@ -170,7 +170,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             long destRowByteCount = data.Stride;
             long sourceRowByteCount = w * sizeof(Argb32);
 
-            using (var workBuffer = new Buffer<Argb32>(w))
+            using (var workBuffer = MemoryManager.Current.Allocate<Argb32>(w))
             {
                 var sourcePtr = (Argb32*)workBuffer.Pin();
 

From b91b2966e81eee13c491db17a974d22af28d5f00 Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Thu, 11 Jan 2018 21:04:33 +0200
Subject: [PATCH 03/70] - Allocate Buffer2Ds from memory manager

---
 .../Decoder/JpegComponentPostProcessor.cs     |  4 ++-
 .../Components/PdfJsQuantizationTables.cs     |  2 +-
 src/ImageSharp/Image/ImageFrame{TPixel}.cs    |  2 +-
 src/ImageSharp/Memory/Buffer2D{T}.cs          | 30 -------------------
 src/ImageSharp/Memory/MemoryManager.cs        |  8 +++++
 .../Processors/Transforms/ResizeProcessor.cs  |  2 +-
 .../General/PixelIndexing.cs                  |  2 +-
 .../Image/Jpeg/YCbCrColorConversion.cs        |  2 +-
 .../Jpg/Block8x8FTests.CopyToBufferArea.cs    |  4 +--
 .../Formats/Jpg/JpegColorConverterTests.cs    |  2 +-
 .../Jpg/Utils/LibJpegTools.ComponentData.cs   |  2 +-
 .../ImageSharp.Tests/Memory/Buffer2DTests.cs  | 10 +++----
 .../Memory/BufferAreaTests.cs                 |  4 +--
 13 files changed, 27 insertions(+), 47 deletions(-)

diff --git a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegComponentPostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegComponentPostProcessor.cs
index 87c1431e0..7c91e85e7 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegComponentPostProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegComponentPostProcessor.cs
@@ -26,7 +26,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
         {
             this.Component = component;
             this.ImagePostProcessor = imagePostProcessor;
-            this.ColorBuffer = new Buffer2D<float>(imagePostProcessor.PostProcessorBufferSize);
+            this.ColorBuffer = MemoryManager.Current.Allocate2D<float>(
+                imagePostProcessor.PostProcessorBufferSize.Width,
+                imagePostProcessor.PostProcessorBufferSize.Height);
 
             this.BlockRowsPerStep = JpegImagePostProcessor.BlockRowsPerStep / this.Component.SubSamplingDivisors.Height;
             this.blockAreaSize = this.Component.SubSamplingDivisors * 8;
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsQuantizationTables.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsQuantizationTables.cs
index 1000ce82c..a585c5080 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsQuantizationTables.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsQuantizationTables.cs
@@ -49,7 +49,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
             get; set;
         }
 
-        = new Buffer2D<short>(64, 4);
+        = MemoryManager.Current.Allocate2D<short>(64, 4);
 
         /// <inheritdoc/>
         public void Dispose()
diff --git a/src/ImageSharp/Image/ImageFrame{TPixel}.cs b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
index 45ed5f053..a0e4976cb 100644
--- a/src/ImageSharp/Image/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp
         /// <param name="source">The source.</param>
         internal ImageFrame(ImageFrame<TPixel> source)
         {
-            this.pixelBuffer = new Buffer2D<TPixel>(source.pixelBuffer.Width, source.pixelBuffer.Height);
+            this.pixelBuffer = MemoryManager.Current.Allocate2D<TPixel>(source.pixelBuffer.Width, source.pixelBuffer.Height);
             source.pixelBuffer.Span.CopyTo(this.pixelBuffer.Span);
             this.MetaData = source.MetaData.Clone();
         }
diff --git a/src/ImageSharp/Memory/Buffer2D{T}.cs b/src/ImageSharp/Memory/Buffer2D{T}.cs
index a7de343f9..73444d497 100644
--- a/src/ImageSharp/Memory/Buffer2D{T}.cs
+++ b/src/ImageSharp/Memory/Buffer2D{T}.cs
@@ -15,36 +15,6 @@ namespace SixLabors.ImageSharp.Memory
     internal class Buffer2D<T> : IBuffer2D<T>, IDisposable
         where T : struct
     {
-        public Buffer2D(Size size)
-            : this(size.Width, size.Height)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Buffer2D{T}"/> class.
-        /// </summary>
-        /// <param name="width">The number of elements in a row</param>
-        /// <param name="height">The number of rows</param>
-        public Buffer2D(int width, int height)
-            : this(MemoryManager.Current.Allocate<T>(width * height), width, height)
-        {
-            this.Width = width;
-            this.Height = height;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Buffer2D{T}"/> class.
-        /// </summary>
-        /// <param name="array">The array to pin</param>
-        /// <param name="width">The number of elements in a row</param>
-        /// <param name="height">The number of rows</param>
-        public Buffer2D(T[] array, int width, int height)
-        {
-            this.Buffer = new Buffer<T>(array, width * height);
-            this.Width = width;
-            this.Height = height;
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Buffer2D{T}"/> class.
         /// </summary>
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index 54b727b60..38e68e22c 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -35,5 +35,13 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="buffer">The buffer to release</param>
         internal abstract void Release<T>(Buffer<T> buffer)
             where T : struct;
+
+        internal Buffer2D<T> Allocate2D<T>(int width, int height, bool clear = false)
+            where T : struct
+        {
+            var buffer = this.Allocate<T>(width * height, clear);
+
+            return new Buffer2D<T>(buffer, width, height);
+        }
     }
 }
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
index 6dcffbbc0..dbc05876d 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
@@ -121,7 +121,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             // First process the columns. Since we are not using multiple threads startY and endY
             // are the upper and lower bounds of the source rectangle.
             // TODO: Using a transposed variant of 'firstPassPixels' could eliminate the need for the WeightsWindow.ComputeWeightedColumnSum() method, and improve speed!
-            using (var firstPassPixels = new Buffer2D<Vector4>(width, source.Height))
+            using (var firstPassPixels = MemoryManager.Current.Allocate2D<Vector4>(width, source.Height))
             {
                 firstPassPixels.Buffer.Clear();
 
diff --git a/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs b/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
index b0560b163..58f835a07 100644
--- a/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
+++ b/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
@@ -149,7 +149,7 @@
         public void Setup()
         {
             this.width = 2048;
-            this.buffer = new Buffer2D<Vector4>(2048, 2048);
+            this.buffer = MemoryManager.Current.Allocate2D<Vector4>(2048, 2048);
             this.pointer = (Vector4*)this.buffer.Buffer.Pin();
             this.array = this.buffer.Buffer.Array;
             this.pinnable = Unsafe.As<Pinnable<Vector4>>(this.array);
diff --git a/tests/ImageSharp.Benchmarks/Image/Jpeg/YCbCrColorConversion.cs b/tests/ImageSharp.Benchmarks/Image/Jpeg/YCbCrColorConversion.cs
index 93420aacf..f513e0d38 100644
--- a/tests/ImageSharp.Benchmarks/Image/Jpeg/YCbCrColorConversion.cs
+++ b/tests/ImageSharp.Benchmarks/Image/Jpeg/YCbCrColorConversion.cs
@@ -76,7 +76,7 @@
                 }
 
                 // no need to dispose when buffer is not array owner
-                buffers[i] = new Buffer2D<float>(values, values.Length, 1);
+                buffers[i] = MemoryManager.Current.Allocate2D<float>(values.Length, 1);
             }
 
             return buffers;
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.CopyToBufferArea.cs b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.CopyToBufferArea.cs
index 191cfec73..1dc4896ee 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.CopyToBufferArea.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.CopyToBufferArea.cs
@@ -48,7 +48,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             {
                 Block8x8F block = CreateRandomFloatBlock(0, 100);
 
-                using (var buffer = new Buffer2D<float>(20, 20))
+                using (var buffer = MemoryManager.Current.Allocate2D<float>(20, 20))
                 {
                     BufferArea<float> area = buffer.GetArea(5, 10, 8, 8);
                     block.CopyTo(area);
@@ -78,7 +78,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 
                 var start = new Point(50, 50);
 
-                using (var buffer = new Buffer2D<float>(100, 100))
+                using (var buffer = MemoryManager.Current.Allocate2D<float>(100, 100))
                 {
                     BufferArea<float> area = buffer.GetArea(start.X, start.Y, 8 * horizontalFactor, 8 * verticalFactor);
                     block.CopyTo(area, horizontalFactor, verticalFactor);
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
index 7e0dc915c..95a62f7fe 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
@@ -273,7 +273,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 }
 
                 // no need to dispose when buffer is not array owner
-                buffers[i] = new Buffer2D<float>(values, values.Length, 1);
+                buffers[i] = new Buffer2D<float>(new Buffer<float>(values, values.Length), values.Length, 1);
             }
             return new JpegColorConverter.ComponentValues(buffers, 0);
         }
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs b/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs
index 40b41b9cb..ad9ad8143 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs
@@ -23,7 +23,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
                 this.HeightInBlocks = heightInBlocks;
                 this.WidthInBlocks = widthInBlocks;
                 this.Index = index;
-                this.SpectralBlocks = new Buffer2D<Block8x8>(this.WidthInBlocks, this.HeightInBlocks);
+                this.SpectralBlocks = MemoryManager.Current.Allocate2D<Block8x8>(this.WidthInBlocks, this.HeightInBlocks);
             }
 
             public Size Size => new Size(this.WidthInBlocks, this.HeightInBlocks);
diff --git a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
index 7ab0ed949..2e99616a8 100644
--- a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
+++ b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
@@ -31,7 +31,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(1025, 17)]
         public void Construct(int width, int height)
         {
-            using (Buffer2D<TestStructs.Foo> buffer = new Buffer2D<TestStructs.Foo>(width, height))
+            using (Buffer2D<TestStructs.Foo> buffer = MemoryManager.Current.Allocate2D<TestStructs.Foo>(width, height))
             {
                 Assert.Equal(width, buffer.Width);
                 Assert.Equal(height, buffer.Height);
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         public void Construct_FromExternalArray(int width, int height)
         {
             TestStructs.Foo[] array = new TestStructs.Foo[width * height + 10];
-            using (Buffer2D<TestStructs.Foo> buffer = new Buffer2D<TestStructs.Foo>(array, width, height))
+            using (Buffer2D<TestStructs.Foo> buffer = new Buffer2D<TestStructs.Foo>(new Buffer<TestStructs.Foo>(array, array.Length), width, height))
             {
                 Assert.Equal(width, buffer.Width);
                 Assert.Equal(height, buffer.Height);
@@ -76,7 +76,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(17, 42, 41)]
         public void GetRowSpanY(int width, int height, int y)
         {
-            using (Buffer2D<TestStructs.Foo> buffer = new Buffer2D<TestStructs.Foo>(width, height))
+            using (Buffer2D<TestStructs.Foo> buffer = MemoryManager.Current.Allocate2D<TestStructs.Foo>(width, height))
             {
                 Span<TestStructs.Foo> span = buffer.GetRowSpan(y);
 
@@ -92,7 +92,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(17, 42, 0, 41)]
         public void GetRowSpanXY(int width, int height, int x, int y)
         {
-            using (Buffer2D<TestStructs.Foo> buffer = new Buffer2D<TestStructs.Foo>(width, height))
+            using (Buffer2D<TestStructs.Foo> buffer = MemoryManager.Current.Allocate2D<TestStructs.Foo>(width, height))
             {
                 Span<TestStructs.Foo> span = buffer.GetRowSpan(x, y);
 
@@ -108,7 +108,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(99, 88, 98, 87)]
         public void Indexer(int width, int height, int x, int y)
         {
-            using (Buffer2D<TestStructs.Foo> buffer = new Buffer2D<TestStructs.Foo>(width, height))
+            using (Buffer2D<TestStructs.Foo> buffer = MemoryManager.Current.Allocate2D<TestStructs.Foo>(width, height))
             {
                 TestStructs.Foo[] array = buffer.Buffer.Array;
 
diff --git a/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs b/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs
index 026b69498..74e9098b9 100644
--- a/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs
+++ b/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs
@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [Fact]
         public void Construct()
         {
-            using (var buffer = new Buffer2D<int>(10, 20))
+            using (var buffer = MemoryManager.Current.Allocate2D<int>(10, 20))
             {
                 var rectangle = new Rectangle(3,2, 5, 6);
                 var area = new BufferArea<int>(buffer, rectangle);
@@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
 
         private static Buffer2D<int> CreateTestBuffer(int w, int h)
         {
-            var buffer = new Buffer2D<int>(w, h);
+            var buffer = MemoryManager.Current.Allocate2D<int>(w, h);
             for (int y = 0; y < h; y++)
             {
                 for (int x = 0; x < w; x++)

From f9a52c0df76bd936212f8ca3322c7ace8dcd6678 Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Thu, 11 Jan 2018 21:05:42 +0200
Subject: [PATCH 04/70] - Add a minimum size threshold for array pool usage -
 Add a null memory manager that doesn't do any actual memory management

---
 .../Memory/ArrayPoolMemoryManager.cs          | 36 +++++++++++++++++++
 src/ImageSharp/Memory/MemoryManager.cs        |  2 +-
 src/ImageSharp/Memory/NullMemoryManager.cs    | 19 ++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 src/ImageSharp/Memory/NullMemoryManager.cs

diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index c4ce7d299..7a3adfb53 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -1,4 +1,5 @@
 using System.Buffers;
+using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Memory
 {
@@ -7,9 +8,30 @@ namespace SixLabors.ImageSharp.Memory
     /// </summary>
     public class ArrayPoolMemoryManager : MemoryManager
     {
+        private readonly int minSizeBytes;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArrayPoolMemoryManager"/> class.
+        /// By passing an integer greater than 0 as <paramref name="minSizeBytes"/>, a
+        /// minimum threshold for pooled allocations is set. Any allocation requests that
+        /// would require less size than the threshold will not be managed within the array pool.
+        /// </summary>
+        /// <param name="minSizeBytes">
+        /// Minimum size, in bytes, before an array pool is used to satisfy the request.
+        /// </param>
+        public ArrayPoolMemoryManager(int minSizeBytes = 0)
+        {
+            this.minSizeBytes = minSizeBytes;
+        }
+
         /// <inheritdoc />
         internal override Buffer<T> Allocate<T>(int size, bool clear = false)
         {
+            if (this.minSizeBytes > 0 && size < this.minSizeBytes * SizeHelper<T>.Size)
+            {
+                return new Buffer<T>(new T[size], size);
+            }
+
             var buffer = new Buffer<T>(PixelDataPool<T>.Rent(size), size, this);
             if (clear)
             {
@@ -24,5 +46,19 @@ namespace SixLabors.ImageSharp.Memory
         {
             PixelDataPool<T>.Return(buffer.Array);
         }
+
+        internal static class SizeHelper<T>
+        {
+            static SizeHelper()
+            {
+                #if NETSTANDARD1_1
+                Size = Marshal.SizeOf(typeof(T));
+                #else
+                Size = Marshal.SizeOf<T>();
+                #endif
+            }
+
+            public static int Size { get; }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index 38e68e22c..b68a01feb 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -14,7 +14,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <summary>
         /// Gets or sets the <see cref="MemoryManager"/> that is currently in use.
         /// </summary>
-        public static MemoryManager Current { get; set; } = new ArrayPoolMemoryManager();
+        public static MemoryManager Current { get; set; } = new ArrayPoolMemoryManager(1024 * 80);
 
         /// <summary>
         /// Allocates a <see cref="Buffer{T}"/> of size <paramref name="size"/>, optionally
diff --git a/src/ImageSharp/Memory/NullMemoryManager.cs b/src/ImageSharp/Memory/NullMemoryManager.cs
new file mode 100644
index 000000000..32642dae4
--- /dev/null
+++ b/src/ImageSharp/Memory/NullMemoryManager.cs
@@ -0,0 +1,19 @@
+namespace SixLabors.ImageSharp.Memory
+{
+    /// <summary>
+    /// Implements <see cref="MemoryManager"/> by allocating new buffers on every call.
+    /// </summary>
+    public class NullMemoryManager : MemoryManager
+    {
+        /// <inheritdoc />
+        internal override Buffer<T> Allocate<T>(int size, bool clear = false)
+        {
+            return new Buffer<T>(new T[size], size);
+        }
+
+        /// <inheritdoc />
+        internal override void Release<T>(Buffer<T> buffer)
+        {
+        }
+    }
+}

From 1985363ca255b3571287343d5ba2766c83edc19f Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Thu, 11 Jan 2018 23:13:19 +0200
Subject: [PATCH 05/70] - Removed a test that doesn't actually test anything
 any more

---
 tests/ImageSharp.Tests/Memory/Buffer2DTests.cs | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
index 2e99616a8..f14995433 100644
--- a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
+++ b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
@@ -39,21 +39,6 @@ namespace SixLabors.ImageSharp.Tests.Memory
             }
         }
 
-        [Theory]
-        [InlineData(7, 42)]
-        [InlineData(1025, 17)]
-        public void Construct_FromExternalArray(int width, int height)
-        {
-            TestStructs.Foo[] array = new TestStructs.Foo[width * height + 10];
-            using (Buffer2D<TestStructs.Foo> buffer = new Buffer2D<TestStructs.Foo>(new Buffer<TestStructs.Foo>(array, array.Length), width, height))
-            {
-                Assert.Equal(width, buffer.Width);
-                Assert.Equal(height, buffer.Height);
-                Assert.Equal(width * height, buffer.Buffer.Length);
-            }
-        }
-
-
         [Fact]
         public void CreateClean()
         {

From 5d568686dbbc1e6fdb8b37e1656c70ccd9e4ceb0 Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Thu, 11 Jan 2018 22:29:58 +0200
Subject: [PATCH 06/70] - Removed PixelDataPool

---
 .../Memory/ArrayPoolMemoryManager.cs          | 35 +++++++-----
 src/ImageSharp/Memory/Buffer{T}.cs            |  2 +-
 .../Memory/PixelDataPoolTests.cs              | 55 -------------------
 3 files changed, 21 insertions(+), 71 deletions(-)
 delete mode 100644 tests/ImageSharp.Tests/Memory/PixelDataPoolTests.cs

diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index 7a3adfb53..86f3f0015 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -1,14 +1,17 @@
 using System.Buffers;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Memory
 {
+
     /// <summary>
     /// Implements <see cref="MemoryManager"/> by allocating memory from <see cref="ArrayPool{T}"/>.
     /// </summary>
     public class ArrayPoolMemoryManager : MemoryManager
     {
         private readonly int minSizeBytes;
+        private readonly ArrayPool<byte> pool;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayPoolMemoryManager"/> class.
@@ -22,17 +25,21 @@ namespace SixLabors.ImageSharp.Memory
         public ArrayPoolMemoryManager(int minSizeBytes = 0)
         {
             this.minSizeBytes = minSizeBytes;
+
+            this.pool = ArrayPool<byte>.Create(CalculateMaxArrayLength(), 50);
         }
 
         /// <inheritdoc />
         internal override Buffer<T> Allocate<T>(int size, bool clear = false)
         {
-            if (this.minSizeBytes > 0 && size < this.minSizeBytes * SizeHelper<T>.Size)
+            int itemSize = Unsafe.SizeOf<T>();
+            if (this.minSizeBytes > 0 && itemSize < this.minSizeBytes * itemSize)
             {
-                return new Buffer<T>(new T[size], size);
+                return new Buffer<T>(new T[itemSize], itemSize);
             }
 
-            var buffer = new Buffer<T>(PixelDataPool<T>.Rent(size), size, this);
+            byte[] byteBuffer = this.pool.Rent(itemSize * itemSize);
+            var buffer = new Buffer<T>(Unsafe.As<T[]>(byteBuffer), itemSize, this);
             if (clear)
             {
                 buffer.Clear();
@@ -44,21 +51,19 @@ namespace SixLabors.ImageSharp.Memory
         /// <inheritdoc />
         internal override void Release<T>(Buffer<T> buffer)
         {
-            PixelDataPool<T>.Return(buffer.Array);
+            var byteBuffer = Unsafe.As<byte[]>(buffer.Array);
+            this.pool.Return(byteBuffer);
         }
 
-        internal static class SizeHelper<T>
+        /// <summary>
+        /// Heuristically calculates a reasonable maxArrayLength value for the backing <see cref="ArrayPool{T}"/>.
+        /// </summary>
+        /// <returns>The maxArrayLength value</returns>
+        internal static int CalculateMaxArrayLength()
         {
-            static SizeHelper()
-            {
-                #if NETSTANDARD1_1
-                Size = Marshal.SizeOf(typeof(T));
-                #else
-                Size = Marshal.SizeOf<T>();
-                #endif
-            }
-
-            public static int Size { get; }
+            const int MaximumExpectedImageSize = 16384 * 16384;
+            const int MaximumBytesPerPixel = 4;
+            return MaximumExpectedImageSize * MaximumBytesPerPixel;
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/Buffer{T}.cs b/src/ImageSharp/Memory/Buffer{T}.cs
index 16f4e8599..d25cc232a 100644
--- a/src/ImageSharp/Memory/Buffer{T}.cs
+++ b/src/ImageSharp/Memory/Buffer{T}.cs
@@ -171,7 +171,7 @@ namespace SixLabors.ImageSharp.Memory
 
         /// <summary>
         /// Unpins <see cref="Array"/> and makes the object "quasi-disposed" so the array is no longer owned by this object.
-        /// If <see cref="Array"/> is rented, it's the callers responsibility to return it to it's pool. (Most likely <see cref="PixelDataPool{T}"/>)
+        /// If <see cref="Array"/> is rented, it's the callers responsibility to return it to it's pool.
         /// </summary>
         /// <returns>The unpinned <see cref="Array"/></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
diff --git a/tests/ImageSharp.Tests/Memory/PixelDataPoolTests.cs b/tests/ImageSharp.Tests/Memory/PixelDataPoolTests.cs
deleted file mode 100644
index fdfd4c4b7..000000000
--- a/tests/ImageSharp.Tests/Memory/PixelDataPoolTests.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-
-
-// ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Tests.Memory
-{
-    using SixLabors.ImageSharp.Memory;
-
-    using Xunit;
-
-    /// <summary>
-    /// Tests the <see cref="PixelDataPool{T}"/> class.
-    /// </summary>
-    public class PixelDataPoolTests
-    {
-        [Fact]
-        public void PixelDataPoolRentsMinimumSize()
-        {
-            Rgba32[] pixels = PixelDataPool<Rgba32>.Rent(1024);
-
-            Assert.True(pixels.Length >= 1024);
-        }
-
-        [Fact]
-        public void PixelDataPoolDoesNotThrowWhenReturningNonPooled()
-        {
-            Rgba32[] pixels = new Rgba32[1024];
-
-            PixelDataPool<Rgba32>.Return(pixels);
-
-            Assert.True(pixels.Length >= 1024);
-        }
-
-        [Theory]
-        [InlineData(false)]
-        [InlineData(true)]
-        public void CalculateMaxArrayLength(bool isRawData)
-        {
-            int max = isRawData ? PixelDataPool<int>.CalculateMaxArrayLength()
-                          : PixelDataPool<Rgba32>.CalculateMaxArrayLength();
-
-            Assert.Equal(max > 1024 * 1024, !isRawData);
-        }
-
-        [Fact]
-        public void RentNonIPixelData()
-        {
-            byte[] data = PixelDataPool<byte>.Rent(16384);
-
-            Assert.True(data.Length >= 16384);
-        }
-    }
-}
\ No newline at end of file

From 29937e17aee6514dbbf2e8632668fd326fa18c5d Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Fri, 12 Jan 2018 15:00:45 +0200
Subject: [PATCH 07/70] - Oops. Note to self: don't make changes to unsafe  
 code just before going to sleep

---
 src/ImageSharp/Memory/ArrayPoolMemoryManager.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index 86f3f0015..80c6e00e3 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -30,16 +30,18 @@ namespace SixLabors.ImageSharp.Memory
         }
 
         /// <inheritdoc />
-        internal override Buffer<T> Allocate<T>(int size, bool clear = false)
+        internal override Buffer<T> Allocate<T>(int itemCount, bool clear = false)
         {
-            int itemSize = Unsafe.SizeOf<T>();
-            if (this.minSizeBytes > 0 && itemSize < this.minSizeBytes * itemSize)
+            int itemSizeBytes = Unsafe.SizeOf<T>();
+            int bufferSizeInBytes = itemCount * itemSizeBytes;
+
+            if (this.minSizeBytes > 0 && bufferSizeInBytes < this.minSizeBytes)
             {
-                return new Buffer<T>(new T[itemSize], itemSize);
+                return new Buffer<T>(new T[itemCount], itemCount);
             }
 
-            byte[] byteBuffer = this.pool.Rent(itemSize * itemSize);
-            var buffer = new Buffer<T>(Unsafe.As<T[]>(byteBuffer), itemSize, this);
+            byte[] byteBuffer = this.pool.Rent(bufferSizeInBytes);
+            var buffer = new Buffer<T>(Unsafe.As<T[]>(byteBuffer), itemCount, this);
             if (clear)
             {
                 buffer.Clear();

From 8d44ae346ed1247bb71e1b789579cd00d0ab3e14 Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Fri, 12 Jan 2018 13:35:35 +0200
Subject: [PATCH 08/70] - Explicitly pass MemoryManager to the places that  
 need it (aside from a few exceptions)

---
 .../Brushes/ImageBrush{TPixel}.cs             |  4 +-
 .../Brushes/PatternBrush{TPixel}.cs           |  4 +-
 .../Brushes/Processors/BrushApplicator.cs     |  4 +-
 .../Brushes/RecolorBrush{TPixel}.cs           |  4 +-
 .../Brushes/SolidBrush{TPixel}.cs             |  4 +-
 src/ImageSharp.Drawing/Paths/DrawPath.cs      |  2 +-
 src/ImageSharp.Drawing/Paths/FillPaths.cs     |  4 +-
 src/ImageSharp.Drawing/Paths/ShapePath.cs     |  6 ++-
 src/ImageSharp.Drawing/Paths/ShapeRegion.cs   |  7 +++-
 .../Processors/DrawImageProcessor.cs          |  2 +-
 .../Processors/FillProcessor.cs               |  2 +-
 .../Processors/FillRegionProcessor.cs         |  2 +-
 src/ImageSharp/Configuration.cs               |  5 +++
 .../DefaultInternalImageProcessorContext.cs   |  4 ++
 src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs  |  6 +--
 src/ImageSharp/Formats/Gif/GifDecoderCore.cs  |  6 +--
 .../Decoder/JpegComponentPostProcessor.cs     |  4 +-
 .../Common/Decoder/JpegImagePostProcessor.cs  |  6 +--
 .../Components/Decoder/OrigComponent.cs       |  4 +-
 .../Jpeg/GolangPort/OrigJpegDecoderCore.cs    |  4 +-
 .../Components/PdfJsFrameComponent.cs         |  6 ++-
 .../PdfJsPort/Components/PdfJsHuffmanTable.cs | 14 +++----
 .../Components/PdfJsJpegPixelArea.cs          |  9 ++--
 .../Components/PdfJsQuantizationTables.cs     |  7 +++-
 .../Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs    | 18 ++++----
 .../Formats/Png/PngConfigurationModule.cs     |  8 ++--
 src/ImageSharp/Formats/Png/PngDecoderCore.cs  | 14 +++----
 src/ImageSharp/Formats/Png/PngEncoder.cs      | 11 ++++-
 src/ImageSharp/Formats/Png/PngEncoderCore.cs  | 19 +++++----
 .../IImageProcessingContext{TPixel}.cs        |  3 ++
 src/ImageSharp/Image/Image.Decode.cs          |  2 +-
 .../Image/ImageFrame.LoadPixelData.cs         |  2 +-
 src/ImageSharp/Image/ImageFrameCollection.cs  |  4 +-
 src/ImageSharp/Image/ImageFrame{TPixel}.cs    | 21 ++++++----
 src/ImageSharp/Image/PixelAccessor{TPixel}.cs |  2 +-
 src/ImageSharp/Image/PixelArea{TPixel}.cs     |  2 +-
 src/ImageSharp/Memory/Buffer2D{T}.cs          | 18 --------
 src/ImageSharp/Memory/MemoryManager.cs        |  5 ---
 .../DefaultPixelBlenders.Generated.cs         | 42 +++++++++----------
 .../DefaultPixelBlenders.Generated.tt         |  2 +-
 .../Processing/ColorMatrix/Lomograph.cs       |  4 +-
 .../Processing/ColorMatrix/Polaroid.cs        |  4 +-
 .../Processing/Effects/BackgroundColor.cs     |  4 +-
 src/ImageSharp/Processing/Overlays/Glow.cs    |  4 +-
 .../Processing/Overlays/Vignette.cs           |  4 +-
 .../ColorMatrix/LomographProcessor.cs         | 11 +++--
 .../ColorMatrix/PolaroidProcessor.cs          | 13 ++++--
 .../Effects/BackgroundColorProcessor.cs       |  9 ++--
 .../Processors/Overlays/GlowProcessor.cs      |  9 ++--
 .../Processors/Overlays/VignetteProcessor.cs  | 12 ++++--
 .../ResamplingWeightedProcessor.Weights.cs    |  4 +-
 .../Transforms/ResamplingWeightedProcessor.cs | 12 ++++--
 .../Processors/Transforms/ResizeProcessor.cs  | 14 +++----
 .../Processing/Transforms/Resize.cs           |  4 +-
 .../FakeImageOperationsProvider.cs            |  6 +++
 55 files changed, 229 insertions(+), 178 deletions(-)

diff --git a/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
index d64225385..ff69d65ee 100644
--- a/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
@@ -122,8 +122,8 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             internal override void Apply(Span<float> scanline, int x, int y)
             {
                 // Create a span for colors
-                using (var amountBuffer = MemoryManager.Current.Allocate<float>(scanline.Length))
-                using (var overlay = MemoryManager.Current.Allocate<TPixel>(scanline.Length))
+                using (var amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+                using (var overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
                 {
                     int sourceY = (y - this.offsetY) % this.yLength;
                     int offsetX = x - this.offsetX;
diff --git a/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
index 4b26c4edc..2a2597987 100644
--- a/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
@@ -152,8 +152,8 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             internal override void Apply(Span<float> scanline, int x, int y)
             {
                 int patternY = y % this.pattern.Height;
-                using (var amountBuffer = MemoryManager.Current.Allocate<float>(scanline.Length))
-                using (var overlay = MemoryManager.Current.Allocate<TPixel>(scanline.Length))
+                using (var amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+                using (var overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
                 {
                     for (int i = 0; i < scanline.Length; i++)
                     {
diff --git a/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs b/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
index 5a50e12fb..08bbb571a 100644
--- a/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
+++ b/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
@@ -65,8 +65,8 @@ namespace SixLabors.ImageSharp.Drawing.Brushes.Processors
         /// <remarks>scanlineBuffer will be > scanlineWidth but provide and offset in case we want to share a larger buffer across runs.</remarks>
         internal virtual void Apply(Span<float> scanline, int x, int y)
         {
-            using (var amountBuffer = MemoryManager.Current.Allocate<float>(scanline.Length))
-            using (var overlay = MemoryManager.Current.Allocate<TPixel>(scanline.Length))
+            using (var amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+            using (var overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
             {
                 for (int i = 0; i < scanline.Length; i++)
                 {
diff --git a/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
index 1c02884f2..d48045711 100644
--- a/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
@@ -144,8 +144,8 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             /// <inheritdoc />
             internal override void Apply(Span<float> scanline, int x, int y)
             {
-                using (var amountBuffer = MemoryManager.Current.Allocate<float>(scanline.Length))
-                using (var overlay = MemoryManager.Current.Allocate<TPixel>(scanline.Length))
+                using (var amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+                using (var overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
                 {
                     for (int i = 0; i < scanline.Length; i++)
                     {
diff --git a/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
index b935bbe36..2d460603b 100644
--- a/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
@@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             public SolidBrushApplicator(ImageFrame<TPixel> source, TPixel color, GraphicsOptions options)
                 : base(source, options)
             {
-                this.Colors = MemoryManager.Current.Allocate<TPixel>(source.Width);
+                this.Colors = source.MemoryManager.Allocate<TPixel>(source.Width);
                 for (int i = 0; i < this.Colors.Length; i++)
                 {
                     this.Colors[i] = color;
@@ -96,7 +96,7 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
                 {
                     Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
 
-                    using (var amountBuffer = MemoryManager.Current.Allocate<float>(scanline.Length))
+                    using (var amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
                     {
                         for (int i = 0; i < scanline.Length; i++)
                         {
diff --git a/src/ImageSharp.Drawing/Paths/DrawPath.cs b/src/ImageSharp.Drawing/Paths/DrawPath.cs
index b6c821a60..a46d5751f 100644
--- a/src/ImageSharp.Drawing/Paths/DrawPath.cs
+++ b/src/ImageSharp.Drawing/Paths/DrawPath.cs
@@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp
         public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, IPen<TPixel> pen, IPath path, GraphicsOptions options)
            where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(pen.StrokeFill, new ShapePath(path, pen), options);
+            return source.Fill(pen.StrokeFill, new ShapePath(source.GetMemoryManager(), path, pen), options);
         }
 
         /// <summary>
diff --git a/src/ImageSharp.Drawing/Paths/FillPaths.cs b/src/ImageSharp.Drawing/Paths/FillPaths.cs
index f554ed758..5972c52a0 100644
--- a/src/ImageSharp.Drawing/Paths/FillPaths.cs
+++ b/src/ImageSharp.Drawing/Paths/FillPaths.cs
@@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp
         public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, IPath path, GraphicsOptions options)
           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(brush, new ShapeRegion(path), options);
+            return source.Fill(brush, new ShapeRegion(source.GetMemoryManager(), path), options);
         }
 
         /// <summary>
@@ -39,7 +39,7 @@ namespace SixLabors.ImageSharp
         public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, IPath path)
           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(brush, new ShapeRegion(path), GraphicsOptions.Default);
+            return source.Fill(brush, new ShapeRegion(source.GetMemoryManager(), path), GraphicsOptions.Default);
         }
 
         /// <summary>
diff --git a/src/ImageSharp.Drawing/Paths/ShapePath.cs b/src/ImageSharp.Drawing/Paths/ShapePath.cs
index 61f1291c4..f973668e5 100644
--- a/src/ImageSharp.Drawing/Paths/ShapePath.cs
+++ b/src/ImageSharp.Drawing/Paths/ShapePath.cs
@@ -4,6 +4,8 @@
 using System;
 using System.Buffers;
 using System.Numerics;
+
+using SixLabors.ImageSharp.Memory;
 using SixLabors.Shapes;
 
 namespace SixLabors.ImageSharp.Drawing
@@ -19,8 +21,8 @@ namespace SixLabors.ImageSharp.Drawing
         /// <param name="shape">The shape.</param>
         /// <param name="pen">The pen to apply to the shape.</param>
         // SixLabors.shape willbe moving to a Span/ReadOnlySpan based API shortly use ToArray for now.
-        public ShapePath(IPath shape, Pens.IPen pen)
-            : base(shape.GenerateOutline(pen.StrokeWidth, pen.StrokePattern.ToArray()))
+        public ShapePath(MemoryManager memoryManager, IPath shape, Pens.IPen pen)
+            : base(memoryManager, shape.GenerateOutline(pen.StrokeWidth, pen.StrokePattern.ToArray()))
         {
         }
     }
diff --git a/src/ImageSharp.Drawing/Paths/ShapeRegion.cs b/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
index 7851bac50..489468dbe 100644
--- a/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
+++ b/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
@@ -15,12 +15,15 @@ namespace SixLabors.ImageSharp.Drawing
     /// </summary>
     internal class ShapeRegion : Region
     {
+        private readonly MemoryManager memoryManager;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ShapeRegion"/> class.
         /// </summary>
         /// <param name="shape">The shape.</param>
-        public ShapeRegion(IPath shape)
+        public ShapeRegion(MemoryManager memoryManager, IPath shape)
         {
+            this.memoryManager = memoryManager;
             this.Shape = shape.AsClosedPath();
             int left = (int)MathF.Floor(shape.Bounds.Left);
             int top = (int)MathF.Floor(shape.Bounds.Top);
@@ -46,7 +49,7 @@ namespace SixLabors.ImageSharp.Drawing
         {
             var start = new PointF(this.Bounds.Left - 1, y);
             var end = new PointF(this.Bounds.Right + 1, y);
-            using (var innerBuffer = MemoryManager.Current.Allocate<PointF>(buffer.Length))
+            using (var innerBuffer = this.memoryManager.Allocate<PointF>(buffer.Length))
             {
                 PointF[] array = innerBuffer.Array;
                 int count = this.Shape.FindIntersections(start, end, array, 0);
diff --git a/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
index 2d411e0b6..201adfecc 100644
--- a/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
@@ -84,7 +84,7 @@ namespace SixLabors.ImageSharp.Drawing.Processors
                 maxY = Math.Min(this.Location.Y + this.Size.Height, maxY);
 
                 int width = maxX - minX;
-                using (var amount = MemoryManager.Current.Allocate<float>(width))
+                using (var amount = this.Image.GetConfiguration().MemoryManager.Allocate<float>(width))
                 {
                     for (int i = 0; i < width; i++)
                     {
diff --git a/src/ImageSharp.Drawing/Processors/FillProcessor.cs b/src/ImageSharp.Drawing/Processors/FillProcessor.cs
index f4763af1e..0174a6388 100644
--- a/src/ImageSharp.Drawing/Processors/FillProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/FillProcessor.cs
@@ -66,7 +66,7 @@ namespace SixLabors.ImageSharp.Drawing.Processors
 
             int width = maxX - minX;
 
-            using (var amount = MemoryManager.Current.Allocate<float>(width))
+            using (var amount = source.MemoryManager.Allocate<float>(width))
             using (BrushApplicator<TPixel> applicator = this.brush.CreateApplicator(source, sourceRectangle, this.options))
             {
                     for (int i = 0; i < width; i++)
diff --git a/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
index 82ffea08e..f3e3d0397 100644
--- a/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
@@ -102,7 +102,7 @@ namespace SixLabors.ImageSharp.Drawing.Processors
             {
                 float[] buffer = arrayPool.Rent(maxIntersections);
                 int scanlineWidth = maxX - minX;
-                using (var scanline = MemoryManager.Current.Allocate<float>(scanlineWidth))
+                using (var scanline = source.MemoryManager.Allocate<float>(scanlineWidth))
                 {
                     try
                     {
diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs
index 8ea676d32..bc8ad1c52 100644
--- a/src/ImageSharp/Configuration.cs
+++ b/src/ImageSharp/Configuration.cs
@@ -83,6 +83,11 @@ namespace SixLabors.ImageSharp
         /// </summary>
         public IEnumerable<IImageFormat> ImageFormats => this.imageFormats;
 
+        /// <summary>
+        /// Gets or sets the <see cref="MemoryManager"/> that is currently in use.
+        /// </summary>
+        public MemoryManager MemoryManager { get; set; } = new ArrayPoolMemoryManager(1024 * 80);
+
         /// <summary>
         /// Gets the maximum header size of all the formats.
         /// </summary>
diff --git a/src/ImageSharp/DefaultInternalImageProcessorContext.cs b/src/ImageSharp/DefaultInternalImageProcessorContext.cs
index 575525a77..22bcc82e1 100644
--- a/src/ImageSharp/DefaultInternalImageProcessorContext.cs
+++ b/src/ImageSharp/DefaultInternalImageProcessorContext.cs
@@ -1,7 +1,9 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Helpers;
+using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.Primitives;
@@ -72,5 +74,7 @@ namespace SixLabors.ImageSharp
         {
             return this.ApplyProcessor(processor, this.source.Bounds());
         }
+
+        public MemoryManager GetMemoryManager() => this.source.GetConfiguration().MemoryManager;
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
index 4faccc58f..07b7fabb6 100644
--- a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
@@ -263,7 +263,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             var color = default(TPixel);
             var rgba = new Rgba32(0, 0, 0, 255);
 
-            using (var buffer = Buffer2D<byte>.CreateClean(width, height))
+            using (var buffer = this.configuration.MemoryManager.Allocate2D<byte>(width, height, true))
             {
                 this.UncompressRle8(width, buffer.Span);
 
@@ -385,7 +385,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
                 padding = 4 - padding;
             }
 
-            using (var row = MemoryManager.Current.Allocate<byte>(arrayWidth + padding, true))
+            using (var row = this.configuration.MemoryManager.Allocate<byte>(arrayWidth + padding, true))
             {
                 var color = default(TPixel);
                 var rgba = new Rgba32(0, 0, 0, 255);
@@ -435,7 +435,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             var color = default(TPixel);
             var rgba = new Rgba32(0, 0, 0, 255);
 
-            using (var buffer = MemoryManager.Current.Allocate<byte>(stride))
+            using (var buffer = this.configuration.MemoryManager.Allocate<byte>(stride))
             {
                 for (int y = 0; y < height; y++)
                 {
diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
index 0003dbc82..51a598bc0 100644
--- a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
@@ -124,7 +124,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
                 if (this.logicalScreenDescriptor.GlobalColorTableFlag)
                 {
                     this.globalColorTableLength = this.logicalScreenDescriptor.GlobalColorTableSize * 3;
-                    this.globalColorTable = MemoryManager.Current.Allocate<byte>(this.globalColorTableLength, true);
+                    this.globalColorTable = this.configuration.MemoryManager.Allocate<byte>(this.globalColorTableLength, true);
 
                     // Read the global color table from the stream
                     stream.Read(this.globalColorTable.Array, 0, this.globalColorTableLength);
@@ -320,11 +320,11 @@ namespace SixLabors.ImageSharp.Formats.Gif
                 if (imageDescriptor.LocalColorTableFlag)
                 {
                     int length = imageDescriptor.LocalColorTableSize * 3;
-                    localColorTable = MemoryManager.Current.Allocate<byte>(length, true);
+                    localColorTable = this.configuration.MemoryManager.Allocate<byte>(length, true);
                     this.currentStream.Read(localColorTable.Array, 0, length);
                 }
 
-                indices = MemoryManager.Current.Allocate<byte>(imageDescriptor.Width * imageDescriptor.Height, true);
+                indices = this.configuration.MemoryManager.Allocate<byte>(imageDescriptor.Width * imageDescriptor.Height, true);
 
                 this.ReadFrameIndices(imageDescriptor, indices);
                 this.ReadFrameColors(indices, localColorTable ?? this.globalColorTable, imageDescriptor);
diff --git a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegComponentPostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegComponentPostProcessor.cs
index 7c91e85e7..ea9e52ae1 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegComponentPostProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegComponentPostProcessor.cs
@@ -22,11 +22,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
         /// <summary>
         /// Initializes a new instance of the <see cref="JpegComponentPostProcessor"/> class.
         /// </summary>
-        public JpegComponentPostProcessor(JpegImagePostProcessor imagePostProcessor, IJpegComponent component)
+        public JpegComponentPostProcessor(MemoryManager memoryManager, JpegImagePostProcessor imagePostProcessor, IJpegComponent component)
         {
             this.Component = component;
             this.ImagePostProcessor = imagePostProcessor;
-            this.ColorBuffer = MemoryManager.Current.Allocate2D<float>(
+            this.ColorBuffer = memoryManager.Allocate2D<float>(
                 imagePostProcessor.PostProcessorBufferSize.Width,
                 imagePostProcessor.PostProcessorBufferSize.Height);
 
diff --git a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
index 44deb6722..44841bd67 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
@@ -45,15 +45,15 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
         /// Initializes a new instance of the <see cref="JpegImagePostProcessor"/> class.
         /// </summary>
         /// <param name="rawJpeg">The <see cref="IRawJpegData"/> representing the uncompressed spectral Jpeg data</param>
-        public JpegImagePostProcessor(IRawJpegData rawJpeg)
+        public JpegImagePostProcessor(MemoryManager memoryManager, IRawJpegData rawJpeg)
         {
             this.RawJpeg = rawJpeg;
             IJpegComponent c0 = rawJpeg.Components.First();
             this.NumberOfPostProcessorSteps = c0.SizeInBlocks.Height / BlockRowsPerStep;
             this.PostProcessorBufferSize = new Size(c0.SizeInBlocks.Width * 8, PixelRowsPerStep);
 
-            this.ComponentProcessors = rawJpeg.Components.Select(c => new JpegComponentPostProcessor(this, c)).ToArray();
-            this.rgbaBuffer = MemoryManager.Current.Allocate<Vector4>(rawJpeg.ImageSizeInPixels.Width);
+            this.ComponentProcessors = rawJpeg.Components.Select(c => new JpegComponentPostProcessor(memoryManager, this, c)).ToArray();
+            this.rgbaBuffer = memoryManager.Allocate<Vector4>(rawJpeg.ImageSizeInPixels.Width);
             this.colorConverter = ColorConverters.JpegColorConverter.GetConverter(rawJpeg.ColorSpace);
         }
 
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigComponent.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigComponent.cs
index c87752b37..c2b4d632a 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigComponent.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigComponent.cs
@@ -55,7 +55,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// Initializes <see cref="SpectralBlocks"/>
         /// </summary>
         /// <param name="decoder">The <see cref="OrigJpegDecoderCore"/> instance</param>
-        public void InitializeDerivedData(OrigJpegDecoderCore decoder)
+        public void InitializeDerivedData(MemoryManager memoryManager, OrigJpegDecoderCore decoder)
         {
             // For 4-component images (either CMYK or YCbCrK), we only support two
             // hv vectors: [0x11 0x11 0x11 0x11] and [0x22 0x11 0x11 0x22].
@@ -78,7 +78,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                 this.SubSamplingDivisors = c0.SamplingFactors.DivideBy(this.SamplingFactors);
             }
 
-            this.SpectralBlocks = Buffer2D<Block8x8>.CreateClean(this.SizeInBlocks);
+            this.SpectralBlocks = memoryManager.Allocate2D<Block8x8>(this.SizeInBlocks.Width, this.SizeInBlocks.Height, true);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
index 61b18af55..053b016e6 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
@@ -659,7 +659,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
 
             foreach (OrigComponent component in this.Components)
             {
-                component.InitializeDerivedData(this);
+                component.InitializeDerivedData(this.configuration.MemoryManager, this);
             }
 
             this.ColorSpace = this.DeduceJpegColorSpace();
@@ -767,7 +767,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
         private Image<TPixel> PostProcessIntoImage<TPixel>()
             where TPixel : struct, IPixel<TPixel>
         {
-            using (var postProcessor = new JpegImagePostProcessor(this))
+            using (var postProcessor = new JpegImagePostProcessor(this.configuration.MemoryManager, this))
             {
                 var image = new Image<TPixel>(this.configuration, this.ImageWidth, this.ImageHeight, this.MetaData);
                 postProcessor.PostProcess(image.Frames.RootFrame);
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs
index 5d51e2ad5..18e177390 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs
@@ -15,10 +15,12 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
     /// </summary>
     internal class PdfJsFrameComponent : IDisposable, IJpegComponent
     {
+        private readonly MemoryManager memoryManager;
 #pragma warning disable SA1401 // Fields should be private
 
-        public PdfJsFrameComponent(PdfJsFrame frame, byte id, int horizontalFactor, int verticalFactor, byte quantizationTableIndex, int index)
+        public PdfJsFrameComponent(MemoryManager memoryManager, PdfJsFrame frame, byte id, int horizontalFactor, int verticalFactor, byte quantizationTableIndex, int index)
         {
+            this.memoryManager = memoryManager;
             this.Frame = frame;
             this.Id = id;
             this.HorizontalSamplingFactor = horizontalFactor;
@@ -114,7 +116,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
             int blocksBufferSize = 64 * this.BlocksPerColumnForMcu * (this.BlocksPerLineForMcu + 1);
 
             // Pooled. Disposed via frame disposal
-            this.BlockData = MemoryManager.Current.Allocate<short>(blocksBufferSize, true);
+            this.BlockData = this.memoryManager.Allocate<short>(blocksBufferSize, true);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
index 38f223dca..4142ae354 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
@@ -22,14 +22,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// </summary>
         /// <param name="lengths">The code lengths</param>
         /// <param name="values">The huffman values</param>
-        public PdfJsHuffmanTable(byte[] lengths, byte[] values)
+        public PdfJsHuffmanTable(MemoryManager memoryManager, byte[] lengths, byte[] values)
         {
-            this.lookahead = MemoryManager.Current.Allocate<short>(256, true);
-            this.valOffset = MemoryManager.Current.Allocate<short>(18, true);
-            this.maxcode = MemoryManager.Current.Allocate<long>(18, true);
+            this.lookahead = memoryManager.Allocate<short>(256, true);
+            this.valOffset = memoryManager.Allocate<short>(18, true);
+            this.maxcode = memoryManager.Allocate<long>(18, true);
 
-            using (var huffsize = MemoryManager.Current.Allocate<short>(257, true))
-            using (var huffcode = MemoryManager.Current.Allocate<short>(257, true))
+            using (var huffsize = memoryManager.Allocate<short>(257, true))
+            using (var huffcode = memoryManager.Allocate<short>(257, true))
             {
                 GenerateSizeTable(lengths, huffsize);
                 GenerateCodeTable(huffsize, huffcode);
@@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
                 GenerateLookaheadTables(lengths, values, this.lookahead);
             }
 
-            this.huffval = MemoryManager.Current.Allocate<byte>(values.Length, true);
+            this.huffval = memoryManager.Allocate<byte>(values.Length, true);
             Buffer.BlockCopy(values, 0, this.huffval.Array, 0, values.Length);
 
             this.MaxCode = this.maxcode.Array;
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
index eb1680796..eebc57b86 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
@@ -14,6 +14,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
     /// </summary>
     internal struct PdfJsJpegPixelArea : IDisposable
     {
+        private readonly MemoryManager memoryManager;
+
         private readonly int imageWidth;
 
         private readonly int imageHeight;
@@ -28,8 +30,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// <param name="imageWidth">The image width</param>
         /// <param name="imageHeight">The image height</param>
         /// <param name="numberOfComponents">The number of components</param>
-        public PdfJsJpegPixelArea(int imageWidth, int imageHeight, int numberOfComponents)
+        public PdfJsJpegPixelArea(MemoryManager memoryManager, int imageWidth, int imageHeight, int numberOfComponents)
         {
+            this.memoryManager = memoryManager;
             this.imageWidth = imageWidth;
             this.imageHeight = imageHeight;
             this.Width = 0;
@@ -69,11 +72,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
             this.rowStride = width * numberOfComponents;
             var scale = new Vector2(this.imageWidth / (float)width, this.imageHeight / (float)height);
 
-            this.componentData = MemoryManager.Current.Allocate<byte>(width * height * numberOfComponents);
+            this.componentData = this.memoryManager.Allocate<byte>(width * height * numberOfComponents);
             Span<byte> componentDataSpan = this.componentData;
             const uint Mask3Lsb = 0xFFFFFFF8; // Used to clear the 3 LSBs
 
-            using (var xScaleBlockOffset = MemoryManager.Current.Allocate<int>(width))
+            using (var xScaleBlockOffset = this.memoryManager.Allocate<int>(width))
             {
                 Span<int> xScaleBlockOffsetSpan = xScaleBlockOffset;
                 for (int i = 0; i < numberOfComponents; i++)
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsQuantizationTables.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsQuantizationTables.cs
index a585c5080..f7302b156 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsQuantizationTables.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsQuantizationTables.cs
@@ -40,6 +40,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
                 63
             };
 
+        public PdfJsQuantizationTables(MemoryManager memoryManager)
+        {
+            this.Tables = memoryManager.Allocate2D<short>(64, 4);
+        }
+
         /// <summary>
         /// Gets or sets the quantization tables.
         /// </summary>
@@ -49,8 +54,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
             get; set;
         }
 
-        = MemoryManager.Current.Allocate2D<short>(64, 4);
-
         /// <inheritdoc/>
         public void Dispose()
         {
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
index 917e3c7e3..863c4380b 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
@@ -216,7 +216,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
             ushort marker = this.ReadUint16();
             fileMarker = new PdfJsFileMarker(marker, (int)this.InputStream.Position - 2);
 
-            this.quantizationTables = new PdfJsQuantizationTables();
+            this.quantizationTables = new PdfJsQuantizationTables(this.configuration.MemoryManager);
             this.dcHuffmanTables = new PdfJsHuffmanTables();
             this.acHuffmanTables = new PdfJsHuffmanTables();
 
@@ -335,7 +335,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
                 throw new ImageFormatException($"Unsupported color mode. Max components 4; found {this.NumberOfComponents}");
             }
 
-            this.pixelArea = new PdfJsJpegPixelArea(image.Width, image.Height, this.NumberOfComponents);
+            this.pixelArea = new PdfJsJpegPixelArea(this.configuration.MemoryManager, image.Width, image.Height, this.NumberOfComponents);
             this.pixelArea.LinearizeBlockData(this.components, image.Width, image.Height);
 
             if (this.NumberOfComponents == 1)
@@ -648,7 +648,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
                     maxV = v;
                 }
 
-                var component = new PdfJsFrameComponent(this.Frame, this.temp[index], h, v, this.temp[index + 2], i);
+                var component = new PdfJsFrameComponent(this.configuration.MemoryManager, this.Frame, this.temp[index], h, v, this.temp[index + 2], i);
 
                 this.Frame.Components[i] = component;
                 this.Frame.ComponentIds[i] = component.Id;
@@ -673,14 +673,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
                 throw new ImageFormatException($"DHT has wrong length: {remaining}");
             }
 
-            using (var huffmanData = MemoryManager.Current.Allocate<byte>(256, true))
+            using (var huffmanData = this.configuration.MemoryManager.Allocate<byte>(256, true))
             {
                 for (int i = 2; i < remaining;)
                 {
                     byte huffmanTableSpec = (byte)this.InputStream.ReadByte();
                     this.InputStream.Read(huffmanData.Array, 0, 16);
 
-                    using (var codeLengths = MemoryManager.Current.Allocate<byte>(17, true))
+                    using (var codeLengths = this.configuration.MemoryManager.Allocate<byte>(17, true))
                     {
                         int codeLengthSum = 0;
 
@@ -689,7 +689,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
                             codeLengthSum += codeLengths[j] = huffmanData[j - 1];
                         }
 
-                        using (var huffmanValues = MemoryManager.Current.Allocate<byte>(256, true))
+                        using (var huffmanValues = this.configuration.MemoryManager.Allocate<byte>(256, true))
                         {
                             this.InputStream.Read(huffmanValues.Array, 0, codeLengthSum);
 
@@ -784,8 +784,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
         {
             int blocksPerLine = component.BlocksPerLine;
             int blocksPerColumn = component.BlocksPerColumn;
-            using (var computationBuffer = MemoryManager.Current.Allocate<short>(64, true))
-            using (var multiplicationBuffer = MemoryManager.Current.Allocate<short>(64, true))
+            using (var computationBuffer = this.configuration.MemoryManager.Allocate<short>(64, true))
+            using (var multiplicationBuffer = this.configuration.MemoryManager.Allocate<short>(64, true))
             {
                 Span<short> quantizationTable = this.quantizationTables.Tables.GetRowSpan(frameComponent.QuantizationTableIndex);
                 Span<short> computationBufferSpan = computationBuffer;
@@ -823,7 +823,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
         /// <param name="values">The values</param>
         private void BuildHuffmanTable(PdfJsHuffmanTables tables, int index, byte[] codeLengths, byte[] values)
         {
-            tables[index] = new PdfJsHuffmanTable(codeLengths, values);
+            tables[index] = new PdfJsHuffmanTable(this.configuration.MemoryManager, codeLengths, values);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
diff --git a/src/ImageSharp/Formats/Png/PngConfigurationModule.cs b/src/ImageSharp/Formats/Png/PngConfigurationModule.cs
index 9346f7567..abf5bc6bb 100644
--- a/src/ImageSharp/Formats/Png/PngConfigurationModule.cs
+++ b/src/ImageSharp/Formats/Png/PngConfigurationModule.cs
@@ -9,11 +9,11 @@ namespace SixLabors.ImageSharp.Formats.Png
     public sealed class PngConfigurationModule : IConfigurationModule
     {
         /// <inheritdoc/>
-        public void Configure(Configuration host)
+        public void Configure(Configuration config)
         {
-            host.SetEncoder(ImageFormats.Png, new PngEncoder());
-            host.SetDecoder(ImageFormats.Png, new PngDecoder());
-            host.AddImageFormatDetector(new PngImageFormatDetector());
+            config.SetEncoder(ImageFormats.Png, new PngEncoder(config.MemoryManager));
+            config.SetDecoder(ImageFormats.Png, new PngDecoder());
+            config.AddImageFormatDetector(new PngImageFormatDetector());
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index ebda05a1e..7e354b58b 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -375,8 +375,8 @@ namespace SixLabors.ImageSharp.Formats.Png
                 this.bytesPerSample = this.header.BitDepth / 8;
             }
 
-            this.previousScanline = MemoryManager.Current.Allocate<byte>(this.bytesPerScanline, true);
-            this.scanline = MemoryManager.Current.Allocate<byte>(this.bytesPerScanline, true);
+            this.previousScanline = this.configuration.MemoryManager.Allocate<byte>(this.bytesPerScanline, true);
+            this.scanline = this.configuration.MemoryManager.Allocate<byte>(this.bytesPerScanline, true);
         }
 
         /// <summary>
@@ -669,7 +669,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                         if (this.header.BitDepth == 16)
                         {
                             int length = this.header.Width * 3;
-                            using (var compressed = MemoryManager.Current.Allocate<byte>(length))
+                            using (var compressed = this.configuration.MemoryManager.Allocate<byte>(length))
                             {
                                 // TODO: Should we use pack from vector here instead?
                                 this.From16BitTo8Bit(scanlineBuffer, compressed, length);
@@ -686,7 +686,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                         if (this.header.BitDepth == 16)
                         {
                             int length = this.header.Width * 3;
-                            using (var compressed = MemoryManager.Current.Allocate<byte>(length))
+                            using (var compressed = this.configuration.MemoryManager.Allocate<byte>(length))
                             {
                                 // TODO: Should we use pack from vector here instead?
                                 this.From16BitTo8Bit(scanlineBuffer, compressed, length);
@@ -727,7 +727,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                     if (this.header.BitDepth == 16)
                     {
                         int length = this.header.Width * 4;
-                        using (var compressed = MemoryManager.Current.Allocate<byte>(length))
+                        using (var compressed = this.configuration.MemoryManager.Allocate<byte>(length))
                         {
                             // TODO: Should we use pack from vector here instead?
                             this.From16BitTo8Bit(scanlineBuffer, compressed, length);
@@ -930,7 +930,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                     if (this.header.BitDepth == 16)
                     {
                         int length = this.header.Width * 3;
-                        using (var compressed = MemoryManager.Current.Allocate<byte>(length))
+                        using (var compressed = this.configuration.MemoryManager.Allocate<byte>(length))
                         {
                             // TODO: Should we use pack from vector here instead?
                             this.From16BitTo8Bit(scanlineBuffer, compressed, length);
@@ -998,7 +998,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                     if (this.header.BitDepth == 16)
                     {
                         int length = this.header.Width * 4;
-                        using (var compressed = MemoryManager.Current.Allocate<byte>(length))
+                        using (var compressed = this.configuration.MemoryManager.Allocate<byte>(length))
                         {
                             // TODO: Should we use pack from vector here instead?
                             this.From16BitTo8Bit(scanlineBuffer, compressed, length);
diff --git a/src/ImageSharp/Formats/Png/PngEncoder.cs b/src/ImageSharp/Formats/Png/PngEncoder.cs
index 2fc6911f0..f65ce59b2 100644
--- a/src/ImageSharp/Formats/Png/PngEncoder.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoder.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.IO;
+
+using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Quantizers;
 
@@ -12,6 +14,13 @@ namespace SixLabors.ImageSharp.Formats.Png
     /// </summary>
     public sealed class PngEncoder : IImageEncoder, IPngEncoderOptions
     {
+        private readonly MemoryManager memoryManager;
+
+        public PngEncoder(MemoryManager memoryManager)
+        {
+            this.memoryManager = memoryManager;
+        }
+        
         /// <summary>
         /// Gets or sets a value indicating whether the metadata should be ignored when the image is being encoded.
         /// </summary>
@@ -66,7 +75,7 @@ namespace SixLabors.ImageSharp.Formats.Png
         public void Encode<TPixel>(Image<TPixel> image, Stream stream)
             where TPixel : struct, IPixel<TPixel>
         {
-            using (var encoder = new PngEncoderCore(this))
+            using (var encoder = new PngEncoderCore(this.memoryManager, this))
             {
                 encoder.Encode(image, stream);
             }
diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
index 9be0f5ee4..e3e209ed4 100644
--- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
@@ -20,6 +20,8 @@ namespace SixLabors.ImageSharp.Formats.Png
     /// </summary>
     internal sealed class PngEncoderCore : IDisposable
     {
+        private readonly MemoryManager memoryManager;
+
         /// <summary>
         /// The maximum block size, defaults at 64k for uncompressed blocks.
         /// </summary>
@@ -149,8 +151,9 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// Initializes a new instance of the <see cref="PngEncoderCore"/> class.
         /// </summary>
         /// <param name="options">The options for influancing the encoder</param>
-        public PngEncoderCore(IPngEncoderOptions options)
+        public PngEncoderCore(MemoryManager memoryManager, IPngEncoderOptions options)
         {
+            this.memoryManager = memoryManager;
             this.ignoreMetadata = options.IgnoreMetadata;
             this.paletteSize = options.PaletteSize > 0 ? options.PaletteSize.Clamp(1, int.MaxValue) : int.MaxValue;
             this.pngColorType = options.PngColorType;
@@ -620,16 +623,16 @@ namespace SixLabors.ImageSharp.Formats.Png
             this.bytesPerScanline = this.width * this.bytesPerPixel;
             int resultLength = this.bytesPerScanline + 1;
 
-            this.previousScanline = MemoryManager.Current.Allocate<byte>(this.bytesPerScanline, true);
-            this.rawScanline = MemoryManager.Current.Allocate<byte>(this.bytesPerScanline, true);
-            this.result = MemoryManager.Current.Allocate<byte>(resultLength, true);
+            this.previousScanline = this.memoryManager.Allocate<byte>(this.bytesPerScanline, true);
+            this.rawScanline = this.memoryManager.Allocate<byte>(this.bytesPerScanline, true);
+            this.result = this.memoryManager.Allocate<byte>(resultLength, true);
 
             if (this.pngColorType != PngColorType.Palette)
             {
-                this.sub = MemoryManager.Current.Allocate<byte>(resultLength, true);
-                this.up = MemoryManager.Current.Allocate<byte>(resultLength, true);
-                this.average = MemoryManager.Current.Allocate<byte>(resultLength, true);
-                this.paeth = MemoryManager.Current.Allocate<byte>(resultLength, true);
+                this.sub = this.memoryManager.Allocate<byte>(resultLength, true);
+                this.up = this.memoryManager.Allocate<byte>(resultLength, true);
+                this.average = this.memoryManager.Allocate<byte>(resultLength, true);
+                this.paeth = this.memoryManager.Allocate<byte>(resultLength, true);
             }
 
             byte[] buffer;
diff --git a/src/ImageSharp/IImageProcessingContext{TPixel}.cs b/src/ImageSharp/IImageProcessingContext{TPixel}.cs
index 552e8d579..1556987df 100644
--- a/src/ImageSharp/IImageProcessingContext{TPixel}.cs
+++ b/src/ImageSharp/IImageProcessingContext{TPixel}.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.Primitives;
@@ -28,6 +29,8 @@ namespace SixLabors.ImageSharp
         /// <param name="processor">The processor to apply</param>
         /// <returns>The current operations class to allow chaining of operations.</returns>
         IImageProcessingContext<TPixel> ApplyProcessor(IImageProcessor<TPixel> processor);
+
+        MemoryManager GetMemoryManager();
     }
 
     /// <summary>
diff --git a/src/ImageSharp/Image/Image.Decode.cs b/src/ImageSharp/Image/Image.Decode.cs
index 1bce23cfc..69063a8de 100644
--- a/src/ImageSharp/Image/Image.Decode.cs
+++ b/src/ImageSharp/Image/Image.Decode.cs
@@ -29,7 +29,7 @@ namespace SixLabors.ImageSharp
                 return null;
             }
 
-            using (var buffer = MemoryManager.Current.Allocate<byte>(maxHeaderSize))
+            using (var buffer = config.MemoryManager.Allocate<byte>(maxHeaderSize))
             {
                 long startPosition = stream.Position;
                 stream.Read(buffer.Array, 0, maxHeaderSize);
diff --git a/src/ImageSharp/Image/ImageFrame.LoadPixelData.cs b/src/ImageSharp/Image/ImageFrame.LoadPixelData.cs
index e2230c436..153a757e1 100644
--- a/src/ImageSharp/Image/ImageFrame.LoadPixelData.cs
+++ b/src/ImageSharp/Image/ImageFrame.LoadPixelData.cs
@@ -43,7 +43,7 @@ namespace SixLabors.ImageSharp
             int count = width * height;
             Guard.MustBeGreaterThanOrEqualTo(data.Length, count, nameof(data));
 
-            var image = new ImageFrame<TPixel>(width, height);
+            var image = new ImageFrame<TPixel>(Configuration.Default.MemoryManager, width, height);
             SpanHelper.Copy(data, image.GetPixelSpan(), count);
 
             return image;
diff --git a/src/ImageSharp/Image/ImageFrameCollection.cs b/src/ImageSharp/Image/ImageFrameCollection.cs
index 3e9bb0343..bfdf1df76 100644
--- a/src/ImageSharp/Image/ImageFrameCollection.cs
+++ b/src/ImageSharp/Image/ImageFrameCollection.cs
@@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp
             this.parent = parent;
 
             // Frames are already cloned within the caller
-            this.frames.Add(new ImageFrame<TPixel>(width, height));
+            this.frames.Add(new ImageFrame<TPixel>(parent.GetConfiguration().MemoryManager, width, height));
         }
 
         internal ImageFrameCollection(Image<TPixel> parent, IEnumerable<ImageFrame<TPixel>> frames)
@@ -143,7 +143,7 @@ namespace SixLabors.ImageSharp
         /// <inheritdoc/>
         public ImageFrame<TPixel> CreateFrame()
         {
-            var frame = new ImageFrame<TPixel>(this.RootFrame.Width, this.RootFrame.Height);
+            var frame = new ImageFrame<TPixel>(this.parent.GetConfiguration().MemoryManager, this.RootFrame.Width, this.RootFrame.Height);
             this.frames.Add(frame);
             return frame;
         }
diff --git a/src/ImageSharp/Image/ImageFrame{TPixel}.cs b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
index a0e4976cb..2f2f545db 100644
--- a/src/ImageSharp/Image/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
@@ -20,6 +20,8 @@ namespace SixLabors.ImageSharp
     public sealed class ImageFrame<TPixel> : IPixelSource<TPixel>, IDisposable
         where TPixel : struct, IPixel<TPixel>
     {
+        public MemoryManager MemoryManager { get; }
+
         /// <summary>
         /// The image pixels. Not private as Buffer2D requires an array in its constructor.
         /// </summary>
@@ -32,8 +34,8 @@ namespace SixLabors.ImageSharp
         /// </summary>
         /// <param name="width">The width of the image in pixels.</param>
         /// <param name="height">The height of the image in pixels.</param>
-        internal ImageFrame(int width, int height)
-            : this(width, height, new ImageFrameMetaData())
+        internal ImageFrame(MemoryManager memoryManager, int width, int height)
+            : this(memoryManager, width, height, new ImageFrameMetaData())
         {
         }
 
@@ -43,13 +45,15 @@ namespace SixLabors.ImageSharp
         /// <param name="width">The width of the image in pixels.</param>
         /// <param name="height">The height of the image in pixels.</param>
         /// <param name="metaData">The meta data.</param>
-        internal ImageFrame(int width, int height, ImageFrameMetaData metaData)
+        internal ImageFrame(MemoryManager memoryManager, int width, int height, ImageFrameMetaData metaData)
         {
+            Guard.NotNull(memoryManager, nameof(memoryManager));
             Guard.MustBeGreaterThan(width, 0, nameof(width));
             Guard.MustBeGreaterThan(height, 0, nameof(height));
             Guard.NotNull(metaData, nameof(metaData));
 
-            this.pixelBuffer = Buffer2D<TPixel>.CreateClean(width, height);
+            this.MemoryManager = memoryManager;
+            this.pixelBuffer = memoryManager.Allocate2D<TPixel>(width, height, true);
             this.MetaData = metaData;
         }
 
@@ -57,9 +61,10 @@ namespace SixLabors.ImageSharp
         /// Initializes a new instance of the <see cref="ImageFrame{TPixel}" /> class.
         /// </summary>
         /// <param name="source">The source.</param>
-        internal ImageFrame(ImageFrame<TPixel> source)
+        internal ImageFrame(MemoryManager memoryManager, ImageFrame<TPixel> source)
         {
-            this.pixelBuffer = MemoryManager.Current.Allocate2D<TPixel>(source.pixelBuffer.Width, source.pixelBuffer.Height);
+            this.MemoryManager = memoryManager;
+            this.pixelBuffer = memoryManager.Allocate2D<TPixel>(source.pixelBuffer.Width, source.pixelBuffer.Height);
             source.pixelBuffer.Span.CopyTo(this.pixelBuffer.Span);
             this.MetaData = source.MetaData.Clone();
         }
@@ -198,7 +203,7 @@ namespace SixLabors.ImageSharp
 
             Func<Vector4, Vector4> scaleFunc = PackedPixelConverterHelper.ComputeScaleFunction<TPixel, TPixel2>();
 
-            var target = new ImageFrame<TPixel2>(this.Width, this.Height, this.MetaData.Clone());
+            var target = new ImageFrame<TPixel2>(this.MemoryManager, this.Width, this.Height, this.MetaData.Clone());
 
             using (PixelAccessor<TPixel> pixels = this.Lock())
             using (PixelAccessor<TPixel2> targetPixels = target.Lock())
@@ -227,7 +232,7 @@ namespace SixLabors.ImageSharp
         /// <returns>The <see cref="ImageFrame{TPixel}"/></returns>
         internal ImageFrame<TPixel> Clone()
         {
-            return new ImageFrame<TPixel>(this);
+            return new ImageFrame<TPixel>(this.MemoryManager, this);
         }
 
         /// <inheritdoc/>
diff --git a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
index 70d67954c..fca57b3c8 100644
--- a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
+++ b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
@@ -55,7 +55,7 @@ namespace SixLabors.ImageSharp
         /// <param name="width">The width of the image represented by the pixel buffer.</param>
         /// <param name="height">The height of the image represented by the pixel buffer.</param>
         public PixelAccessor(int width, int height)
-            : this(width, height, Buffer2D<TPixel>.CreateClean(width, height), true)
+            : this(width, height, Configuration.Default.MemoryManager.Allocate2D<TPixel>(width, height, true), true)
         {
         }
 
diff --git a/src/ImageSharp/Image/PixelArea{TPixel}.cs b/src/ImageSharp/Image/PixelArea{TPixel}.cs
index e6ae556f7..fa3499b6d 100644
--- a/src/ImageSharp/Image/PixelArea{TPixel}.cs
+++ b/src/ImageSharp/Image/PixelArea{TPixel}.cs
@@ -116,7 +116,7 @@ namespace SixLabors.ImageSharp
             this.RowStride = (width * GetComponentCount(componentOrder)) + padding;
             this.Length = this.RowStride * height;
 
-            this.byteBuffer = MemoryManager.Current.Allocate<byte>(this.Length, true);
+            this.byteBuffer = Configuration.Default.MemoryManager.Allocate<byte>(this.Length, true);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Memory/Buffer2D{T}.cs b/src/ImageSharp/Memory/Buffer2D{T}.cs
index 73444d497..82cb25f47 100644
--- a/src/ImageSharp/Memory/Buffer2D{T}.cs
+++ b/src/ImageSharp/Memory/Buffer2D{T}.cs
@@ -56,24 +56,6 @@ namespace SixLabors.ImageSharp.Memory
             }
         }
 
-        /// <summary>
-        /// Creates a clean instance of <see cref="Buffer2D{T}"/> initializing it's elements with 'default(T)'.
-        /// </summary>
-        /// <param name="width">The number of elements in a row</param>
-        /// <param name="height">The number of rows</param>
-        /// <returns>The <see cref="Buffer{T}"/> instance</returns>
-        public static Buffer2D<T> CreateClean(int width, int height)
-        {
-            return new Buffer2D<T>(MemoryManager.Current.Allocate<T>(width * height, true), width, height);
-        }
-
-        /// <summary>
-        /// Creates a clean instance of <see cref="Buffer2D{T}"/> initializing it's elements with 'default(T)'.
-        /// </summary>
-        /// <param name="size">The size of the buffer</param>
-        /// <returns>The <see cref="Buffer2D{T}"/> instance</returns>
-        public static Buffer2D<T> CreateClean(Size size) => CreateClean(size.Width, size.Height);
-
         public void Dispose()
         {
             this.Buffer?.Dispose();
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index b68a01feb..67d72d2b4 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -11,11 +11,6 @@ namespace SixLabors.ImageSharp.Memory
     /// </summary>
     public abstract class MemoryManager
     {
-        /// <summary>
-        /// Gets or sets the <see cref="MemoryManager"/> that is currently in use.
-        /// </summary>
-        public static MemoryManager Current { get; set; } = new ArrayPoolMemoryManager(1024 * 80);
-
         /// <summary>
         /// Allocates a <see cref="Buffer{T}"/> of size <paramref name="size"/>, optionally
         /// clearing the buffer before it gets returned.
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
index 477281673..4ca53244a 100644
--- a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
+++ b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -84,7 +84,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -123,7 +123,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -162,7 +162,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -201,7 +201,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -240,7 +240,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -279,7 +279,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -318,7 +318,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -357,7 +357,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -396,7 +396,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -435,7 +435,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -474,7 +474,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -513,7 +513,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -552,7 +552,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -591,7 +591,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -630,7 +630,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -669,7 +669,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -708,7 +708,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -747,7 +747,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -786,7 +786,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -825,7 +825,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
index cb99237c4..5e9268dff 100644
--- a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
+++ b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
@@ -87,7 +87,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
diff --git a/src/ImageSharp/Processing/ColorMatrix/Lomograph.cs b/src/ImageSharp/Processing/ColorMatrix/Lomograph.cs
index 947e53157..96231e168 100644
--- a/src/ImageSharp/Processing/ColorMatrix/Lomograph.cs
+++ b/src/ImageSharp/Processing/ColorMatrix/Lomograph.cs
@@ -51,7 +51,7 @@ namespace SixLabors.ImageSharp
         public static IImageProcessingContext<TPixel> Lomograph<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new LomographProcessor<TPixel>(options));
+            source.ApplyProcessor(new LomographProcessor<TPixel>(source.GetMemoryManager(), options));
             return source;
         }
 
@@ -68,7 +68,7 @@ namespace SixLabors.ImageSharp
         public static IImageProcessingContext<TPixel> Lomograph<TPixel>(this IImageProcessingContext<TPixel> source, Rectangle rectangle, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new LomographProcessor<TPixel>(options), rectangle);
+            source.ApplyProcessor(new LomographProcessor<TPixel>(source.GetMemoryManager(), options), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/ColorMatrix/Polaroid.cs b/src/ImageSharp/Processing/ColorMatrix/Polaroid.cs
index c96087d57..7cc0e2419 100644
--- a/src/ImageSharp/Processing/ColorMatrix/Polaroid.cs
+++ b/src/ImageSharp/Processing/ColorMatrix/Polaroid.cs
@@ -51,7 +51,7 @@ namespace SixLabors.ImageSharp
         public static IImageProcessingContext<TPixel> Polaroid<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new PolaroidProcessor<TPixel>(options));
+            source.ApplyProcessor(new PolaroidProcessor<TPixel>(source.GetMemoryManager(), options));
             return source;
         }
 
@@ -68,7 +68,7 @@ namespace SixLabors.ImageSharp
         public static IImageProcessingContext<TPixel> Polaroid<TPixel>(this IImageProcessingContext<TPixel> source, Rectangle rectangle, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new PolaroidProcessor<TPixel>(options), rectangle);
+            source.ApplyProcessor(new PolaroidProcessor<TPixel>(source.GetMemoryManager(), options), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/Effects/BackgroundColor.cs b/src/ImageSharp/Processing/Effects/BackgroundColor.cs
index da00b4ddd..18caa67cc 100644
--- a/src/ImageSharp/Processing/Effects/BackgroundColor.cs
+++ b/src/ImageSharp/Processing/Effects/BackgroundColor.cs
@@ -23,7 +23,7 @@ namespace SixLabors.ImageSharp
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext<TPixel> BackgroundColor<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
-        => source.ApplyProcessor(new BackgroundColorProcessor<TPixel>(color, options));
+        => source.ApplyProcessor(new BackgroundColorProcessor<TPixel>(source.GetMemoryManager(), color, options));
 
         /// <summary>
         /// Replaces the background color of image with the given one.
@@ -38,7 +38,7 @@ namespace SixLabors.ImageSharp
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext<TPixel> BackgroundColor<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, Rectangle rectangle, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
-        => source.ApplyProcessor(new BackgroundColorProcessor<TPixel>(color, options), rectangle);
+        => source.ApplyProcessor(new BackgroundColorProcessor<TPixel>(source.GetMemoryManager(), color, options), rectangle);
 
         /// <summary>
         /// Replaces the background color of image with the given one.
diff --git a/src/ImageSharp/Processing/Overlays/Glow.cs b/src/ImageSharp/Processing/Overlays/Glow.cs
index ee3596348..a8994b18a 100644
--- a/src/ImageSharp/Processing/Overlays/Glow.cs
+++ b/src/ImageSharp/Processing/Overlays/Glow.cs
@@ -157,7 +157,7 @@ namespace SixLabors.ImageSharp
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         private static IImageProcessingContext<TPixel> Glow<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, ValueSize radius, Rectangle rectangle, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
-        => source.ApplyProcessor(new GlowProcessor<TPixel>(color, radius, options), rectangle);
+        => source.ApplyProcessor(new GlowProcessor<TPixel>(source.GetMemoryManager(), color, radius, options), rectangle);
 
         /// <summary>
         /// Applies a radial glow effect to an image.
@@ -170,6 +170,6 @@ namespace SixLabors.ImageSharp
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         private static IImageProcessingContext<TPixel> Glow<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, ValueSize radius, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
-        => source.ApplyProcessor(new GlowProcessor<TPixel>(color, radius, options));
+        => source.ApplyProcessor(new GlowProcessor<TPixel>(source.GetMemoryManager(), color, radius, options));
     }
 }
diff --git a/src/ImageSharp/Processing/Overlays/Vignette.cs b/src/ImageSharp/Processing/Overlays/Vignette.cs
index cc93ccedc..3a691ed00 100644
--- a/src/ImageSharp/Processing/Overlays/Vignette.cs
+++ b/src/ImageSharp/Processing/Overlays/Vignette.cs
@@ -151,10 +151,10 @@ namespace SixLabors.ImageSharp
 
         private static IImageProcessingContext<TPixel> VignetteInternal<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, ValueSize radiusX, ValueSize radiusY, Rectangle rectangle, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
-            => source.ApplyProcessor(new VignetteProcessor<TPixel>(color, radiusX, radiusY, options), rectangle);
+            => source.ApplyProcessor(new VignetteProcessor<TPixel>(source.GetMemoryManager(), color, radiusX, radiusY, options), rectangle);
 
         private static IImageProcessingContext<TPixel> VignetteInternal<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, ValueSize radiusX, ValueSize radiusY, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
-            => source.ApplyProcessor(new VignetteProcessor<TPixel>(color, radiusX, radiusY, options));
+            => source.ApplyProcessor(new VignetteProcessor<TPixel>(source.GetMemoryManager(), color, radiusX, radiusY, options));
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/LomographProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/LomographProcessor.cs
index 1ec76bf55..a95d5fef6 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/LomographProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/LomographProcessor.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Numerics;
+
+using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
@@ -15,14 +17,17 @@ namespace SixLabors.ImageSharp.Processing.Processors
         where TPixel : struct, IPixel<TPixel>
     {
         private static readonly TPixel VeryDarkGreen = ColorBuilder<TPixel>.FromRGBA(0, 10, 0, 255);
+
+        private readonly MemoryManager memoryManager;
+
         private readonly GraphicsOptions options;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="LomographProcessor{TPixel}" /> class.
         /// </summary>
         /// <param name="options">The options effecting blending and composition.</param>
-        public LomographProcessor(GraphicsOptions options)
-        {
+        public LomographProcessor(MemoryManager memoryManager, GraphicsOptions options) {
+            this.memoryManager = memoryManager;
             this.options = options;
         }
 
@@ -41,7 +46,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <inheritdoc/>
         protected override void AfterApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
         {
-            new VignetteProcessor<TPixel>(VeryDarkGreen, this.options).Apply(source, sourceRectangle, configuration);
+            new VignetteProcessor<TPixel>(this.memoryManager, VeryDarkGreen, this.options).Apply(source, sourceRectangle, configuration);
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/PolaroidProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/PolaroidProcessor.cs
index f910562e6..76a616a1b 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/PolaroidProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/PolaroidProcessor.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Numerics;
+
+using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
@@ -16,14 +18,17 @@ namespace SixLabors.ImageSharp.Processing.Processors
     {
         private static readonly TPixel VeryDarkOrange = ColorBuilder<TPixel>.FromRGB(102, 34, 0);
         private static readonly TPixel LightOrange = ColorBuilder<TPixel>.FromRGBA(255, 153, 102, 178);
+
+        private readonly MemoryManager memoryManager;
+
         private readonly GraphicsOptions options;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PolaroidProcessor{TPixel}" /> class.
         /// </summary>
         /// <param name="options">The options effecting blending and composition.</param>
-        public PolaroidProcessor(GraphicsOptions options)
-        {
+        public PolaroidProcessor(MemoryManager memoryManager, GraphicsOptions options) {
+            this.memoryManager = memoryManager;
             this.options = options;
         }
 
@@ -48,8 +53,8 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <inheritdoc/>
         protected override void AfterApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
         {
-            new VignetteProcessor<TPixel>(VeryDarkOrange, this.options).Apply(source, sourceRectangle, configuration);
-            new GlowProcessor<TPixel>(LightOrange, source.Width / 4F, this.options).Apply(source, sourceRectangle, configuration);
+            new VignetteProcessor<TPixel>(this.memoryManager, VeryDarkOrange, this.options).Apply(source, sourceRectangle, configuration);
+            new GlowProcessor<TPixel>(this.memoryManager, LightOrange, source.Width / 4F, this.options).Apply(source, sourceRectangle, configuration);
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
index 5f6fd4023..b81fe3cf3 100644
--- a/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
@@ -17,6 +17,8 @@ namespace SixLabors.ImageSharp.Processing.Processors
     internal class BackgroundColorProcessor<TPixel> : ImageProcessor<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
+        private readonly MemoryManager memoryManager;
+
         private readonly GraphicsOptions options;
 
         /// <summary>
@@ -24,9 +26,10 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// </summary>
         /// <param name="color">The <typeparamref name="TPixel"/> to set the background color to.</param>
         /// <param name="options">The options defining blending algorithum and amount.</param>
-        public BackgroundColorProcessor(TPixel color, GraphicsOptions options)
+        public BackgroundColorProcessor(MemoryManager memoryManager, TPixel color, GraphicsOptions options)
         {
             this.Value = color;
+            this.memoryManager = memoryManager;
             this.options = options;
         }
 
@@ -67,8 +70,8 @@ namespace SixLabors.ImageSharp.Processing.Processors
 
             int width = maxX - minX;
 
-            using (var colors = MemoryManager.Current.Allocate<TPixel>(width))
-            using (var amount = MemoryManager.Current.Allocate<float>(width))
+            using (var colors = this.memoryManager.Allocate<TPixel>(width))
+            using (var amount = this.memoryManager.Allocate<float>(width))
             {
                 for (int i = 0; i < width; i++)
                 {
diff --git a/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
index 0cee4c0b2..521da20a7 100644
--- a/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
@@ -19,6 +19,8 @@ namespace SixLabors.ImageSharp.Processing.Processors
     internal class GlowProcessor<TPixel> : ImageProcessor<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
+        private readonly MemoryManager memoryManager;
+
         private readonly GraphicsOptions options;
         private readonly PixelBlender<TPixel> blender;
 
@@ -28,8 +30,9 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <param name="color">The color or the glow.</param>
         /// <param name="radius">The radius of the glow.</param>
         /// <param name="options">The options effecting blending and composition.</param>
-        public GlowProcessor(TPixel color, ValueSize radius, GraphicsOptions options)
+        public GlowProcessor(MemoryManager memoryManager, TPixel color, ValueSize radius, GraphicsOptions options)
         {
+            this.memoryManager = memoryManager;
             this.options = options;
             this.GlowColor = color;
             this.Radius = radius;
@@ -83,7 +86,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             }
 
             int width = maxX - minX;
-            using (var rowColors = MemoryManager.Current.Allocate<TPixel>(width))
+            using (var rowColors = this.memoryManager.Allocate<TPixel>(width))
             {
                 for (int i = 0; i < width; i++)
                 {
@@ -96,7 +99,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                     configuration.ParallelOptions,
                     y =>
                     {
-                        using (var amounts = MemoryManager.Current.Allocate<float>(width))
+                        using (var amounts = this.memoryManager.Allocate<float>(width))
                         {
                             int offsetY = y - startY;
                             int offsetX = minX - startX;
diff --git a/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
index 60915e6db..dc60ffec9 100644
--- a/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
@@ -19,6 +19,8 @@ namespace SixLabors.ImageSharp.Processing.Processors
     internal class VignetteProcessor<TPixel> : ImageProcessor<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
+        private readonly MemoryManager memoryManager;
+
         private readonly GraphicsOptions options;
         private readonly PixelBlender<TPixel> blender;
 
@@ -29,11 +31,12 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <param name="radiusX">The x-radius.</param>
         /// <param name="radiusY">The y-radius.</param>
         /// <param name="options">The options effecting blending and composition.</param>
-        public VignetteProcessor(TPixel color, ValueSize radiusX, ValueSize radiusY, GraphicsOptions options)
+        public VignetteProcessor(MemoryManager memoryManager, TPixel color, ValueSize radiusX, ValueSize radiusY, GraphicsOptions options)
         {
             this.VignetteColor = color;
             this.RadiusX = radiusX;
             this.RadiusY = radiusY;
+            this.memoryManager = memoryManager;
             this.options = options;
             this.blender = PixelOperations<TPixel>.Instance.GetPixelBlender(this.options.BlenderMode);
         }
@@ -43,9 +46,10 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// </summary>
         /// <param name="color">The color of the vignette.</param>
         /// <param name="options">The options effecting blending and composition.</param>
-        public VignetteProcessor(TPixel color,  GraphicsOptions options)
+        public VignetteProcessor(MemoryManager memoryManager, TPixel color,  GraphicsOptions options)
         {
             this.VignetteColor = color;
+            this.memoryManager = memoryManager;
             this.options = options;
             this.blender = PixelOperations<TPixel>.Instance.GetPixelBlender(this.options.BlenderMode);
         }
@@ -104,7 +108,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             }
 
             int width = maxX - minX;
-            using (var rowColors = MemoryManager.Current.Allocate<TPixel>(width))
+            using (var rowColors = this.memoryManager.Allocate<TPixel>(width))
             {
                 for (int i = 0; i < width; i++)
                 {
@@ -117,7 +121,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                     configuration.ParallelOptions,
                     y =>
                         {
-                            using (var amounts = MemoryManager.Current.Allocate<float>(width))
+                            using (var amounts = this.memoryManager.Allocate<float>(width))
                             {
                                 int offsetY = y - startY;
                                 int offsetX = minX - startX;
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs
index 9d76bf60f..c86fe89b7 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs
@@ -164,9 +164,9 @@ namespace SixLabors.ImageSharp.Processing.Processors
             /// </summary>
             /// <param name="sourceSize">The size of the source window</param>
             /// <param name="destinationSize">The size of the destination window</param>
-            public WeightsBuffer(int sourceSize, int destinationSize)
+            public WeightsBuffer(MemoryManager memoryManager, int sourceSize, int destinationSize)
             {
-                this.dataBuffer = Buffer2D<float>.CreateClean(sourceSize, destinationSize);
+                this.dataBuffer = memoryManager.Allocate2D<float>(sourceSize, destinationSize, true);
                 this.Weights = new WeightsWindow[destinationSize];
             }
 
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.cs
index 781f3a01c..6b608d102 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.cs
@@ -3,6 +3,8 @@
 
 using System;
 using System.Runtime.CompilerServices;
+
+using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
@@ -25,18 +27,20 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <param name="resizeRectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the target image object to draw to.
         /// </param>
-        protected ResamplingWeightedProcessor(IResampler sampler, int width, int height, Rectangle resizeRectangle)
+        protected ResamplingWeightedProcessor(MemoryManager memoryManager, IResampler sampler, int width, int height, Rectangle resizeRectangle)
         {
+            Guard.NotNull(memoryManager, nameof(memoryManager));
             Guard.NotNull(sampler, nameof(sampler));
             Guard.MustBeGreaterThan(width, 0, nameof(width));
             Guard.MustBeGreaterThan(height, 0, nameof(height));
 
+            this.MemoryManager = memoryManager;
             this.Sampler = sampler;
             this.Width = width;
             this.Height = height;
             this.ResizeRectangle = resizeRectangle;
         }
-
+        
         /// <summary>
         /// Gets the sampler to perform the resize operation.
         /// </summary>
@@ -56,6 +60,8 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// Gets or sets the resize rectangle.
         /// </summary>
         public Rectangle ResizeRectangle { get; protected set; }
+        
+        protected MemoryManager MemoryManager { get; }
 
         /// <summary>
         /// Gets or sets the horizontal weights.
@@ -86,7 +92,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
 
             IResampler sampler = this.Sampler;
             float radius = MathF.Ceiling(scale * sampler.Radius);
-            var result = new WeightsBuffer(sourceSize, destinationSize);
+            var result = new WeightsBuffer(this.MemoryManager, sourceSize, destinationSize);
 
             for (int i = 0; i < destinationSize; i++)
             {
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
index dbc05876d..6c4ea7e67 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
@@ -26,8 +26,8 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <param name="sampler">The sampler to perform the resize operation.</param>
         /// <param name="width">The target width.</param>
         /// <param name="height">The target height.</param>
-        public ResizeProcessor(IResampler sampler, int width, int height)
-            : base(sampler, width, height, new Rectangle(0, 0, width, height))
+        public ResizeProcessor(MemoryManager memoryManager, IResampler sampler, int width, int height)
+            : base(memoryManager, sampler, width, height, new Rectangle(0, 0, width, height))
         {
         }
 
@@ -40,8 +40,8 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <param name="resizeRectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the target image object to draw to.
         /// </param>
-        public ResizeProcessor(IResampler sampler, int width, int height, Rectangle resizeRectangle)
-            : base(sampler, width, height, resizeRectangle)
+        public ResizeProcessor(MemoryManager memoryManager, IResampler sampler, int width, int height, Rectangle resizeRectangle)
+            : base(memoryManager, sampler, width, height, resizeRectangle)
         {
         }
 
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             // ------------
             // For resize we know we are going to populate every pixel with fresh data and we want a different target size so
             // let's manually clone an empty set of images at the correct target and then have the base class process them in turn.
-            IEnumerable<ImageFrame<TPixel>> frames = source.Frames.Select(x => new ImageFrame<TPixel>(this.Width, this.Height, x.MetaData.Clone())); // this will create places holders
+            IEnumerable<ImageFrame<TPixel>> frames = source.Frames.Select(x => new ImageFrame<TPixel>(source.GetConfiguration().MemoryManager, this.Width, this.Height, x.MetaData.Clone())); // this will create places holders
             var image = new Image<TPixel>(config, source.MetaData.Clone(), frames); // base the place holder images in to prevent a extra frame being added
 
             return image;
@@ -121,7 +121,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             // First process the columns. Since we are not using multiple threads startY and endY
             // are the upper and lower bounds of the source rectangle.
             // TODO: Using a transposed variant of 'firstPassPixels' could eliminate the need for the WeightsWindow.ComputeWeightedColumnSum() method, and improve speed!
-            using (var firstPassPixels = MemoryManager.Current.Allocate2D<Vector4>(width, source.Height))
+            using (var firstPassPixels = this.MemoryManager.Allocate2D<Vector4>(width, source.Height))
             {
                 firstPassPixels.Buffer.Clear();
 
@@ -132,7 +132,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                     y =>
                         {
                             // TODO: Without Parallel.For() this buffer object could be reused:
-                            using (var tempRowBuffer = MemoryManager.Current.Allocate<Vector4>(source.Width))
+                            using (var tempRowBuffer = this.MemoryManager.Allocate<Vector4>(source.Width))
                             {
                                 Span<Vector4> firstPassRow = firstPassPixels.GetRowSpan(y);
                                 Span<TPixel> sourceRow = source.GetPixelRowSpan(y);
diff --git a/src/ImageSharp/Processing/Transforms/Resize.cs b/src/ImageSharp/Processing/Transforms/Resize.cs
index 3c7cbca31..c54267a9f 100644
--- a/src/ImageSharp/Processing/Transforms/Resize.cs
+++ b/src/ImageSharp/Processing/Transforms/Resize.cs
@@ -193,7 +193,7 @@ namespace SixLabors.ImageSharp
                 Guard.MustBeGreaterThan(width, 0, nameof(width));
                 Guard.MustBeGreaterThan(height, 0, nameof(height));
 
-                img.Mutate(x => x.ApplyProcessor(new ResizeProcessor<TPixel>(sampler, width, height, targetRectangle) { Compand = compand }, sourceRectangle));
+                img.Mutate(x => x.ApplyProcessor(new ResizeProcessor<TPixel>(source.GetMemoryManager(), sampler, width, height, targetRectangle) { Compand = compand }, sourceRectangle));
             });
         }
 
@@ -233,7 +233,7 @@ namespace SixLabors.ImageSharp
                 Guard.MustBeGreaterThan(width, 0, nameof(width));
                 Guard.MustBeGreaterThan(height, 0, nameof(height));
 
-                img.Mutate(x => x.ApplyProcessor(new ResizeProcessor<TPixel>(sampler, width, height, targetRectangle) { Compand = compand }));
+                img.Mutate(x => x.ApplyProcessor(new ResizeProcessor<TPixel>(source.GetMemoryManager(), sampler, width, height, targetRectangle) { Compand = compand }));
             });
         }
     }
diff --git a/tests/ImageSharp.Tests/FakeImageOperationsProvider.cs b/tests/ImageSharp.Tests/FakeImageOperationsProvider.cs
index f750bfcfa..a1c199b16 100644
--- a/tests/ImageSharp.Tests/FakeImageOperationsProvider.cs
+++ b/tests/ImageSharp.Tests/FakeImageOperationsProvider.cs
@@ -5,6 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+
+using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.Primitives;
@@ -84,6 +87,9 @@ namespace SixLabors.ImageSharp.Tests
                 });
                 return this;
             }
+
+            public MemoryManager GetMemoryManager() => this.source.GetConfiguration().MemoryManager;
+
             public struct AppliedOpperation
             {
                 public Rectangle? Rectangle { get; set; }

From a8b26a41eca7cfbb29a199c9cd639084943c1b93 Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Fri, 12 Jan 2018 14:28:43 +0200
Subject: [PATCH 09/70] - Use Configuration.Default.MemoryManager in tests

---
 .../Color/Bulk/PackFromVector4.cs             |  4 +-
 .../Bulk/PackFromVector4ReferenceVsPointer.cs |  4 +-
 .../Color/Bulk/PackFromXyzw.cs                |  4 +-
 .../Color/Bulk/ToVector4.cs                   |  4 +-
 .../ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs |  4 +-
 .../Color/Bulk/ToXyzw.cs                      |  4 +-
 .../General/ClearBuffer.cs                    |  2 +-
 .../General/IterateArray.cs                   |  2 +-
 .../General/PixelIndexing.cs                  |  2 +-
 .../Image/EncodeIndexedPng.cs                 | 10 ++---
 .../ImageSharp.Benchmarks/Image/EncodePng.cs  |  2 +-
 .../Image/Jpeg/YCbCrColorConversion.cs        |  2 +-
 .../PixelBlenders/PorterDuffBulkVsPixel.cs    |  6 +--
 tests/ImageSharp.Benchmarks/Samplers/Glow.cs  |  4 +-
 .../Drawing/Paths/ShapeRegionTests.cs         | 16 ++++----
 .../Jpg/Block8x8FTests.CopyToBufferArea.cs    |  4 +-
 .../Jpg/JpegImagePostProcessorTests.cs        |  6 +--
 .../Jpg/Utils/LibJpegTools.ComponentData.cs   |  2 +-
 .../Formats/Png/PngEncoderTests.cs            |  4 +-
 .../Formats/Png/PngSmokeTests.cs              |  4 +-
 .../Image/ImageFramesCollectionTests.cs       | 40 +++++++++----------
 tests/ImageSharp.Tests/Image/ImageTests.cs    |  2 +-
 .../ImageSharp.Tests/Memory/Buffer2DTests.cs  | 10 ++---
 .../Memory/BufferAreaTests.cs                 |  4 +-
 tests/ImageSharp.Tests/Memory/BufferTests.cs  | 22 +++++-----
 .../Memory/SpanUtilityTests.cs                |  2 +-
 .../PixelFormats/PixelOperationsTests.cs      |  6 +--
 .../Transforms/ResizeProfilingBenchmarks.cs   |  2 +-
 .../ReferenceCodecs/SystemDrawingBridge.cs    | 12 +++---
 .../Tests/ReferenceCodecTests.cs              |  2 +-
 30 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
index e00b94a2e..1f660466d 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
@@ -22,8 +22,8 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [GlobalSetup]
         public void Setup()
         {
-            this.destination = MemoryManager.Current.Allocate<TPixel>(this.Count);
-            this.source = MemoryManager.Current.Allocate<Vector4>(this.Count);
+            this.destination = Configuration.Default.MemoryManager.Allocate<TPixel>(this.Count);
+            this.source = Configuration.Default.MemoryManager.Allocate<Vector4>(this.Count);
         }
 
         [GlobalCleanup]
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
index 593291ded..fd96c02cd 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
@@ -25,8 +25,8 @@
         [GlobalSetup]
         public void Setup()
         {
-            this.destination = MemoryManager.Current.Allocate<Rgba32>(this.Count);
-            this.source = MemoryManager.Current.Allocate<Vector4>(this.Count * 4);
+            this.destination = Configuration.Default.MemoryManager.Allocate<Rgba32>(this.Count);
+            this.source = Configuration.Default.MemoryManager.Allocate<Vector4>(this.Count * 4);
             this.source.Pin();
             this.destination.Pin();
         }
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
index d273124b8..eab65bb33 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
@@ -19,8 +19,8 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [GlobalSetup]
         public void Setup()
         {
-            this.destination = MemoryManager.Current.Allocate<TPixel>(this.Count);
-            this.source = MemoryManager.Current.Allocate<byte>(this.Count * 4);
+            this.destination = Configuration.Default.MemoryManager.Allocate<TPixel>(this.Count);
+            this.source = Configuration.Default.MemoryManager.Allocate<byte>(this.Count * 4);
         }
 
         [GlobalCleanup]
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
index 7e29dfe3a..f9ecc9635 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
@@ -21,8 +21,8 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [GlobalSetup]
         public void Setup()
         {
-            this.source = MemoryManager.Current.Allocate<TPixel>(this.Count);
-            this.destination = MemoryManager.Current.Allocate<Vector4>(this.Count);
+            this.source = Configuration.Default.MemoryManager.Allocate<TPixel>(this.Count);
+            this.destination = Configuration.Default.MemoryManager.Allocate<Vector4>(this.Count);
         }
 
         [GlobalCleanup]
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
index adc374c1f..8475a9e82 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
@@ -19,8 +19,8 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [GlobalSetup]
         public void Setup()
         {
-            this.source = MemoryManager.Current.Allocate<TPixel>(this.Count);
-            this.destination = MemoryManager.Current.Allocate<byte>(this.Count * 3);
+            this.source = Configuration.Default.MemoryManager.Allocate<TPixel>(this.Count);
+            this.destination = Configuration.Default.MemoryManager.Allocate<byte>(this.Count * 3);
         }
 
         [GlobalCleanup]
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
index bead1384b..b3e0eff14 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
@@ -24,8 +24,8 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [GlobalSetup]
         public void Setup()
         {
-            this.source = MemoryManager.Current.Allocate<TPixel>(this.Count);
-            this.destination = MemoryManager.Current.Allocate<byte>(this.Count * 4);
+            this.source = Configuration.Default.MemoryManager.Allocate<TPixel>(this.Count);
+            this.destination = Configuration.Default.MemoryManager.Allocate<byte>(this.Count * 4);
         }
 
         [GlobalCleanup]
diff --git a/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs b/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
index 47c812554..6926d9253 100644
--- a/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
+++ b/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
@@ -18,7 +18,7 @@ namespace SixLabors.ImageSharp.Benchmarks.General
         [GlobalSetup]
         public void Setup()
         {
-            this.buffer = MemoryManager.Current.Allocate<Rgba32>(this.Count);
+            this.buffer = Configuration.Default.MemoryManager.Allocate<Rgba32>(this.Count);
         }
 
         [GlobalCleanup]
diff --git a/tests/ImageSharp.Benchmarks/General/IterateArray.cs b/tests/ImageSharp.Benchmarks/General/IterateArray.cs
index 383e7080c..e06d71f4a 100644
--- a/tests/ImageSharp.Benchmarks/General/IterateArray.cs
+++ b/tests/ImageSharp.Benchmarks/General/IterateArray.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Benchmarks.General
         [GlobalSetup]
         public void Setup()
         {
-            this.buffer = MemoryManager.Current.Allocate<Vector4>(this.Length);
+            this.buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(this.Length);
             this.buffer.Pin();
             this.array = new Vector4[this.Length];
         }
diff --git a/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs b/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
index 58f835a07..50e0bd610 100644
--- a/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
+++ b/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
@@ -149,7 +149,7 @@
         public void Setup()
         {
             this.width = 2048;
-            this.buffer = MemoryManager.Current.Allocate2D<Vector4>(2048, 2048);
+            this.buffer = Configuration.Default.MemoryManager.Allocate2D<Vector4>(2048, 2048);
             this.pointer = (Vector4*)this.buffer.Buffer.Pin();
             this.array = this.buffer.Buffer.Array;
             this.pinnable = Unsafe.As<Pinnable<Vector4>>(this.array);
diff --git a/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs b/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
index 70ea164d6..b4f78bee8 100644
--- a/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
+++ b/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
@@ -54,7 +54,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoder encoder = new PngEncoder() { Quantizer = new OctreeQuantizer<Rgba32>(), PaletteSize = 256 };
+                PngEncoder encoder = new PngEncoder(Configuration.Default.MemoryManager) { Quantizer = new OctreeQuantizer<Rgba32>(), PaletteSize = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, encoder);
             }
@@ -65,7 +65,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoder options = new PngEncoder { Quantizer = new OctreeQuantizer<Rgba32> { Dither = false }, PaletteSize = 256 };
+                PngEncoder options = new PngEncoder(Configuration.Default.MemoryManager) { Quantizer = new OctreeQuantizer<Rgba32> { Dither = false }, PaletteSize = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
@@ -76,7 +76,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoder options = new PngEncoder { Quantizer = new PaletteQuantizer<Rgba32>(), PaletteSize = 256 };
+                PngEncoder options = new PngEncoder(Configuration.Default.MemoryManager) { Quantizer = new PaletteQuantizer<Rgba32>(), PaletteSize = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
@@ -87,7 +87,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoder options = new PngEncoder { Quantizer = new PaletteQuantizer<Rgba32> { Dither = false }, PaletteSize = 256 };
+                PngEncoder options = new PngEncoder(Configuration.Default.MemoryManager) { Quantizer = new PaletteQuantizer<Rgba32> { Dither = false }, PaletteSize = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
@@ -98,7 +98,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoder options = new PngEncoder() { Quantizer = new WuQuantizer<Rgba32>(), PaletteSize = 256 };
+                PngEncoder options = new PngEncoder(Configuration.Default.MemoryManager) { Quantizer = new WuQuantizer<Rgba32>(), PaletteSize = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
diff --git a/tests/ImageSharp.Benchmarks/Image/EncodePng.cs b/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
index b3c1e4ee9..383505e0d 100644
--- a/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
+++ b/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
@@ -74,7 +74,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
                 new OctreeQuantizer<Rgba32>()
                 : new PaletteQuantizer<Rgba32>();
 
-                var options = new PngEncoder { Quantizer = quantizer };
+                var options = new PngEncoder(Configuration.Default.MemoryManager) { Quantizer = quantizer };
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
         }
diff --git a/tests/ImageSharp.Benchmarks/Image/Jpeg/YCbCrColorConversion.cs b/tests/ImageSharp.Benchmarks/Image/Jpeg/YCbCrColorConversion.cs
index f513e0d38..c47aff9cf 100644
--- a/tests/ImageSharp.Benchmarks/Image/Jpeg/YCbCrColorConversion.cs
+++ b/tests/ImageSharp.Benchmarks/Image/Jpeg/YCbCrColorConversion.cs
@@ -76,7 +76,7 @@
                 }
 
                 // no need to dispose when buffer is not array owner
-                buffers[i] = MemoryManager.Current.Allocate2D<float>(values.Length, 1);
+                buffers[i] = Configuration.Default.MemoryManager.Allocate2D<float>(values.Length, 1);
             }
 
             return buffers;
diff --git a/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs b/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
index ef44d1e78..4524d757c 100644
--- a/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
+++ b/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
@@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.Benchmarks
             Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
             Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-            using (Buffer<Vector4> buffer = MemoryManager.Current.Allocate<Vector4>(destination.Length * 3))
+            using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
             {
                 Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                 Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Benchmarks
         {
             using (Image<Rgba32> image = new Image<Rgba32>(800, 800))
             {
-                Buffer<float> amounts = MemoryManager.Current.Allocate<float>(image.Width);
+                Buffer<float> amounts = Configuration.Default.MemoryManager.Allocate<float>(image.Width);
 
                 for (int x = 0; x < image.Width; x++)
                 {
@@ -82,7 +82,7 @@ namespace SixLabors.ImageSharp.Benchmarks
         {
             using (Image<Rgba32> image = new Image<Rgba32>(800, 800))
             {
-                Buffer<float> amounts = MemoryManager.Current.Allocate<float>(image.Width);
+                Buffer<float> amounts = Configuration.Default.MemoryManager.Allocate<float>(image.Width);
 
                 for (int x = 0; x < image.Width; x++)
                 {
diff --git a/tests/ImageSharp.Benchmarks/Samplers/Glow.cs b/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
index 0494db9b9..2743924f2 100644
--- a/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
+++ b/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
@@ -28,7 +28,7 @@ namespace SixLabors.ImageSharp.Benchmarks
         [GlobalSetup]
         public void Setup()
         {
-            this.bulk = new GlowProcessor<Rgba32>(NamedColors<Rgba32>.Beige, 800 * .5f, GraphicsOptions.Default);
+            this.bulk = new GlowProcessor<Rgba32>(Configuration.Default.MemoryManager, NamedColors<Rgba32>.Beige, 800 * .5f, GraphicsOptions.Default);
             this.parallel = new GlowProcessorParallel<Rgba32>(NamedColors<Rgba32>.Beige) { Radius = 800 * .5f, };
 
         }
@@ -103,7 +103,7 @@ namespace SixLabors.ImageSharp.Benchmarks
                 }
 
                 int width = maxX - minX;
-                using (Buffer<TPixel> rowColors = MemoryManager.Current.Allocate<TPixel>(width))
+                using (Buffer<TPixel> rowColors = Configuration.Default.MemoryManager.Allocate<TPixel>(width))
                 using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     for (int i = 0; i < width; i++)
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/ShapeRegionTests.cs b/tests/ImageSharp.Tests/Drawing/Paths/ShapeRegionTests.cs
index 941807f54..d3fcc5322 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/ShapeRegionTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/ShapeRegionTests.cs
@@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing.Paths
         [Fact]
         public void ShapeRegionWithPathCallsAsShape()
         {
-            new ShapeRegion(pathMock.Object);
+            new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
 
             pathMock.Verify(x => x.AsClosedPath());
         }
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing.Paths
         [Fact]
         public void ShapeRegionWithPathRetainsShape()
         {
-            ShapeRegion region = new ShapeRegion(pathMock.Object);
+            ShapeRegion region = new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
 
             Assert.Equal(pathMock.Object, region.Shape);
         }
@@ -53,7 +53,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing.Paths
         [Fact]
         public void ShapeRegionFromPathConvertsBoundsProxyToShape()
         {
-            ShapeRegion region = new ShapeRegion(pathMock.Object);
+            ShapeRegion region = new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
 
             Assert.Equal(Math.Floor(bounds.Left), region.Bounds.Left);
             Assert.Equal(Math.Ceiling(bounds.Right), region.Bounds.Right);
@@ -64,7 +64,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing.Paths
         [Fact]
         public void ShapeRegionFromPathMaxIntersectionsProxyToShape()
         {
-            ShapeRegion region = new ShapeRegion(pathMock.Object);
+            ShapeRegion region = new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
 
             int i = region.MaxIntersections;
             pathMock.Verify(x => x.MaxIntersections);
@@ -74,7 +74,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing.Paths
         public void ShapeRegionFromPathScanYProxyToShape()
         {
             int yToScan = 10;
-            ShapeRegion region = new ShapeRegion(pathMock.Object);
+            ShapeRegion region = new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
 
             pathMock.Setup(x => x.FindIntersections(It.IsAny<PointF>(), It.IsAny<PointF>(), It.IsAny<PointF[]>(), It.IsAny<int>()))
                 .Callback<PointF, PointF, PointF[], int>((s, e, b, o) => {
@@ -93,7 +93,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing.Paths
         public void ShapeRegionFromShapeScanYProxyToShape()
         {
             int yToScan = 10;
-            ShapeRegion region = new ShapeRegion(pathMock.Object);
+            ShapeRegion region = new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
 
             pathMock.Setup(x => x.FindIntersections(It.IsAny<PointF>(), It.IsAny<PointF>(), It.IsAny<PointF[]>(), It.IsAny<int>()))
                 .Callback<PointF, PointF, PointF[], int>((s, e, b, o) => {
@@ -111,7 +111,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing.Paths
         [Fact]
         public void ShapeRegionFromShapeConvertsBoundsProxyToShape()
         {
-            ShapeRegion region = new ShapeRegion(pathMock.Object);
+            ShapeRegion region = new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
 
             Assert.Equal(Math.Floor(bounds.Left), region.Bounds.Left);
             Assert.Equal(Math.Ceiling(bounds.Right), region.Bounds.Right);
@@ -122,7 +122,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing.Paths
         [Fact]
         public void ShapeRegionFromShapeMaxIntersectionsProxyToShape()
         {
-            ShapeRegion region = new ShapeRegion(pathMock.Object);
+            ShapeRegion region = new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
 
             int i = region.MaxIntersections;
             pathMock.Verify(x => x.MaxIntersections);
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.CopyToBufferArea.cs b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.CopyToBufferArea.cs
index 1dc4896ee..e50d84852 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.CopyToBufferArea.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.CopyToBufferArea.cs
@@ -48,7 +48,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             {
                 Block8x8F block = CreateRandomFloatBlock(0, 100);
 
-                using (var buffer = MemoryManager.Current.Allocate2D<float>(20, 20))
+                using (var buffer = Configuration.Default.MemoryManager.Allocate2D<float>(20, 20))
                 {
                     BufferArea<float> area = buffer.GetArea(5, 10, 8, 8);
                     block.CopyTo(area);
@@ -78,7 +78,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 
                 var start = new Point(50, 50);
 
-                using (var buffer = MemoryManager.Current.Allocate2D<float>(100, 100))
+                using (var buffer = Configuration.Default.MemoryManager.Allocate2D<float>(100, 100))
                 {
                     BufferArea<float> area = buffer.GetArea(start.X, start.Y, 8 * horizontalFactor, 8 * verticalFactor);
                     block.CopyTo(area, horizontalFactor, verticalFactor);
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegImagePostProcessorTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegImagePostProcessorTests.cs
index df6d1ef1b..423673ef9 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegImagePostProcessorTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegImagePostProcessorTests.cs
@@ -55,8 +55,8 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         {
             string imageFile = provider.SourceFileOrDescription;
             using (OrigJpegDecoderCore decoder = JpegFixture.ParseStream(imageFile))
-            using (var pp = new JpegImagePostProcessor(decoder))
-            using (var imageFrame = new ImageFrame<Rgba32>(decoder.ImageWidth, decoder.ImageHeight))
+            using (var pp = new JpegImagePostProcessor(Configuration.Default.MemoryManager, decoder))
+            using (var imageFrame = new ImageFrame<Rgba32>(Configuration.Default.MemoryManager, decoder.ImageWidth, decoder.ImageHeight))
             {
                 pp.DoPostProcessorStep(imageFrame);
 
@@ -77,7 +77,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         {
             string imageFile = provider.SourceFileOrDescription;
             using (OrigJpegDecoderCore decoder = JpegFixture.ParseStream(imageFile))
-            using (var pp = new JpegImagePostProcessor(decoder))
+            using (var pp = new JpegImagePostProcessor(Configuration.Default.MemoryManager, decoder))
             using (var image = new Image<Rgba32>(decoder.ImageWidth, decoder.ImageHeight))
             {
                 pp.PostProcess(image.Frames.RootFrame);
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs b/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs
index ad9ad8143..9e287eb2d 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs
@@ -23,7 +23,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
                 this.HeightInBlocks = heightInBlocks;
                 this.WidthInBlocks = widthInBlocks;
                 this.Index = index;
-                this.SpectralBlocks = MemoryManager.Current.Allocate2D<Block8x8>(this.WidthInBlocks, this.HeightInBlocks);
+                this.SpectralBlocks = Configuration.Default.MemoryManager.Allocate2D<Block8x8>(this.WidthInBlocks, this.HeightInBlocks);
             }
 
             public Size Size => new Size(this.WidthInBlocks, this.HeightInBlocks);
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
index 1566ddf44..ac9a5c220 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
@@ -28,7 +28,7 @@ namespace SixLabors.ImageSharp.Tests
         {
             using (Image<TPixel> image = provider.GetImage())
             {
-                var options = new PngEncoder()
+                var options = new PngEncoder(Configuration.Default.MemoryManager)
                 {
                     PngColorType = pngColorType
                 };
@@ -46,7 +46,7 @@ namespace SixLabors.ImageSharp.Tests
             using (Image<TPixel> image = provider.GetImage())
             using (var ms = new MemoryStream())
             {
-                image.Save(ms, new PngEncoder());
+                image.Save(ms, new PngEncoder(Configuration.Default.MemoryManager));
                 
                 byte[] data = ms.ToArray().Take(8).ToArray(); 
                 byte[] expected = {
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
index fc17df93d..3a73867ba 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
@@ -23,7 +23,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
             {
                 // image.Save(provider.Utility.GetTestOutputFileName("bmp"));
 
-                image.Save(ms, new PngEncoder());
+                image.Save(ms, new PngEncoder(Configuration.Default.MemoryManager));
                 ms.Position = 0;
                 using (Image<Rgba32> img2 = Image.Load<Rgba32>(ms, new PngDecoder()))
                 {
@@ -110,7 +110,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
                 image.Mutate(x => x.Resize(100, 100));
                 // image.Save(provider.Utility.GetTestOutputFileName("png", "resize"));
 
-                image.Save(ms, new PngEncoder());
+                image.Save(ms, new PngEncoder(Configuration.Default.MemoryManager));
                 ms.Position = 0;
                 using (Image<Rgba32> img2 = Image.Load<Rgba32>(ms, new PngDecoder()))
                 {
diff --git a/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs b/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs
index afae9cae8..1f2137070 100644
--- a/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs
@@ -30,7 +30,7 @@ namespace SixLabors.ImageSharp.Tests
         {
             ArgumentException ex = Assert.Throws<ArgumentException>(() =>
             {
-                this.collection.AddFrame(new ImageFrame<Rgba32>(1, 1));
+                this.collection.AddFrame(new ImageFrame<Rgba32>(Configuration.Default.MemoryManager, 1, 1));
             });
 
             Assert.StartsWith("Frame must have the same dimensions as the image.", ex.Message);
@@ -78,7 +78,7 @@ namespace SixLabors.ImageSharp.Tests
 
             ArgumentException ex = Assert.Throws<ArgumentException>(() =>
             {
-                this.collection.InsertFrame(1, new ImageFrame<Rgba32>(1, 1));
+                this.collection.InsertFrame(1, new ImageFrame<Rgba32>(Configuration.Default.MemoryManager, 1, 1));
             });
 
             Assert.StartsWith("Frame must have the same dimensions as the image.", ex.Message);
@@ -103,8 +103,8 @@ namespace SixLabors.ImageSharp.Tests
             ArgumentException ex = Assert.Throws<ArgumentException>(() =>
             {
                 var collection = new ImageFrameCollection<Rgba32>(this.image, new[] {
-                    new ImageFrame<Rgba32>(10,10),
-                    new ImageFrame<Rgba32>(1,1),
+                    new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10,10),
+                    new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,1,1),
                 });
             });
 
@@ -115,7 +115,7 @@ namespace SixLabors.ImageSharp.Tests
         public void RemoveAtFrame_ThrowIfRemovingLastFrame()
         {
             var collection = new ImageFrameCollection<Rgba32>(this.image, new[] {
-                    new ImageFrame<Rgba32>(10,10)
+                    new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10,10)
                 });
 
             InvalidOperationException ex = Assert.Throws<InvalidOperationException>(() =>
@@ -130,8 +130,8 @@ namespace SixLabors.ImageSharp.Tests
         {
 
             var collection = new ImageFrameCollection<Rgba32>(this.image, new[] {
-                    new ImageFrame<Rgba32>(10,10),
-                    new ImageFrame<Rgba32>(10,10),
+                    new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10,10),
+                    new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10,10),
                 });
 
             collection.RemoveFrame(0);
@@ -142,8 +142,8 @@ namespace SixLabors.ImageSharp.Tests
         public void RootFrameIsFrameAtIndexZero()
         {
             var collection = new ImageFrameCollection<Rgba32>(this.image, new[] {
-                new ImageFrame<Rgba32>(10,10),
-                new ImageFrame<Rgba32>(10,10),
+                new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10,10),
+                new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10,10),
             });
 
             Assert.Equal(collection.RootFrame, collection[0]);
@@ -153,8 +153,8 @@ namespace SixLabors.ImageSharp.Tests
         public void ConstructorPopulatesFrames()
         {
             var collection = new ImageFrameCollection<Rgba32>(this.image, new[] {
-                new ImageFrame<Rgba32>(10,10),
-                new ImageFrame<Rgba32>(10,10),
+                new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10,10),
+                new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10,10),
             });
 
             Assert.Equal(2, collection.Count);
@@ -164,8 +164,8 @@ namespace SixLabors.ImageSharp.Tests
         public void DisposeClearsCollection()
         {
             var collection = new ImageFrameCollection<Rgba32>(this.image, new[] {
-                new ImageFrame<Rgba32>(10,10),
-                new ImageFrame<Rgba32>(10,10),
+                new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10,10),
+                new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10,10),
             });
 
             collection.Dispose();
@@ -177,8 +177,8 @@ namespace SixLabors.ImageSharp.Tests
         public void Dispose_DisposesAllInnerFrames()
         {
             var collection = new ImageFrameCollection<Rgba32>(this.image, new[] {
-                new ImageFrame<Rgba32>(10,10),
-                new ImageFrame<Rgba32>(10,10),
+                new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10,10),
+                new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10,10),
             });
 
             IPixelSource<Rgba32>[] framesSnapShot = collection.OfType<IPixelSource<Rgba32>>().ToArray();
@@ -198,7 +198,7 @@ namespace SixLabors.ImageSharp.Tests
         {
             using (Image<TPixel> img = provider.GetImage())
             {
-                img.Frames.AddFrame(new ImageFrame<TPixel>(10, 10));// add a frame anyway
+                img.Frames.AddFrame(new ImageFrame<TPixel>(Configuration.Default.MemoryManager,10, 10));// add a frame anyway
                 using (Image<TPixel> cloned = img.Frames.CloneFrame(0))
                 {
                     Assert.Equal(2, img.Frames.Count);
@@ -216,7 +216,7 @@ namespace SixLabors.ImageSharp.Tests
             {
                 var sourcePixelData = img.GetPixelSpan().ToArray();
 
-                img.Frames.AddFrame(new ImageFrame<TPixel>(10, 10));
+                img.Frames.AddFrame(new ImageFrame<TPixel>(Configuration.Default.MemoryManager,10, 10));
                 using (Image<TPixel> cloned = img.Frames.ExportFrame(0))
                 {
                     Assert.Equal(1, img.Frames.Count);
@@ -244,7 +244,7 @@ namespace SixLabors.ImageSharp.Tests
         public void AddFrame_clones_sourceFrame()
         {
             var pixelData = this.image.Frames.RootFrame.GetPixelSpan().ToArray();
-            var otherFRame = new ImageFrame<Rgba32>(10, 10);
+            var otherFRame = new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10, 10);
             var addedFrame = this.image.Frames.AddFrame(otherFRame);
             addedFrame.ComparePixelBufferTo(otherFRame.GetPixelSpan());
             Assert.NotEqual(otherFRame, addedFrame);
@@ -254,7 +254,7 @@ namespace SixLabors.ImageSharp.Tests
         public void InsertFrame_clones_sourceFrame()
         {
             var pixelData = this.image.Frames.RootFrame.GetPixelSpan().ToArray();
-            var otherFRame = new ImageFrame<Rgba32>(10, 10);
+            var otherFRame = new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10, 10);
             var addedFrame = this.image.Frames.InsertFrame(0, otherFRame);
             addedFrame.ComparePixelBufferTo(otherFRame.GetPixelSpan());
             Assert.NotEqual(otherFRame, addedFrame);
@@ -308,7 +308,7 @@ namespace SixLabors.ImageSharp.Tests
                 this.image.Frames.CreateFrame();
             }
 
-            var frame = new ImageFrame<Rgba32>(10, 10);
+            var frame = new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10, 10);
             Assert.False(this.image.Frames.Contains(frame));
         }
 
diff --git a/tests/ImageSharp.Tests/Image/ImageTests.cs b/tests/ImageSharp.Tests/Image/ImageTests.cs
index da813f428..45ecf60a0 100644
--- a/tests/ImageSharp.Tests/Image/ImageTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageTests.cs
@@ -103,7 +103,7 @@ namespace SixLabors.ImageSharp.Tests
 
             using (Image<Rgba32> image = new Image<Rgba32>(10, 10))
             {
-                image.Save(file, new PngEncoder());
+                image.Save(file, new PngEncoder(Configuration.Default.MemoryManager));
             }
             using (Image<Rgba32> img = Image.Load(file, out var mime))
             {
diff --git a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
index f14995433..7f78ef39c 100644
--- a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
+++ b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
@@ -31,7 +31,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(1025, 17)]
         public void Construct(int width, int height)
         {
-            using (Buffer2D<TestStructs.Foo> buffer = MemoryManager.Current.Allocate2D<TestStructs.Foo>(width, height))
+            using (Buffer2D<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate2D<TestStructs.Foo>(width, height))
             {
                 Assert.Equal(width, buffer.Width);
                 Assert.Equal(height, buffer.Height);
@@ -44,7 +44,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         {
             for (int i = 0; i < 100; i++)
             {
-                using (Buffer2D<int> buffer = Buffer2D<int>.CreateClean(42, 42))
+                using (Buffer2D<int> buffer = Configuration.Default.MemoryManager.Allocate2D<int>(42, 42, true))
                 {
                     for (int j = 0; j < buffer.Buffer.Length; j++)
                     {
@@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(17, 42, 41)]
         public void GetRowSpanY(int width, int height, int y)
         {
-            using (Buffer2D<TestStructs.Foo> buffer = MemoryManager.Current.Allocate2D<TestStructs.Foo>(width, height))
+            using (Buffer2D<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate2D<TestStructs.Foo>(width, height))
             {
                 Span<TestStructs.Foo> span = buffer.GetRowSpan(y);
 
@@ -77,7 +77,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(17, 42, 0, 41)]
         public void GetRowSpanXY(int width, int height, int x, int y)
         {
-            using (Buffer2D<TestStructs.Foo> buffer = MemoryManager.Current.Allocate2D<TestStructs.Foo>(width, height))
+            using (Buffer2D<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate2D<TestStructs.Foo>(width, height))
             {
                 Span<TestStructs.Foo> span = buffer.GetRowSpan(x, y);
 
@@ -93,7 +93,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(99, 88, 98, 87)]
         public void Indexer(int width, int height, int x, int y)
         {
-            using (Buffer2D<TestStructs.Foo> buffer = MemoryManager.Current.Allocate2D<TestStructs.Foo>(width, height))
+            using (Buffer2D<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate2D<TestStructs.Foo>(width, height))
             {
                 TestStructs.Foo[] array = buffer.Buffer.Array;
 
diff --git a/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs b/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs
index 74e9098b9..2ca409dc1 100644
--- a/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs
+++ b/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs
@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [Fact]
         public void Construct()
         {
-            using (var buffer = MemoryManager.Current.Allocate2D<int>(10, 20))
+            using (var buffer = Configuration.Default.MemoryManager.Allocate2D<int>(10, 20))
             {
                 var rectangle = new Rectangle(3,2, 5, 6);
                 var area = new BufferArea<int>(buffer, rectangle);
@@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
 
         private static Buffer2D<int> CreateTestBuffer(int w, int h)
         {
-            var buffer = MemoryManager.Current.Allocate2D<int>(w, h);
+            var buffer = Configuration.Default.MemoryManager.Allocate2D<int>(w, h);
             for (int y = 0; y < h; y++)
             {
                 for (int x = 0; x < w; x++)
diff --git a/tests/ImageSharp.Tests/Memory/BufferTests.cs b/tests/ImageSharp.Tests/Memory/BufferTests.cs
index 8669f2bb0..d0a83a094 100644
--- a/tests/ImageSharp.Tests/Memory/BufferTests.cs
+++ b/tests/ImageSharp.Tests/Memory/BufferTests.cs
@@ -35,7 +35,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(1111)]
         public void ConstructWithOwnArray(int count)
         {
-            using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(count))
+            using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(count))
             {
                 Assert.False(buffer.IsDisposedOrLostArrayOwnership);
                 Assert.NotNull(buffer.Array);
@@ -76,7 +76,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         {
             for (int i = 0; i < 100; i++)
             {
-                using (Buffer<int> buffer = MemoryManager.Current.Allocate<int>(42, true))
+                using (Buffer<int> buffer = Configuration.Default.MemoryManager.Allocate<int>(42, true))
                 {
                     for (int j = 0; j < buffer.Length; j++)
                     {
@@ -129,7 +129,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [Fact]
         public void Dispose()
         {
-            Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(42);
+            Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(42);
             buffer.Dispose();
 
             Assert.True(buffer.IsDisposedOrLostArrayOwnership);
@@ -140,7 +140,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(123)]
         public void CastToSpan(int bufferLength)
         {
-            using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(bufferLength))
+            using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(bufferLength))
             {
                 Span<TestStructs.Foo> span = buffer;
 
@@ -154,7 +154,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [Fact]
         public void Span()
         {
-            using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(42))
+            using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(42))
             {
                 Span<TestStructs.Foo> span = buffer.Span;
 
@@ -173,7 +173,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             [InlineData(123, 17)]
             public void WithStartOnly(int bufferLength, int start)
             {
-                using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(bufferLength))
+                using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(bufferLength))
                 {
                     Span<TestStructs.Foo> span = buffer.Slice(start);
 
@@ -187,7 +187,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             [InlineData(123, 17, 42)]
             public void WithStartAndLength(int bufferLength, int start, int spanLength)
             {
-                using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(bufferLength))
+                using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(bufferLength))
                 {
                     Span<TestStructs.Foo> span = buffer.Slice(start, spanLength);
 
@@ -201,7 +201,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         public void UnPinAndTakeArrayOwnership()
         {
             TestStructs.Foo[] data = null;
-            using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(42))
+            using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(42))
             {
                 data = buffer.TakeArrayOwnership();
                 Assert.True(buffer.IsDisposedOrLostArrayOwnership);
@@ -216,7 +216,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             [Fact]
             public void ReturnsPinnedPointerToTheBeginningOfArray()
             {
-                using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(42))
+                using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(42))
                 {
                     TestStructs.Foo* actual = (TestStructs.Foo*)buffer.Pin();
                     fixed (TestStructs.Foo* expected = buffer.Array)
@@ -229,7 +229,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             [Fact]
             public void SecondCallReturnsTheSamePointer()
             {
-                using (Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(42))
+                using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(42))
                 {
                     IntPtr ptr1 = buffer.Pin();
                     IntPtr ptr2 = buffer.Pin();
@@ -241,7 +241,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             [Fact]
             public void WhenCalledOnDisposedBuffer_ThrowsInvalidOperationException()
             {
-                Buffer<TestStructs.Foo> buffer = MemoryManager.Current.Allocate<TestStructs.Foo>(42);
+                Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(42);
                 buffer.Dispose();
 
                 Assert.Throws<InvalidOperationException>(() => buffer.Pin());
diff --git a/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs b/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs
index 8b90295ce..757c8fcf9 100644
--- a/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs
+++ b/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs
@@ -424,7 +424,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 Rgba32[] colors = { new Rgba32(0, 1, 2, 3), new Rgba32(4, 5, 6, 7), new Rgba32(8, 9, 10, 11), };
 
                 using (Buffer<Rgba32> colorBuf = new Buffer<Rgba32>(colors))
-                using (Buffer<byte> byteBuf = MemoryManager.Current.Allocate<byte>(colors.Length * 4))
+                using (Buffer<byte> byteBuf = Configuration.Default.MemoryManager.Allocate<byte>(colors.Length * 4))
                 {
                     SpanHelper.Copy(colorBuf.Span.AsBytes(), byteBuf, colorBuf.Length * sizeof(Rgba32));
 
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
index c7227eb8a..4cd7ebeea 100644
--- a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
@@ -50,8 +50,8 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
                 int times = 200000;
                 int count = 1024;
 
-                using (Buffer<ImageSharp.Rgba32> source = MemoryManager.Current.Allocate<ImageSharp.Rgba32>(count))
-                using (Buffer<Vector4> dest = MemoryManager.Current.Allocate<Vector4>(count))
+                using (Buffer<ImageSharp.Rgba32> source = Configuration.Default.MemoryManager.Allocate<ImageSharp.Rgba32>(count))
+                using (Buffer<Vector4> dest = Configuration.Default.MemoryManager.Allocate<Vector4>(count))
                 {
                     this.Measure(
                         times,
@@ -344,7 +344,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             {
                 this.SourceBuffer = new Buffer<TSource>(source);
                 this.ExpectedDestBuffer = new Buffer<TDest>(expectedDest);
-                this.ActualDestBuffer = MemoryManager.Current.Allocate<TDest>(expectedDest.Length);
+                this.ActualDestBuffer = Configuration.Default.MemoryManager.Allocate<TDest>(expectedDest.Length);
             }
 
             public void Dispose()
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs
index 963b849d2..d5aed8832 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs
@@ -38,7 +38,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         // [Fact]
         public void PrintWeightsData()
         {
-            var proc = new ResizeProcessor<Rgba32>(new BicubicResampler(), 200, 200);
+            var proc = new ResizeProcessor<Rgba32>(Configuration.Default.MemoryManager, new BicubicResampler(), 200, 200);
 
             ResamplingWeightedProcessor<Rgba32>.WeightsBuffer weights = proc.PrecomputeWeights(200, 500);
 
diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
index babe148c8..d14a0165a 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
@@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             int length = source.Length;
             Guard.MustBeSizedAtLeast(dest, length, nameof(dest));
 
-            using (var rgbaBuffer = MemoryManager.Current.Allocate<Rgba32>(length))
+            using (var rgbaBuffer = Configuration.Default.MemoryManager.Allocate<Rgba32>(length))
             {
                 PixelOperations<TPixel>.Instance.ToRgba32(source, rgbaBuffer, length);
 
@@ -39,7 +39,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             int length = source.Length;
             Guard.MustBeSizedAtLeast(dest, length, nameof(dest));
 
-            using (var rgbaBuffer = MemoryManager.Current.Allocate<Rgba32>(length))
+            using (var rgbaBuffer = Configuration.Default.MemoryManager.Allocate<Rgba32>(length))
             {
                 PixelOperations<Argb32>.Instance.ToRgba32(source, rgbaBuffer, length);
 
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             int length = source.Length;
             Guard.MustBeSizedAtLeast(dest, length, nameof(dest));
 
-            using (var rgbaBuffer = MemoryManager.Current.Allocate<Rgb24>(length))
+            using (var rgbaBuffer = Configuration.Default.MemoryManager.Allocate<Rgb24>(length))
             {
                 PixelOperations<Rgb24>.Instance.ToRgb24(source, rgbaBuffer, length);
 
@@ -96,7 +96,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
 
             var image = new Image<TPixel>(w, h);
 
-            using (var workBuffer = MemoryManager.Current.Allocate<Argb32>(w))
+            using (var workBuffer = Configuration.Default.MemoryManager.Allocate<Argb32>(w))
             {
                 var destPtr = (Argb32*)workBuffer.Pin();
                 for (int y = 0; y < h; y++)
@@ -138,7 +138,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
 
             var image = new Image<TPixel>(w, h);
 
-            using (var workBuffer = MemoryManager.Current.Allocate<Rgb24>(w))
+            using (var workBuffer = Configuration.Default.MemoryManager.Allocate<Rgb24>(w))
             {
                 var destPtr = (Rgb24*)workBuffer.Pin();
                 for (int y = 0; y < h; y++)
@@ -170,7 +170,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             long destRowByteCount = data.Stride;
             long sourceRowByteCount = w * sizeof(Argb32);
 
-            using (var workBuffer = MemoryManager.Current.Allocate<Argb32>(w))
+            using (var workBuffer = Configuration.Default.MemoryManager.Allocate<Argb32>(w))
             {
                 var sourcePtr = (Argb32*)workBuffer.Pin();
 
diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs
index 0a550a3c1..f4fce0f63 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Tests
                     sourceImage.Mutate(c => c.Alpha(1));
                 }
 
-                var encoder = new PngEncoder() { PngColorType = pngColorType };
+                var encoder = new PngEncoder(Configuration.Default.MemoryManager) { PngColorType = pngColorType };
                 return provider.Utility.SaveTestOutputFile(sourceImage, "png", encoder);
             }
         }

From bf8bd6832f38bd9758d0c2bf39655ee0d4923d03 Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Fri, 12 Jan 2018 15:21:23 +0200
Subject: [PATCH 10/70] - Code style fixes

---
 src/ImageSharp.Drawing/Paths/ShapePath.cs              |  1 +
 src/ImageSharp.Drawing/Paths/ShapeRegion.cs            |  1 +
 .../Jpeg/Common/Decoder/JpegImagePostProcessor.cs      |  1 +
 .../GolangPort/Components/Decoder/OrigComponent.cs     |  1 +
 .../Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs     |  1 +
 .../Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs    |  1 +
 .../PdfJsPort/Components/PdfJsQuantizationTables.cs    | 10 +++++-----
 src/ImageSharp/Formats/Png/PngEncoder.cs               |  6 +++++-
 src/ImageSharp/Formats/Png/PngEncoderCore.cs           |  1 +
 src/ImageSharp/IImageProcessingContext{TPixel}.cs      |  5 +++++
 src/ImageSharp/Image/ImageFrame{TPixel}.cs             | 10 ++++++++--
 src/ImageSharp/Memory/ArrayPoolMemoryManager.cs        |  1 -
 .../Processors/ColorMatrix/LomographProcessor.cs       |  4 +++-
 .../Processors/ColorMatrix/PolaroidProcessor.cs        |  4 +++-
 .../Processors/Effects/BackgroundColorProcessor.cs     |  1 +
 .../Processing/Processors/Overlays/GlowProcessor.cs    |  1 +
 .../Processors/Overlays/VignetteProcessor.cs           |  2 ++
 .../Transforms/ResamplingWeightedProcessor.Weights.cs  |  1 +
 .../Transforms/ResamplingWeightedProcessor.cs          |  5 +++--
 .../Processors/Transforms/ResizeProcessor.cs           |  2 ++
 20 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/src/ImageSharp.Drawing/Paths/ShapePath.cs b/src/ImageSharp.Drawing/Paths/ShapePath.cs
index f973668e5..9e2b22a75 100644
--- a/src/ImageSharp.Drawing/Paths/ShapePath.cs
+++ b/src/ImageSharp.Drawing/Paths/ShapePath.cs
@@ -18,6 +18,7 @@ namespace SixLabors.ImageSharp.Drawing
         /// <summary>
         /// Initializes a new instance of the <see cref="ShapePath"/> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="shape">The shape.</param>
         /// <param name="pen">The pen to apply to the shape.</param>
         // SixLabors.shape willbe moving to a Span/ReadOnlySpan based API shortly use ToArray for now.
diff --git a/src/ImageSharp.Drawing/Paths/ShapeRegion.cs b/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
index 489468dbe..77a3b0115 100644
--- a/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
+++ b/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
@@ -20,6 +20,7 @@ namespace SixLabors.ImageSharp.Drawing
         /// <summary>
         /// Initializes a new instance of the <see cref="ShapeRegion"/> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="shape">The shape.</param>
         public ShapeRegion(MemoryManager memoryManager, IPath shape)
         {
diff --git a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
index 44841bd67..1b83f62eb 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
@@ -44,6 +44,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
         /// <summary>
         /// Initializes a new instance of the <see cref="JpegImagePostProcessor"/> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="rawJpeg">The <see cref="IRawJpegData"/> representing the uncompressed spectral Jpeg data</param>
         public JpegImagePostProcessor(MemoryManager memoryManager, IRawJpegData rawJpeg)
         {
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigComponent.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigComponent.cs
index c2b4d632a..e83dd75a5 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigComponent.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigComponent.cs
@@ -54,6 +54,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// <summary>
         /// Initializes <see cref="SpectralBlocks"/>
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="decoder">The <see cref="OrigJpegDecoderCore"/> instance</param>
         public void InitializeDerivedData(MemoryManager memoryManager, OrigJpegDecoderCore decoder)
         {
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
index 4142ae354..f1beab114 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
@@ -20,6 +20,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// <summary>
         /// Initializes a new instance of the <see cref="PdfJsHuffmanTable"/> struct.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="lengths">The code lengths</param>
         /// <param name="values">The huffman values</param>
         public PdfJsHuffmanTable(MemoryManager memoryManager, byte[] lengths, byte[] values)
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
index eebc57b86..ac26d892c 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
@@ -27,6 +27,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// <summary>
         /// Initializes a new instance of the <see cref="PdfJsJpegPixelArea"/> struct.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="imageWidth">The image width</param>
         /// <param name="imageHeight">The image height</param>
         /// <param name="numberOfComponents">The number of components</param>
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsQuantizationTables.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsQuantizationTables.cs
index f7302b156..afe0b3007 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsQuantizationTables.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsQuantizationTables.cs
@@ -12,6 +12,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
     /// </summary>
     internal sealed class PdfJsQuantizationTables : IDisposable
     {
+        public PdfJsQuantizationTables(MemoryManager memoryManager)
+        {
+            this.Tables = memoryManager.Allocate2D<short>(64, 4);
+        }
+
         /// <summary>
         /// Gets the ZigZag scan table
         /// </summary>
@@ -40,11 +45,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
                 63
             };
 
-        public PdfJsQuantizationTables(MemoryManager memoryManager)
-        {
-            this.Tables = memoryManager.Allocate2D<short>(64, 4);
-        }
-
         /// <summary>
         /// Gets or sets the quantization tables.
         /// </summary>
diff --git a/src/ImageSharp/Formats/Png/PngEncoder.cs b/src/ImageSharp/Formats/Png/PngEncoder.cs
index f65ce59b2..1fd70a4d3 100644
--- a/src/ImageSharp/Formats/Png/PngEncoder.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoder.cs
@@ -16,11 +16,15 @@ namespace SixLabors.ImageSharp.Formats.Png
     {
         private readonly MemoryManager memoryManager;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PngEncoder"/> class.
+        /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         public PngEncoder(MemoryManager memoryManager)
         {
             this.memoryManager = memoryManager;
         }
-        
+
         /// <summary>
         /// Gets or sets a value indicating whether the metadata should be ignored when the image is being encoded.
         /// </summary>
diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
index e3e209ed4..327ce9fdf 100644
--- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
@@ -150,6 +150,7 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// <summary>
         /// Initializes a new instance of the <see cref="PngEncoderCore"/> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="options">The options for influancing the encoder</param>
         public PngEncoderCore(MemoryManager memoryManager, IPngEncoderOptions options)
         {
diff --git a/src/ImageSharp/IImageProcessingContext{TPixel}.cs b/src/ImageSharp/IImageProcessingContext{TPixel}.cs
index 1556987df..68b0a030a 100644
--- a/src/ImageSharp/IImageProcessingContext{TPixel}.cs
+++ b/src/ImageSharp/IImageProcessingContext{TPixel}.cs
@@ -30,6 +30,11 @@ namespace SixLabors.ImageSharp
         /// <returns>The current operations class to allow chaining of operations.</returns>
         IImageProcessingContext<TPixel> ApplyProcessor(IImageProcessor<TPixel> processor);
 
+        /// <summary>
+        /// Returns a reference to the <see cref="MemoryManager" /> used to allocate buffers
+        /// for this context.
+        /// </summary>
+        /// <returns>A <see cref="MemoryManager"/> to use for buffer allocations.</returns>
         MemoryManager GetMemoryManager();
     }
 
diff --git a/src/ImageSharp/Image/ImageFrame{TPixel}.cs b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
index 2f2f545db..888630afe 100644
--- a/src/ImageSharp/Image/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
@@ -20,8 +20,6 @@ namespace SixLabors.ImageSharp
     public sealed class ImageFrame<TPixel> : IPixelSource<TPixel>, IDisposable
         where TPixel : struct, IPixel<TPixel>
     {
-        public MemoryManager MemoryManager { get; }
-
         /// <summary>
         /// The image pixels. Not private as Buffer2D requires an array in its constructor.
         /// </summary>
@@ -32,6 +30,7 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageFrame{TPixel}" /> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="width">The width of the image in pixels.</param>
         /// <param name="height">The height of the image in pixels.</param>
         internal ImageFrame(MemoryManager memoryManager, int width, int height)
@@ -42,6 +41,7 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageFrame{TPixel}" /> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="width">The width of the image in pixels.</param>
         /// <param name="height">The height of the image in pixels.</param>
         /// <param name="metaData">The meta data.</param>
@@ -60,6 +60,7 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageFrame{TPixel}" /> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="source">The source.</param>
         internal ImageFrame(MemoryManager memoryManager, ImageFrame<TPixel> source)
         {
@@ -69,6 +70,11 @@ namespace SixLabors.ImageSharp
             this.MetaData = source.MetaData.Clone();
         }
 
+        /// <summary>
+        /// Gets the <see cref="MemoryManager" /> to use for buffer allocations.
+        /// </summary>
+        public MemoryManager MemoryManager { get; }
+
         /// <inheritdoc/>
         Buffer2D<TPixel> IPixelSource<TPixel>.PixelBuffer => this.pixelBuffer;
 
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index 80c6e00e3..d83e3ca3e 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -4,7 +4,6 @@ using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Memory
 {
-
     /// <summary>
     /// Implements <see cref="MemoryManager"/> by allocating memory from <see cref="ArrayPool{T}"/>.
     /// </summary>
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/LomographProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/LomographProcessor.cs
index a95d5fef6..f66ce80a5 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/LomographProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/LomographProcessor.cs
@@ -25,8 +25,10 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <summary>
         /// Initializes a new instance of the <see cref="LomographProcessor{TPixel}" /> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="options">The options effecting blending and composition.</param>
-        public LomographProcessor(MemoryManager memoryManager, GraphicsOptions options) {
+        public LomographProcessor(MemoryManager memoryManager, GraphicsOptions options)
+        {
             this.memoryManager = memoryManager;
             this.options = options;
         }
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/PolaroidProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/PolaroidProcessor.cs
index 76a616a1b..a14919e86 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/PolaroidProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/PolaroidProcessor.cs
@@ -26,8 +26,10 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <summary>
         /// Initializes a new instance of the <see cref="PolaroidProcessor{TPixel}" /> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="options">The options effecting blending and composition.</param>
-        public PolaroidProcessor(MemoryManager memoryManager, GraphicsOptions options) {
+        public PolaroidProcessor(MemoryManager memoryManager, GraphicsOptions options)
+        {
             this.memoryManager = memoryManager;
             this.options = options;
         }
diff --git a/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
index b81fe3cf3..296ae1bb3 100644
--- a/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
@@ -24,6 +24,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <summary>
         /// Initializes a new instance of the <see cref="BackgroundColorProcessor{TPixel}"/> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="color">The <typeparamref name="TPixel"/> to set the background color to.</param>
         /// <param name="options">The options defining blending algorithum and amount.</param>
         public BackgroundColorProcessor(MemoryManager memoryManager, TPixel color, GraphicsOptions options)
diff --git a/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
index 521da20a7..6114c6438 100644
--- a/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
@@ -27,6 +27,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <summary>
         /// Initializes a new instance of the <see cref="GlowProcessor{TPixel}" /> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="color">The color or the glow.</param>
         /// <param name="radius">The radius of the glow.</param>
         /// <param name="options">The options effecting blending and composition.</param>
diff --git a/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
index dc60ffec9..9877f4cc9 100644
--- a/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
@@ -27,6 +27,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <summary>
         /// Initializes a new instance of the <see cref="VignetteProcessor{TPixel}" /> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="color">The color of the vignette.</param>
         /// <param name="radiusX">The x-radius.</param>
         /// <param name="radiusY">The y-radius.</param>
@@ -44,6 +45,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <summary>
         /// Initializes a new instance of the <see cref="VignetteProcessor{TPixel}" /> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="color">The color of the vignette.</param>
         /// <param name="options">The options effecting blending and composition.</param>
         public VignetteProcessor(MemoryManager memoryManager, TPixel color,  GraphicsOptions options)
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs
index c86fe89b7..95fc5ee6d 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs
@@ -162,6 +162,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             /// <summary>
             /// Initializes a new instance of the <see cref="WeightsBuffer"/> class.
             /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
             /// <param name="sourceSize">The size of the source window</param>
             /// <param name="destinationSize">The size of the destination window</param>
             public WeightsBuffer(MemoryManager memoryManager, int sourceSize, int destinationSize)
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.cs
index 6b608d102..3b7ff4b64 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.cs
@@ -21,6 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <summary>
         /// Initializes a new instance of the <see cref="ResamplingWeightedProcessor{TPixel}"/> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="sampler">The sampler to perform the resize operation.</param>
         /// <param name="width">The target width.</param>
         /// <param name="height">The target height.</param>
@@ -40,7 +41,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             this.Height = height;
             this.ResizeRectangle = resizeRectangle;
         }
-        
+
         /// <summary>
         /// Gets the sampler to perform the resize operation.
         /// </summary>
@@ -60,7 +61,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// Gets or sets the resize rectangle.
         /// </summary>
         public Rectangle ResizeRectangle { get; protected set; }
-        
+
         protected MemoryManager MemoryManager { get; }
 
         /// <summary>
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
index 6c4ea7e67..2c0f3f154 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
@@ -23,6 +23,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <summary>
         /// Initializes a new instance of the <see cref="ResizeProcessor{TPixel}"/> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="sampler">The sampler to perform the resize operation.</param>
         /// <param name="width">The target width.</param>
         /// <param name="height">The target height.</param>
@@ -34,6 +35,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <summary>
         /// Initializes a new instance of the <see cref="ResizeProcessor{TPixel}"/> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="sampler">The sampler to perform the resize operation.</param>
         /// <param name="width">The target width.</param>
         /// <param name="height">The target height.</param>

From 3562d9bd8f4dfef8f5cfb413f84b1a78c2b7a95e Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Fri, 12 Jan 2018 18:28:50 +0200
Subject: [PATCH 11/70] - Removing more usages of ArrayPool

---
 ImageSharp.sln.DotSettings                    |  10 +
 .../Processors/FillRegionProcessor.cs         | 127 +++++-----
 .../Common/Extensions/StreamExtensions.cs     |  21 +-
 src/ImageSharp/Formats/Gif/GifDecoderCore.cs  |  14 +-
 src/ImageSharp/Formats/Gif/GifEncoder.cs      |   4 +-
 src/ImageSharp/Formats/Gif/GifEncoderCore.cs  |  18 +-
 src/ImageSharp/Formats/Gif/LzwDecoder.cs      |  27 +-
 src/ImageSharp/Formats/Gif/LzwEncoder.cs      |  19 +-
 .../Jpeg/GolangPort/JpegEncoderCore.cs        |   4 +-
 src/ImageSharp/Formats/Png/PngChunk.cs        |   4 +-
 src/ImageSharp/Formats/Png/PngDecoderCore.cs  |  19 +-
 src/ImageSharp/Formats/Png/PngEncoderCore.cs  |  14 +-
 src/ImageSharp/ImageSharp.csproj              | 236 +++++++++---------
 .../Memory/ArrayPoolMemoryManager.cs          |   8 +-
 src/ImageSharp/Memory/PixelDataPool{T}.cs     |  59 -----
 15 files changed, 258 insertions(+), 326 deletions(-)
 delete mode 100644 src/ImageSharp/Memory/PixelDataPool{T}.cs

diff --git a/ImageSharp.sln.DotSettings b/ImageSharp.sln.DotSettings
index 1839bf2f8..435aad73b 100644
--- a/ImageSharp.sln.DotSettings
+++ b/ImageSharp.sln.DotSettings
@@ -38,10 +38,15 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE_SHIFTED_2</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_EXPR_MEMBER_ARRANGEMENT/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_INITIALIZER_ARRANGEMENT/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_USER_LINEBREAKS/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_EMBEDDED_STATEMENT_ON_SAME_LINE/@EntryValue">ALWAYS</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SIMPLE_EMBEDDED_STATEMENT_STYLE/@EntryValue">ON_SINGLE_LINE</s:String>
@@ -370,8 +375,13 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
index f3e3d0397..d5bc40107 100644
--- a/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
@@ -78,8 +78,6 @@ namespace SixLabors.ImageSharp.Drawing.Processors
                 return; // no effect inside image;
             }
 
-            ArrayPool<float> arrayPool = ArrayPool<float>.Shared;
-
             int maxIntersections = region.MaxIntersections;
             float subpixelCount = 4;
 
@@ -100,101 +98,94 @@ namespace SixLabors.ImageSharp.Drawing.Processors
 
             using (BrushApplicator<TPixel> applicator = this.Brush.CreateApplicator(source, rect, this.Options))
             {
-                float[] buffer = arrayPool.Rent(maxIntersections);
                 int scanlineWidth = maxX - minX;
+                using (var buffer = source.MemoryManager.Allocate<float>(maxIntersections))
                 using (var scanline = source.MemoryManager.Allocate<float>(scanlineWidth))
                 {
-                    try
+                    bool scanlineDirty = true;
+                    for (int y = minY; y < maxY; y++)
                     {
-                        bool scanlineDirty = true;
-                        for (int y = minY; y < maxY; y++)
+                        if (scanlineDirty)
                         {
-                            if (scanlineDirty)
+                            // clear the buffer
+                            for (int x = 0; x < scanlineWidth; x++)
                             {
-                                // clear the buffer
-                                for (int x = 0; x < scanlineWidth; x++)
-                                {
-                                    scanline[x] = 0;
-                                }
-
-                                scanlineDirty = false;
+                                scanline[x] = 0;
                             }
 
-                            float subpixelFraction = 1f / subpixelCount;
-                            float subpixelFractionPoint = subpixelFraction / subpixelCount;
-                            for (float subPixel = (float)y; subPixel < y + 1; subPixel += subpixelFraction)
-                            {
-                                int pointsFound = region.Scan(subPixel + offset, buffer, 0);
-                                if (pointsFound == 0)
-                                {
-                                    // nothing on this line skip
-                                    continue;
-                                }
+                            scanlineDirty = false;
+                        }
 
-                                QuickSort(new Span<float>(buffer, 0, pointsFound));
+                        float subpixelFraction = 1f / subpixelCount;
+                        float subpixelFractionPoint = subpixelFraction / subpixelCount;
+                        for (float subPixel = (float)y; subPixel < y + 1; subPixel += subpixelFraction)
+                        {
+                            int pointsFound = region.Scan(subPixel + offset, buffer.Array, 0);
+                            if (pointsFound == 0)
+                            {
+                                // nothing on this line skip
+                                continue;
+                            }
 
-                                for (int point = 0; point < pointsFound; point += 2)
-                                {
-                                    // points will be paired up
-                                    float scanStart = buffer[point] - minX;
-                                    float scanEnd = buffer[point + 1] - minX;
-                                    int startX = (int)MathF.Floor(scanStart + offset);
-                                    int endX = (int)MathF.Floor(scanEnd + offset);
+                            QuickSort(new Span<float>(buffer.Array, 0, pointsFound));
 
-                                    if (startX >= 0 && startX < scanline.Length)
-                                    {
-                                        for (float x = scanStart; x < startX + 1; x += subpixelFraction)
-                                        {
-                                            scanline[startX] += subpixelFractionPoint;
-                                            scanlineDirty = true;
-                                        }
-                                    }
+                            for (int point = 0; point < pointsFound; point += 2)
+                            {
+                                // points will be paired up
+                                float scanStart = buffer[point] - minX;
+                                float scanEnd = buffer[point + 1] - minX;
+                                int startX = (int)MathF.Floor(scanStart + offset);
+                                int endX = (int)MathF.Floor(scanEnd + offset);
 
-                                    if (endX >= 0 && endX < scanline.Length)
+                                if (startX >= 0 && startX < scanline.Length)
+                                {
+                                    for (float x = scanStart; x < startX + 1; x += subpixelFraction)
                                     {
-                                        for (float x = endX; x < scanEnd; x += subpixelFraction)
-                                        {
-                                            scanline[endX] += subpixelFractionPoint;
-                                            scanlineDirty = true;
-                                        }
+                                        scanline[startX] += subpixelFractionPoint;
+                                        scanlineDirty = true;
                                     }
+                                }
 
-                                    int nextX = startX + 1;
-                                    endX = Math.Min(endX, scanline.Length); // reduce to end to the right edge
-                                    nextX = Math.Max(nextX, 0);
-                                    for (int x = nextX; x < endX; x++)
+                                if (endX >= 0 && endX < scanline.Length)
+                                {
+                                    for (float x = endX; x < scanEnd; x += subpixelFraction)
                                     {
-                                        scanline[x] += subpixelFraction;
+                                        scanline[endX] += subpixelFractionPoint;
                                         scanlineDirty = true;
                                     }
                                 }
+
+                                int nextX = startX + 1;
+                                endX = Math.Min(endX, scanline.Length); // reduce to end to the right edge
+                                nextX = Math.Max(nextX, 0);
+                                for (int x = nextX; x < endX; x++)
+                                {
+                                    scanline[x] += subpixelFraction;
+                                    scanlineDirty = true;
+                                }
                             }
+                        }
 
-                            if (scanlineDirty)
+                        if (scanlineDirty)
+                        {
+                            if (!this.Options.Antialias)
                             {
-                                if (!this.Options.Antialias)
+                                for (int x = 0; x < scanlineWidth; x++)
                                 {
-                                    for (int x = 0; x < scanlineWidth; x++)
+                                    if (scanline[x] >= 0.5)
+                                    {
+                                        scanline[x] = 1;
+                                    }
+                                    else
                                     {
-                                        if (scanline[x] >= 0.5)
-                                        {
-                                            scanline[x] = 1;
-                                        }
-                                        else
-                                        {
-                                            scanline[x] = 0;
-                                        }
+                                        scanline[x] = 0;
                                     }
                                 }
-
-                                applicator.Apply(scanline, minX, y);
                             }
+
+                            applicator.Apply(scanline, minX, y);
                         }
                     }
-                    finally
-                    {
-                        arrayPool.Return(buffer);
-                    }
                 }
             }
         }
diff --git a/src/ImageSharp/Common/Extensions/StreamExtensions.cs b/src/ImageSharp/Common/Extensions/StreamExtensions.cs
index b717abab1..7a9a34ac1 100644
--- a/src/ImageSharp/Common/Extensions/StreamExtensions.cs
+++ b/src/ImageSharp/Common/Extensions/StreamExtensions.cs
@@ -29,23 +29,16 @@ namespace SixLabors.ImageSharp
             }
             else
             {
-                byte[] foo = ArrayPool<byte>.Shared.Rent(count);
-                try
+                byte[] foo = new byte[count];
+                while (count > 0)
                 {
-                    while (count > 0)
+                    int bytesRead = stream.Read(foo, 0, count);
+                    if (bytesRead == 0)
                     {
-                        int bytesRead = stream.Read(foo, 0, count);
-                        if (bytesRead == 0)
-                        {
-                            break;
-                        }
-
-                        count -= bytesRead;
+                        break;
                     }
-                }
-                finally
-                {
-                    ArrayPool<byte>.Shared.Return(foo);
+
+                    count -= bytesRead;
                 }
             }
         }
diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
index 51a598bc0..d70d8f29c 100644
--- a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
@@ -290,18 +290,12 @@ namespace SixLabors.ImageSharp.Formats.Gif
                     continue;
                 }
 
-                byte[] commentsBuffer = ArrayPool<byte>.Shared.Rent(length);
-
-                try
+                using (Buffer<byte> commentsBuffer = this.configuration.MemoryManager.Allocate<byte>(length))
                 {
-                    this.currentStream.Read(commentsBuffer, 0, length);
-                    string comments = this.TextEncoding.GetString(commentsBuffer, 0, length);
+                    this.currentStream.Read(commentsBuffer.Array, 0, length);
+                    string comments = this.TextEncoding.GetString(commentsBuffer.Array, 0, length);
                     this.metaData.Properties.Add(new ImageProperty(GifConstants.Comments, comments));
                 }
-                finally
-                {
-                    ArrayPool<byte>.Shared.Return(commentsBuffer);
-                }
             }
         }
 
@@ -348,7 +342,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
         private void ReadFrameIndices(GifImageDescriptor imageDescriptor, Span<byte> indices)
         {
             int dataSize = this.currentStream.ReadByte();
-            using (var lzwDecoder = new LzwDecoder(this.currentStream))
+            using (var lzwDecoder = new LzwDecoder(this.configuration.MemoryManager, this.currentStream))
             {
                 lzwDecoder.DecodePixels(imageDescriptor.Width, imageDescriptor.Height, dataSize, indices);
             }
diff --git a/src/ImageSharp/Formats/Gif/GifEncoder.cs b/src/ImageSharp/Formats/Gif/GifEncoder.cs
index ccf46a17d..b548098be 100644
--- a/src/ImageSharp/Formats/Gif/GifEncoder.cs
+++ b/src/ImageSharp/Formats/Gif/GifEncoder.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+
+using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Quantizers;
 
@@ -44,7 +46,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
         public void Encode<TPixel>(Image<TPixel> image, Stream stream)
             where TPixel : struct, IPixel<TPixel>
         {
-            var encoder = new GifEncoderCore(this);
+            var encoder = new GifEncoderCore(image.GetConfiguration().MemoryManager, this);
             encoder.Encode(image, stream);
         }
     }
diff --git a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
index 41c8e944d..43d48605c 100644
--- a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using SixLabors.ImageSharp.IO;
+using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Quantizers;
@@ -18,6 +19,8 @@ namespace SixLabors.ImageSharp.Formats.Gif
     /// </summary>
     internal sealed class GifEncoderCore
     {
+        private readonly MemoryManager memoryManager;
+
         /// <summary>
         /// The temp buffer used to reduce allocations.
         /// </summary>
@@ -61,9 +64,11 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <summary>
         /// Initializes a new instance of the <see cref="GifEncoderCore"/> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="options">The options for the encoder.</param>
-        public GifEncoderCore(IGifEncoderOptions options)
+        public GifEncoderCore(MemoryManager memoryManager, IGifEncoderOptions options)
         {
+            this.memoryManager = memoryManager;
             this.textEncoding = options.TextEncoding ?? GifConstants.DefaultEncoding;
 
             this.quantizer = options.Quantizer;
@@ -350,9 +355,8 @@ namespace SixLabors.ImageSharp.Formats.Gif
 
             // Get max colors for bit depth.
             int colorTableLength = (int)Math.Pow(2, this.bitDepth) * 3;
-            byte[] colorTable = ArrayPool<byte>.Shared.Rent(colorTableLength);
             var rgb = default(Rgb24);
-            try
+            using (Buffer<byte> colorTable = this.memoryManager.Allocate<byte>(colorTableLength))
             {
                 for (int i = 0; i < pixelCount; i++)
                 {
@@ -363,11 +367,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
                     colorTable[offset + 2] = rgb.B;
                 }
 
-                writer.Write(colorTable, 0, colorTableLength);
-            }
-            finally
-            {
-                ArrayPool<byte>.Shared.Return(colorTable);
+                writer.Write(colorTable.Array, 0, colorTableLength);
             }
         }
 
@@ -380,7 +380,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
         private void WriteImageData<TPixel>(QuantizedImage<TPixel> image, EndianBinaryWriter writer)
             where TPixel : struct, IPixel<TPixel>
         {
-            using (var encoder = new LzwEncoder(image.Pixels, (byte)this.bitDepth))
+            using (var encoder = new LzwEncoder(this.memoryManager, image.Pixels, (byte)this.bitDepth))
             {
                 encoder.Encode(writer.BaseStream);
             }
diff --git a/src/ImageSharp/Formats/Gif/LzwDecoder.cs b/src/ImageSharp/Formats/Gif/LzwDecoder.cs
index 3284dad65..b28857e57 100644
--- a/src/ImageSharp/Formats/Gif/LzwDecoder.cs
+++ b/src/ImageSharp/Formats/Gif/LzwDecoder.cs
@@ -5,6 +5,8 @@ using System;
 using System.Buffers;
 using System.IO;
 
+using SixLabors.ImageSharp.Memory;
+
 namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
@@ -30,17 +32,17 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <summary>
         /// The prefix buffer.
         /// </summary>
-        private readonly int[] prefix;
+        private readonly Buffer<int> prefix;
 
         /// <summary>
         /// The suffix buffer.
         /// </summary>
-        private readonly int[] suffix;
+        private readonly Buffer<int> suffix;
 
         /// <summary>
         /// The pixel stack buffer.
         /// </summary>
-        private readonly int[] pixelStack;
+        private readonly Buffer<int> pixelStack;
 
         /// <summary>
         /// A value indicating whether this instance of the given entity has been disposed.
@@ -59,21 +61,18 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// Initializes a new instance of the <see cref="LzwDecoder"/> class
         /// and sets the stream, where the compressed data should be read from.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="stream">The stream to read from.</param>
         /// <exception cref="System.ArgumentNullException"><paramref name="stream"/> is null.</exception>
-        public LzwDecoder(Stream stream)
+        public LzwDecoder(MemoryManager memoryManager, Stream stream)
         {
             Guard.NotNull(stream, nameof(stream));
 
             this.stream = stream;
 
-            this.prefix = ArrayPool<int>.Shared.Rent(MaxStackSize);
-            this.suffix = ArrayPool<int>.Shared.Rent(MaxStackSize);
-            this.pixelStack = ArrayPool<int>.Shared.Rent(MaxStackSize + 1);
-
-            Array.Clear(this.prefix, 0, MaxStackSize);
-            Array.Clear(this.suffix, 0, MaxStackSize);
-            Array.Clear(this.pixelStack, 0, MaxStackSize + 1);
+            this.prefix = memoryManager.Allocate<int>(MaxStackSize, true);
+            this.suffix = memoryManager.Allocate<int>(MaxStackSize, true);
+            this.pixelStack = memoryManager.Allocate<int>(MaxStackSize + 1, true);
         }
 
         /// <summary>
@@ -262,9 +261,9 @@ namespace SixLabors.ImageSharp.Formats.Gif
 
             if (disposing)
             {
-                ArrayPool<int>.Shared.Return(this.prefix);
-                ArrayPool<int>.Shared.Return(this.suffix);
-                ArrayPool<int>.Shared.Return(this.pixelStack);
+                this.prefix?.Dispose();
+                this.suffix?.Dispose();
+                this.pixelStack?.Dispose();
             }
 
             this.isDisposed = true;
diff --git a/src/ImageSharp/Formats/Gif/LzwEncoder.cs b/src/ImageSharp/Formats/Gif/LzwEncoder.cs
index b7bfd0fd2..2ecd229b5 100644
--- a/src/ImageSharp/Formats/Gif/LzwEncoder.cs
+++ b/src/ImageSharp/Formats/Gif/LzwEncoder.cs
@@ -5,6 +5,8 @@ using System;
 using System.Buffers;
 using System.IO;
 
+using SixLabors.ImageSharp.Memory;
+
 namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
@@ -69,12 +71,12 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <summary>
         /// The hash table.
         /// </summary>
-        private readonly int[] hashTable;
+        private readonly Buffer<int> hashTable;
 
         /// <summary>
         /// The code table.
         /// </summary>
-        private readonly int[] codeTable;
+        private readonly Buffer<int> codeTable;
 
         /// <summary>
         /// Define the storage for the packet accumulator.
@@ -189,17 +191,16 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <summary>
         /// Initializes a new instance of the <see cref="LzwEncoder"/> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="indexedPixels">The array of indexed pixels.</param>
         /// <param name="colorDepth">The color depth in bits.</param>
-        public LzwEncoder(byte[] indexedPixels, int colorDepth)
+        public LzwEncoder(MemoryManager memoryManager, byte[] indexedPixels, int colorDepth)
         {
             this.pixelArray = indexedPixels;
             this.initialCodeSize = Math.Max(2, colorDepth);
 
-            this.hashTable = ArrayPool<int>.Shared.Rent(HashSize);
-            this.codeTable = ArrayPool<int>.Shared.Rent(HashSize);
-            Array.Clear(this.hashTable, 0, HashSize);
-            Array.Clear(this.codeTable, 0, HashSize);
+            this.hashTable = memoryManager.Allocate<int>(HashSize, true);
+            this.codeTable = memoryManager.Allocate<int>(HashSize, true);
         }
 
         /// <summary>
@@ -483,8 +484,8 @@ namespace SixLabors.ImageSharp.Formats.Gif
 
             if (disposing)
             {
-                ArrayPool<int>.Shared.Return(this.hashTable);
-                ArrayPool<int>.Shared.Return(this.codeTable);
+                this.hashTable?.Dispose();
+                this.codeTable?.Dispose();
             }
 
             this.isDisposed = true;
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
index 2912a8719..4a9ddf353 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
@@ -8,6 +8,7 @@ using SixLabors.ImageSharp.Formats.Jpeg.Common;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Utils;
+using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.MetaData.Profiles.Icc;
 using SixLabors.ImageSharp.PixelFormats;
@@ -657,14 +658,13 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
             // Loop through and collect the tables as one array.
             // This allows us to reduce the number of writes to the stream.
             int dqtCount = (QuantizationTableCount * Block8x8F.Size) + QuantizationTableCount;
-            byte[] dqt = ArrayPool<byte>.Shared.Rent(dqtCount);
+            byte[] dqt = new byte[dqtCount];
             int offset = 0;
 
             WriteDataToDqt(dqt, ref offset, QuantIndex.Luminance, ref this.luminanceQuantTable);
             WriteDataToDqt(dqt, ref offset, QuantIndex.Chrominance, ref this.chrominanceQuantTable);
 
             this.outputStream.Write(dqt, 0, dqtCount);
-            ArrayPool<byte>.Shared.Return(dqt);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Formats/Png/PngChunk.cs b/src/ImageSharp/Formats/Png/PngChunk.cs
index f90def5b3..7412fdfcd 100644
--- a/src/ImageSharp/Formats/Png/PngChunk.cs
+++ b/src/ImageSharp/Formats/Png/PngChunk.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using SixLabors.ImageSharp.Memory;
+
 namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
@@ -25,7 +27,7 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// Gets or sets the data bytes appropriate to the chunk type, if any.
         /// This field can be of zero length.
         /// </summary>
-        public byte[] Data { get; set; }
+        public Buffer<byte> Data { get; set; }
 
         /// <summary>
         /// Gets or sets a CRC (Cyclic Redundancy Check) calculated on the preceding bytes in the chunk,
diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index 7e354b58b..2a5f5fabe 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -223,11 +223,11 @@ namespace SixLabors.ImageSharp.Formats.Png
                             switch (currentChunk.Type)
                             {
                                 case PngChunkTypes.Header:
-                                    this.ReadHeaderChunk(currentChunk.Data);
+                                    this.ReadHeaderChunk(currentChunk.Data.Array);
                                     this.ValidateHeader();
                                     break;
                                 case PngChunkTypes.Physical:
-                                    this.ReadPhysicalChunk(metadata, currentChunk.Data);
+                                    this.ReadPhysicalChunk(metadata, currentChunk.Data.Array);
                                     break;
                                 case PngChunkTypes.Data:
                                     if (image == null)
@@ -241,17 +241,17 @@ namespace SixLabors.ImageSharp.Formats.Png
                                     break;
                                 case PngChunkTypes.Palette:
                                     byte[] pal = new byte[currentChunk.Length];
-                                    Buffer.BlockCopy(currentChunk.Data, 0, pal, 0, currentChunk.Length);
+                                    Buffer.BlockCopy(currentChunk.Data.Array, 0, pal, 0, currentChunk.Length);
                                     this.palette = pal;
                                     break;
                                 case PngChunkTypes.PaletteAlpha:
                                     byte[] alpha = new byte[currentChunk.Length];
-                                    Buffer.BlockCopy(currentChunk.Data, 0, alpha, 0, currentChunk.Length);
+                                    Buffer.BlockCopy(currentChunk.Data.Array, 0, alpha, 0, currentChunk.Length);
                                     this.paletteAlpha = alpha;
                                     this.AssignTransparentMarkers(alpha);
                                     break;
                                 case PngChunkTypes.Text:
-                                    this.ReadTextChunk(metadata, currentChunk.Data, currentChunk.Length);
+                                    this.ReadTextChunk(metadata, currentChunk.Data.Array, currentChunk.Length);
                                     break;
                                 case PngChunkTypes.End:
                                     this.isEndChunkReached = true;
@@ -263,7 +263,8 @@ namespace SixLabors.ImageSharp.Formats.Png
                             // Data is rented in ReadChunkData()
                             if (currentChunk.Data != null)
                             {
-                                ArrayPool<byte>.Shared.Return(currentChunk.Data);
+                                currentChunk.Data.Dispose();
+                                currentChunk.Data = null;
                             }
                         }
                     }
@@ -1173,7 +1174,7 @@ namespace SixLabors.ImageSharp.Formats.Png
 
             this.crc.Reset();
             this.crc.Update(this.chunkTypeBuffer);
-            this.crc.Update(chunk.Data, 0, chunk.Length);
+            this.crc.Update(chunk.Data.Array, 0, chunk.Length);
 
             if (this.crc.Value != chunk.Crc && IsCriticalChunk(chunk))
             {
@@ -1188,8 +1189,8 @@ namespace SixLabors.ImageSharp.Formats.Png
         private void ReadChunkData(PngChunk chunk)
         {
             // We rent the buffer here to return it afterwards in Decode()
-            chunk.Data = ArrayPool<byte>.Shared.Rent(chunk.Length);
-            this.currentStream.Read(chunk.Data, 0, chunk.Length);
+            chunk.Data = this.configuration.MemoryManager.Allocate<byte>(chunk.Length);
+            this.currentStream.Read(chunk.Data.Array, 0, chunk.Length);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
index 327ce9fdf..d6adaae42 100644
--- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
@@ -521,11 +521,10 @@ namespace SixLabors.ImageSharp.Formats.Png
 
             // Get max colors for bit depth.
             int colorTableLength = (int)Math.Pow(2, header.BitDepth) * 3;
-            byte[] colorTable = ArrayPool<byte>.Shared.Rent(colorTableLength);
-            byte[] alphaTable = ArrayPool<byte>.Shared.Rent(pixelCount);
             var rgba = default(Rgba32);
             bool anyAlpha = false;
-            try
+            using (Buffer<byte> colorTable = this.memoryManager.Allocate<byte>(colorTableLength))
+            using (Buffer<byte> alphaTable = this.memoryManager.Allocate<byte>(pixelCount))
             {
                 for (byte i = 0; i < pixelCount; i++)
                 {
@@ -550,19 +549,14 @@ namespace SixLabors.ImageSharp.Formats.Png
                     }
                 }
 
-                this.WriteChunk(stream, PngChunkTypes.Palette, colorTable, 0, colorTableLength);
+                this.WriteChunk(stream, PngChunkTypes.Palette, colorTable.Array, 0, colorTableLength);
 
                 // Write the transparency data
                 if (anyAlpha)
                 {
-                    this.WriteChunk(stream, PngChunkTypes.PaletteAlpha, alphaTable, 0, pixelCount);
+                    this.WriteChunk(stream, PngChunkTypes.PaletteAlpha, alphaTable.Array, 0, pixelCount);
                 }
             }
-            finally
-            {
-                ArrayPool<byte>.Shared.Return(colorTable);
-                ArrayPool<byte>.Shared.Return(alphaTable);
-            }
 
             return quantized;
         }
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
index 8c22237cf..1d22e59cb 100644
--- a/src/ImageSharp/ImageSharp.csproj
+++ b/src/ImageSharp/ImageSharp.csproj
@@ -1,120 +1,120 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <Description>A cross-platform library for the processing of image files; written in C#</Description>
-        <AssemblyTitle>SixLabors.ImageSharp</AssemblyTitle>
-        <VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
-        <VersionPrefix Condition="$(packageversion) == ''">0.0.1</VersionPrefix>
-        <Authors>Six Labors and contributors</Authors>
-        <TargetFrameworks>netstandard1.1;netstandard1.3;netstandard2.0</TargetFrameworks>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <AssemblyName>SixLabors.ImageSharp</AssemblyName>
-        <PackageId>SixLabors.ImageSharp</PackageId>
-        <PackageTags>Image Resize Crop Gif Jpg Jpeg Bitmap Png Core</PackageTags>
-        <PackageIconUrl>https://raw.githubusercontent.com/SixLabors/ImageSharp/master/build/icons/imagesharp-logo-128.png</PackageIconUrl>
-        <PackageProjectUrl>https://github.com/SixLabors/ImageSharp</PackageProjectUrl>
-        <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
-        <RepositoryType>git</RepositoryType>
-        <RepositoryUrl>https://github.com/SixLabors/ImageSharp</RepositoryUrl>
-        <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-        <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-        <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-        <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-        <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-        <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
-        <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-        <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-        <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-        <DebugType Condition="$(codecov) != ''">full</DebugType>
-        <DebugType Condition="$(codecov) == ''">portable</DebugType>
-        <DebugSymbols>True</DebugSymbols>
-        <Features>IOperation</Features>
-    </PropertyGroup>
-    <ItemGroup>
-        <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="SixLabors.Core" Version="1.0.0-beta0004" />
-        <AdditionalFiles Include="..\..\stylecop.json" />
-        <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
-            <PrivateAssets>All</PrivateAssets>
-        </PackageReference>
-        <PackageReference Include="System.Buffers" Version="4.4.0" />
-        <PackageReference Include="System.Memory" Version="4.4.0-preview2-25405-01" />
-        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.4.0" />
-    </ItemGroup>
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard1.3'">
-        <PackageReference Include="System.IO.Compression" Version="4.3.0" />
-        <PackageReference Include="System.Numerics.Vectors" Version="4.4.0" />
-        <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
-        <PackageReference Include="System.ValueTuple" Version="4.4.0" />
-    </ItemGroup>
-    <PropertyGroup>
-        <CodeAnalysisRuleSet>..\..\ImageSharp.ruleset</CodeAnalysisRuleSet>
-        <RootNamespace>SixLabors.ImageSharp</RootNamespace>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    </PropertyGroup>
-    <ItemGroup>
-        <None Update="Formats\Jpeg\Common\Block8x8F.Generated.tt">
-            <Generator>TextTemplatingFileGenerator</Generator>
-            <LastGenOutput>Block8x8F.Generated.cs</LastGenOutput>
-        </None>
-        <None Update="Formats\Jpeg\Components\Block8x8F.Generated.tt">
-            <Generator>TextTemplatingFileGenerator</Generator>
-            <LastGenOutput>Block8x8F.Generated.cs</LastGenOutput>
-        </None>
-        <None Update="PixelFormats\Generated\PixelOperations{TPixel}.Generated.tt">
-            <Generator>TextTemplatingFileGenerator</Generator>
-            <LastGenOutput>PixelOperations{TPixel}.Generated.cs</LastGenOutput>
-        </None>
-        <None Update="PixelFormats\Generated\Rgba32.PixelOperations.Generated.tt">
-            <Generator>TextTemplatingFileGenerator</Generator>
-            <LastGenOutput>Rgba32.PixelOperations.Generated.cs</LastGenOutput>
-        </None>
-        <None Update="PixelFormats\PixelBlenders\PorterDuffFunctions.Generated.tt">
-            <LastGenOutput>PorterDuffFunctions.Generated.cs</LastGenOutput>
-            <Generator>TextTemplatingFileGenerator</Generator>
-        </None>
-        <None Update="PixelFormats\PixelBlenders\DefaultPixelBlenders.Generated.tt">
-            <LastGenOutput>DefaultPixelBlenders.Generated.cs</LastGenOutput>
-            <Generator>TextTemplatingFileGenerator</Generator>
-        </None>
-    </ItemGroup>
-    <ItemGroup>
-        <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Update="Formats\Jpeg\Common\Block8x8F.Generated.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Block8x8F.Generated.tt</DependentUpon>
-        </Compile>
-        <Compile Update="Formats\Jpeg\Components\Block8x8F.Generated.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Block8x8F.Generated.tt</DependentUpon>
-        </Compile>
-        <Compile Update="PixelFormats\Generated\PixelOperations{TPixel}.Generated.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>PixelOperations{TPixel}.Generated.tt</DependentUpon>
-        </Compile>
-        <Compile Update="PixelFormats\Generated\Rgba32.PixelOperations.Generated.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Rgba32.PixelOperations.Generated.tt</DependentUpon>
-        </Compile>
-        <Compile Update="PixelFormats\PixelBlenders\DefaultPixelBlenders.Generated.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>DefaultPixelBlenders.Generated.tt</DependentUpon>
-        </Compile>
-        <Compile Update="PixelFormats\PixelBlenders\PorterDuffFunctions.Generated.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>PorterDuffFunctions.Generated.tt</DependentUpon>
-        </Compile>
-    </ItemGroup>
+  <PropertyGroup>
+    <Description>A cross-platform library for the processing of image files; written in C#</Description>
+    <AssemblyTitle>SixLabors.ImageSharp</AssemblyTitle>
+    <VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
+    <VersionPrefix Condition="$(packageversion) == ''">0.0.1</VersionPrefix>
+    <Authors>Six Labors and contributors</Authors>
+    <TargetFrameworks>netstandard1.1;netstandard1.3;netstandard2.0</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>SixLabors.ImageSharp</AssemblyName>
+    <PackageId>SixLabors.ImageSharp</PackageId>
+    <PackageTags>Image Resize Crop Gif Jpg Jpeg Bitmap Png Core</PackageTags>
+    <PackageIconUrl>https://raw.githubusercontent.com/SixLabors/ImageSharp/master/build/icons/imagesharp-logo-128.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/SixLabors/ImageSharp</PackageProjectUrl>
+    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/SixLabors/ImageSharp</RepositoryUrl>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+    <DebugType Condition="$(codecov) != ''">full</DebugType>
+    <DebugType Condition="$(codecov) == ''">portable</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+    <Features>IOperation</Features>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="SixLabors.Core" Version="1.0.0-beta0004" />
+    <AdditionalFiles Include="..\..\stylecop.json" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="System.Buffers" Version="4.4.0" />
+    <PackageReference Include="System.Memory" Version="4.4.0-preview2-25405-01" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.4.0" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard1.3'">
+    <PackageReference Include="System.IO.Compression" Version="4.3.0" />
+    <PackageReference Include="System.Numerics.Vectors" Version="4.4.0" />
+    <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
+  </ItemGroup>
+  <PropertyGroup>
+    <CodeAnalysisRuleSet>..\..\ImageSharp.ruleset</CodeAnalysisRuleSet>
+    <RootNamespace>SixLabors.ImageSharp</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Update="Formats\Jpeg\Common\Block8x8F.Generated.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>Block8x8F.Generated.cs</LastGenOutput>
+    </None>
+    <None Update="Formats\Jpeg\Components\Block8x8F.Generated.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>Block8x8F.Generated.cs</LastGenOutput>
+    </None>
+    <None Update="PixelFormats\Generated\PixelOperations{TPixel}.Generated.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>PixelOperations{TPixel}.Generated.cs</LastGenOutput>
+    </None>
+    <None Update="PixelFormats\Generated\Rgba32.PixelOperations.Generated.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>Rgba32.PixelOperations.Generated.cs</LastGenOutput>
+    </None>
+    <None Update="PixelFormats\PixelBlenders\PorterDuffFunctions.Generated.tt">
+      <LastGenOutput>PorterDuffFunctions.Generated.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
+    <None Update="PixelFormats\PixelBlenders\DefaultPixelBlenders.Generated.tt">
+      <LastGenOutput>DefaultPixelBlenders.Generated.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Formats\Jpeg\Common\Block8x8F.Generated.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Block8x8F.Generated.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Formats\Jpeg\Components\Block8x8F.Generated.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Block8x8F.Generated.tt</DependentUpon>
+    </Compile>
+    <Compile Update="PixelFormats\Generated\PixelOperations{TPixel}.Generated.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>PixelOperations{TPixel}.Generated.tt</DependentUpon>
+    </Compile>
+    <Compile Update="PixelFormats\Generated\Rgba32.PixelOperations.Generated.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Rgba32.PixelOperations.Generated.tt</DependentUpon>
+    </Compile>
+    <Compile Update="PixelFormats\PixelBlenders\DefaultPixelBlenders.Generated.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>DefaultPixelBlenders.Generated.tt</DependentUpon>
+    </Compile>
+    <Compile Update="PixelFormats\PixelBlenders\PorterDuffFunctions.Generated.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>PorterDuffFunctions.Generated.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index d83e3ca3e..3e5628c75 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -1,4 +1,5 @@
-using System.Buffers;
+using System;
+using System.Buffers;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -36,7 +37,10 @@ namespace SixLabors.ImageSharp.Memory
 
             if (this.minSizeBytes > 0 && bufferSizeInBytes < this.minSizeBytes)
             {
-                return new Buffer<T>(new T[itemCount], itemCount);
+                // Minimum size set to 8 bytes to get past a misbehaving test
+                // (otherwise PngDecoderTests.Decode_IncorrectCRCForNonCriticalChunk_ExceptionIsThrown fails for the wrong reason)
+                // TODO: Remove this once the test is fixed
+                return new Buffer<T>(new T[Math.Max(itemCount, 8)], itemCount);
             }
 
             byte[] byteBuffer = this.pool.Rent(bufferSizeInBytes);
diff --git a/src/ImageSharp/Memory/PixelDataPool{T}.cs b/src/ImageSharp/Memory/PixelDataPool{T}.cs
deleted file mode 100644
index 6f4cef707..000000000
--- a/src/ImageSharp/Memory/PixelDataPool{T}.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.Buffers;
-using SixLabors.ImageSharp.PixelFormats;
-
-namespace SixLabors.ImageSharp.Memory
-{
-    /// <summary>
-    /// Provides a resource pool that enables reusing instances of value type arrays for image data <see cref="T:T[]"/>.
-    /// </summary>
-    /// <typeparam name="T">The value type.</typeparam>
-    internal class PixelDataPool<T>
-        where T : struct
-    {
-        /// <summary>
-        /// The <see cref="ArrayPool{T}"/> which is not kept clean.
-        /// </summary>
-        private static readonly ArrayPool<T> ArrayPool = ArrayPool<T>.Create(CalculateMaxArrayLength(), 50);
-
-        /// <summary>
-        /// Rents the pixel array from the pool.
-        /// </summary>
-        /// <param name="minimumLength">The minimum length of the array to return.</param>
-        /// <returns>The <see cref="T:TPixel[]"/></returns>
-        public static T[] Rent(int minimumLength)
-        {
-            return ArrayPool.Rent(minimumLength);
-        }
-
-        /// <summary>
-        /// Returns the rented pixel array back to the pool.
-        /// </summary>
-        /// <param name="array">The array to return to the buffer pool.</param>
-        public static void Return(T[] array)
-        {
-            ArrayPool.Return(array);
-        }
-
-        /// <summary>
-        /// Heuristically calculates a reasonable maxArrayLength value for the backing <see cref="ArrayPool{T}"/>.
-        /// </summary>
-        /// <returns>The maxArrayLength value</returns>
-        internal static int CalculateMaxArrayLength()
-        {
-            // ReSharper disable once SuspiciousTypeConversion.Global
-            if (default(T) is IPixel)
-            {
-                const int MaximumExpectedImageSize = 16384 * 16384;
-                return MaximumExpectedImageSize;
-            }
-            else
-            {
-                const int MaxArrayLength = 1024 * 1024; // Match default pool.
-                return MaxArrayLength;
-            }
-        }
-    }
-}
\ No newline at end of file

From 4f9062ee670ea0d44f80f7349849050373c53d30 Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Fri, 12 Jan 2018 20:20:02 +0200
Subject: [PATCH 12/70] - Remove ArrayPool from Huffman tree

---
 .../Components/Decoder/OrigHuffmanTree.cs     | 46 ++++---------------
 .../Jpeg/GolangPort/OrigJpegDecoderCore.cs    |  5 --
 2 files changed, 10 insertions(+), 41 deletions(-)

diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs
index 4c97d5741..e96421a2d 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs
@@ -9,7 +9,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
     /// <summary>
     /// Represents a Huffman tree
     /// </summary>
-    internal struct OrigHuffmanTree : IDisposable
+    internal struct OrigHuffmanTree
     {
         /// <summary>
         /// The index of the AC table row
@@ -91,12 +91,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// </summary>
         public int[] Indices;
 
-        private static readonly ArrayPool<int> IntPool256 = ArrayPool<int>.Create(MaxNCodes, 50);
-
-        private static readonly ArrayPool<byte> BytePool256 = ArrayPool<byte>.Create(MaxNCodes, 50);
-
-        private static readonly ArrayPool<int> CodesPool16 = ArrayPool<int>.Create(MaxCodeLength, 50);
-
         /// <summary>
         /// Creates and initializes an array of <see cref="OrigHuffmanTree" /> instances of size <see cref="NumberOfTrees" />
         /// </summary>
@@ -115,18 +109,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
             return result;
         }
 
-        /// <summary>
-        /// Disposes the underlying buffers
-        /// </summary>
-        public void Dispose()
-        {
-            IntPool256.Return(this.Lut, true);
-            IntPool256.Return(this.Values, true);
-            CodesPool16.Return(this.MinCodes, true);
-            CodesPool16.Return(this.MaxCodes, true);
-            CodesPool16.Return(this.Indices, true);
-        }
-
         /// <summary>
         /// Internal part of the DHT processor, whatever does it mean
         /// </summary>
@@ -166,20 +148,12 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                 throw new ImageFormatException("DHT has wrong length");
             }
 
-            byte[] values = null;
-            try
-            {
-                values = BytePool256.Rent(MaxNCodes);
-                inputProcessor.ReadFull(values, 0, this.Length);
+            byte[] values = new byte[MaxNCodes];
+            inputProcessor.ReadFull(values, 0, this.Length);
 
-                for (int i = 0; i < values.Length; i++)
-                {
-                    this.Values[i] = values[i];
-                }
-            }
-            finally
+            for (int i = 0; i < values.Length; i++)
             {
-                BytePool256.Return(values, true);
+                this.Values[i] = values[i];
             }
 
             // Derive the look-up table.
@@ -254,11 +228,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// </summary>
         private void Init()
         {
-            this.Lut = IntPool256.Rent(MaxNCodes);
-            this.Values = IntPool256.Rent(MaxNCodes);
-            this.MinCodes = CodesPool16.Rent(MaxCodeLength);
-            this.MaxCodes = CodesPool16.Rent(MaxCodeLength);
-            this.Indices = CodesPool16.Rent(MaxCodeLength);
+            this.Lut = new int[MaxNCodes];
+            this.Values = new int[MaxNCodes];
+            this.MinCodes = new int[MaxCodeLength];
+            this.MaxCodes = new int[MaxCodeLength];
+            this.Indices = new int[MaxCodeLength];
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
index 053b016e6..0a0ddeba4 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
@@ -190,11 +190,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
         /// <inheritdoc />
         public void Dispose()
         {
-            for (int i = 0; i < this.HuffmanTrees.Length; i++)
-            {
-                this.HuffmanTrees[i].Dispose();
-            }
-
             if (this.Components != null)
             {
                 foreach (OrigComponent component in this.Components)

From 15521be1c3dd52233c8bad6ae8dc61688f553abb Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Fri, 12 Jan 2018 21:02:37 +0200
Subject: [PATCH 13/70] - Use fixed buffers in Huffman table

---
 .../Components/Decoder/InputProcessor.cs      |   4 +-
 .../Components/Decoder/OrigHuffmanTree.cs     | 154 ++++++++++--------
 2 files changed, 85 insertions(+), 73 deletions(-)

diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
index a7a5fcd98..5aa0fa309 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
@@ -220,7 +220,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                 if (this.LastErrorCode == OrigDecoderErrorCode.NoError)
                 {
                     int lutIndex = (this.Bits.Accumulator >> (this.Bits.UnreadBits - OrigHuffmanTree.LutSizeLog2)) & 0xFF;
-                    int v = huffmanTree.Lut[lutIndex];
+                    int v = huffmanTree.ReadLut(lutIndex);
 
                     if (v != 0)
                     {
@@ -259,7 +259,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                 this.Bits.UnreadBits--;
                 this.Bits.Mask >>= 1;
 
-                if (code <= huffmanTree.MaxCodes[i])
+                if (code <= huffmanTree.GetMaxCode(i))
                 {
                     result = huffmanTree.GetValue(code, i);
                     return this.LastErrorCode = OrigDecoderErrorCode.NoError;
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs
index e96421a2d..f773a12df 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs
@@ -3,13 +3,14 @@
 
 using System;
 using System.Buffers;
+using System.Runtime.CompilerServices;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     /// <summary>
     /// Represents a Huffman tree
     /// </summary>
-    internal struct OrigHuffmanTree
+    internal unsafe struct OrigHuffmanTree
     {
         /// <summary>
         /// The index of the AC table row
@@ -67,29 +68,29 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// are 1 plus the code length, or 0 if the value is too large to fit in
         /// lutSize bits.
         /// </summary>
-        public int[] Lut;
+        public fixed int Lut[MaxNCodes];
 
         /// <summary>
         /// Gets the the decoded values, sorted by their encoding.
         /// </summary>
-        public int[] Values;
+        public fixed int Values[MaxNCodes];
 
         /// <summary>
         /// Gets the array of minimum codes.
         /// MinCodes[i] is the minimum code of length i, or -1 if there are no codes of that length.
         /// </summary>
-        public int[] MinCodes;
+        public fixed int MinCodes[MaxCodeLength];
 
         /// <summary>
         /// Gets the array of maximum codes.
         /// MaxCodes[i] is the maximum code of length i, or -1 if there are no codes of that length.
         /// </summary>
-        public int[] MaxCodes;
+        public fixed int MaxCodes[MaxCodeLength];
 
         /// <summary>
         /// Gets the array of indices. Indices[i] is the index into Values of MinCodes[i].
         /// </summary>
-        public int[] Indices;
+        public fixed int Indices[MaxCodeLength];
 
         /// <summary>
         /// Creates and initializes an array of <see cref="OrigHuffmanTree" /> instances of size <see cref="NumberOfTrees" />
@@ -97,16 +98,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// <returns>An array of <see cref="OrigHuffmanTree" /> instances representing the Huffman tables</returns>
         public static OrigHuffmanTree[] CreateHuffmanTrees()
         {
-            OrigHuffmanTree[] result = new OrigHuffmanTree[NumberOfTrees];
-            for (int i = 0; i < MaxTc + 1; i++)
-            {
-                for (int j = 0; j < MaxTh + 1; j++)
-                {
-                    result[(i * ThRowSize) + j].Init();
-                }
-            }
-
-            return result;
+            return new OrigHuffmanTree[NumberOfTrees];
         }
 
         /// <summary>
@@ -151,64 +143,73 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
             byte[] values = new byte[MaxNCodes];
             inputProcessor.ReadFull(values, 0, this.Length);
 
-            for (int i = 0; i < values.Length; i++)
+            fixed (int* valuesPtr = this.Values)
+            fixed (int* lutPtr = this.Lut)
             {
-                this.Values[i] = values[i];
-            }
-
-            // Derive the look-up table.
-            for (int i = 0; i < this.Lut.Length; i++)
-            {
-                this.Lut[i] = 0;
-            }
+                for (int i = 0; i < values.Length; i++)
+                {
+                    valuesPtr[i] = values[i];
+                }
 
-            int x = 0, code = 0;
+                // Derive the look-up table.
+                for (int i = 0; i < MaxNCodes; i++)
+                {
+                    lutPtr[i] = 0;
+                }
 
-            for (int i = 0; i < LutSizeLog2; i++)
-            {
-                code <<= 1;
+                int x = 0, code = 0;
 
-                for (int j = 0; j < ncodes[i]; j++)
+                for (int i = 0; i < LutSizeLog2; i++)
                 {
-                    // The codeLength is 1+i, so shift code by 8-(1+i) to
-                    // calculate the high bits for every 8-bit sequence
-                    // whose codeLength's high bits matches code.
-                    // The high 8 bits of lutValue are the encoded value.
-                    // The low 8 bits are 1 plus the codeLength.
-                    int base2 = code << (7 - i);
-                    int lutValue = (this.Values[x] << 8) | (2 + i);
-
-                    for (int k = 0; k < 1 << (7 - i); k++)
+                    code <<= 1;
+
+                    for (int j = 0; j < ncodes[i]; j++)
                     {
-                        this.Lut[base2 | k] = lutValue;
+                        // The codeLength is 1+i, so shift code by 8-(1+i) to
+                        // calculate the high bits for every 8-bit sequence
+                        // whose codeLength's high bits matches code.
+                        // The high 8 bits of lutValue are the encoded value.
+                        // The low 8 bits are 1 plus the codeLength.
+                        int base2 = code << (7 - i);
+                        int lutValue = (valuesPtr[x] << 8) | (2 + i);
+
+                        for (int k = 0; k < 1 << (7 - i); k++)
+                        {
+                            lutPtr[base2 | k] = lutValue;
+                        }
+
+                        code++;
+                        x++;
                     }
-
-                    code++;
-                    x++;
                 }
             }
 
-            // Derive minCodes, maxCodes, and indices.
-            int c = 0, index = 0;
-            for (int i = 0; i < ncodes.Length; i++)
+            fixed (int* minCodesPtr = this.MinCodes)
+            fixed (int* maxCodesPtr = this.MaxCodes)
+            fixed (int* indicesPtr = this.Indices)
             {
-                int nc = ncodes[i];
-                if (nc == 0)
-                {
-                    this.MinCodes[i] = -1;
-                    this.MaxCodes[i] = -1;
-                    this.Indices[i] = -1;
-                }
-                else
+                // Derive minCodes, maxCodes, and indices.
+                int c = 0, index = 0;
+                for (int i = 0; i < ncodes.Length; i++)
                 {
-                    this.MinCodes[i] = c;
-                    this.MaxCodes[i] = c + nc - 1;
-                    this.Indices[i] = index;
-                    c += nc;
-                    index += nc;
-                }
+                    int nc = ncodes[i];
+                    if (nc == 0)
+                    {
+                        minCodesPtr[i] = -1;
+                        maxCodesPtr[i] = -1;
+                        indicesPtr[i] = -1;
+                    }
+                    else
+                    {
+                        minCodesPtr[i] = c;
+                        maxCodesPtr[i] = c + nc - 1;
+                        indicesPtr[i] = index;
+                        c += nc;
+                        index += nc;
+                    }
 
-                c <<= 1;
+                    c <<= 1;
+                }
             }
         }
 
@@ -220,19 +221,30 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// <returns>The value</returns>
         public int GetValue(int code, int codeLength)
         {
-            return this.Values[this.Indices[codeLength] + code - this.MinCodes[codeLength]];
+            fixed (int* valuesPtr = this.Values)
+            fixed (int* minCodesPtr = this.MinCodes)
+            fixed (int* indicesPtr = this.Indices)
+            {
+                return valuesPtr[indicesPtr[codeLength] + code - minCodesPtr[codeLength]];
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public int ReadLut(int index)
+        {
+            fixed (int* lutPtr = this.Lut)
+            {
+                return lutPtr[index];
+            }
         }
 
-        /// <summary>
-        /// Initializes the Huffman tree
-        /// </summary>
-        private void Init()
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public int GetMaxCode(int index)
         {
-            this.Lut = new int[MaxNCodes];
-            this.Values = new int[MaxNCodes];
-            this.MinCodes = new int[MaxCodeLength];
-            this.MaxCodes = new int[MaxCodeLength];
-            this.Indices = new int[MaxCodeLength];
+            fixed (int* maxCodesPtr = this.MaxCodes)
+            {
+                return maxCodesPtr[index];
+            }
         }
     }
 }
\ No newline at end of file

From faa8b23d456143a15f021e3f73f6d62f58288d7a Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Sat, 13 Jan 2018 13:48:05 +0200
Subject: [PATCH 14/70] - Use memory manager in Bytes

---
 .../GolangPort/Components/Decoder/Bytes.cs    | 26 ++++++++-----------
 .../Components/Decoder/InputProcessor.cs      | 11 +++++---
 .../Jpeg/GolangPort/OrigJpegDecoderCore.cs    |  2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
index 38507d58c..7c1cd7206 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
@@ -6,6 +6,8 @@ using System.Buffers;
 using System.IO;
 using System.Runtime.CompilerServices;
 
+using SixLabors.ImageSharp.Memory;
+
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     /// <summary>
@@ -25,12 +27,12 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// buffer[i:j] are the buffered bytes read from the underlying
         /// stream that haven't yet been passed further on.
         /// </summary>
-        public byte[] Buffer;
+        public Buffer<byte> Buffer;
 
         /// <summary>
         /// Values of <see cref="Buffer"/> converted to <see cref="int"/>-s
         /// </summary>
-        public int[] BufferAsInt;
+        public Buffer<int> BufferAsInt;
 
         /// <summary>
         /// Start of bytes read
@@ -48,20 +50,17 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// </summary>
         public int UnreadableBytes;
 
-        private static readonly ArrayPool<byte> BytePool = ArrayPool<byte>.Create(BufferSize, 50);
-
-        private static readonly ArrayPool<int> IntPool = ArrayPool<int>.Create(BufferSize, 50);
-
         /// <summary>
         /// Creates a new instance of the <see cref="Bytes"/>, and initializes it's buffer.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <returns>The bytes created</returns>
-        public static Bytes Create()
+        public static Bytes Create(MemoryManager memoryManager)
         {
             return new Bytes
             {
-                Buffer = BytePool.Rent(BufferSize),
-                BufferAsInt = IntPool.Rent(BufferSize)
+                Buffer = memoryManager.Allocate<byte>(BufferSize),
+                BufferAsInt = memoryManager.Allocate<int>(BufferSize)
             };
         }
 
@@ -70,11 +69,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// </summary>
         public void Dispose()
         {
-            if (this.Buffer != null)
-            {
-                BytePool.Return(this.Buffer);
-                IntPool.Return(this.BufferAsInt);
-            }
+            this.Buffer?.Dispose();
+            this.BufferAsInt?.Dispose();
 
             this.Buffer = null;
             this.BufferAsInt = null;
@@ -244,7 +240,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
             }
 
             // Fill in the rest of the buffer.
-            int n = inputStream.Read(this.Buffer, this.J, this.Buffer.Length - this.J);
+            int n = inputStream.Read(this.Buffer.Array, this.J, this.Buffer.Length - this.J);
             if (n == 0)
             {
                 return OrigDecoderErrorCode.UnexpectedEndOfStream;
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
index 5aa0fa309..f06509200 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
@@ -5,6 +5,8 @@ using System;
 using System.IO;
 using System.Runtime.CompilerServices;
 
+using SixLabors.ImageSharp.Memory;
+
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     /// <summary>
@@ -26,12 +28,13 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// <summary>
         /// Initializes a new instance of the <see cref="InputProcessor"/> struct.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="inputStream">The input <see cref="Stream"/></param>
         /// <param name="temp">Temporal buffer, same as <see cref="OrigJpegDecoderCore.Temp"/></param>
-        public InputProcessor(Stream inputStream, byte[] temp)
+        public InputProcessor(MemoryManager memoryManager, Stream inputStream, byte[] temp)
         {
             this.Bits = default(Bits);
-            this.Bytes = Bytes.Create();
+            this.Bytes = Bytes.Create(memoryManager);
             this.InputStream = inputStream;
             this.Temp = temp;
             this.LastErrorCode = OrigDecoderErrorCode.NoError;
@@ -155,13 +158,13 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
             {
                 if (this.Bytes.J - this.Bytes.I >= length)
                 {
-                    Array.Copy(this.Bytes.Buffer, this.Bytes.I, data, offset, length);
+                    Array.Copy(this.Bytes.Buffer.Array, this.Bytes.I, data, offset, length);
                     this.Bytes.I += length;
                     length -= length;
                 }
                 else
                 {
-                    Array.Copy(this.Bytes.Buffer, this.Bytes.I, data, offset, this.Bytes.J - this.Bytes.I);
+                    Array.Copy(this.Bytes.Buffer.Array, this.Bytes.I, data, offset, this.Bytes.J - this.Bytes.I);
                     offset += this.Bytes.J - this.Bytes.I;
                     length -= this.Bytes.J - this.Bytes.I;
                     this.Bytes.I += this.Bytes.J - this.Bytes.I;
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
index 0a0ddeba4..2d34aee3b 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
@@ -210,7 +210,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
         {
             this.MetaData = new ImageMetaData();
             this.InputStream = stream;
-            this.InputProcessor = new InputProcessor(stream, this.Temp);
+            this.InputProcessor = new InputProcessor(this.configuration.MemoryManager, stream, this.Temp);
 
             // Check for the Start Of Image marker.
             this.InputProcessor.ReadFull(this.Temp, 0, 2);

From d6a208274936475f0387dfa51c767e7d0d5c9b44 Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Sat, 13 Jan 2018 14:26:20 +0200
Subject: [PATCH 15/70] - Removed ArrayPool from WuQuantizer

---
 src/ImageSharp/Formats/Png/PngEncoderCore.cs  |   2 +-
 src/ImageSharp/Quantizers/Quantize.cs         |   2 +-
 src/ImageSharp/Quantizers/WuArrayPool.cs      |  34 ----
 .../Quantizers/WuQuantizer{TPixel}.cs         | 177 +++++++++---------
 .../Quantization/QuantizedImageTests.cs       |   2 +-
 5 files changed, 88 insertions(+), 129 deletions(-)
 delete mode 100644 src/ImageSharp/Quantizers/WuArrayPool.cs

diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
index d6adaae42..325027040 100644
--- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
@@ -509,7 +509,7 @@ namespace SixLabors.ImageSharp.Formats.Png
 
             if (this.quantizer == null)
             {
-                this.quantizer = new WuQuantizer<TPixel>();
+                this.quantizer = new WuQuantizer<TPixel>(this.memoryManager);
             }
 
             // Quantize the image returning a palette. This boxing is icky.
diff --git a/src/ImageSharp/Quantizers/Quantize.cs b/src/ImageSharp/Quantizers/Quantize.cs
index d99d4af34..296f4192d 100644
--- a/src/ImageSharp/Quantizers/Quantize.cs
+++ b/src/ImageSharp/Quantizers/Quantize.cs
@@ -29,7 +29,7 @@ namespace SixLabors.ImageSharp
             switch (mode)
             {
                 case Quantization.Wu:
-                    quantizer = new WuQuantizer<TPixel>();
+                    quantizer = new WuQuantizer<TPixel>(source.GetMemoryManager());
                     break;
 
                 case Quantization.Palette:
diff --git a/src/ImageSharp/Quantizers/WuArrayPool.cs b/src/ImageSharp/Quantizers/WuArrayPool.cs
deleted file mode 100644
index 04a70637b..000000000
--- a/src/ImageSharp/Quantizers/WuArrayPool.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.Buffers;
-
-namespace SixLabors.ImageSharp.Quantizers
-{
-    /// <summary>
-    /// Provides array pooling for the <see cref="WuQuantizer{TPixel}"/>.
-    /// This is a separate class so that the pools can be shared accross multiple generic quantizer instaces.
-    /// </summary>
-    internal static class WuArrayPool
-    {
-        /// <summary>
-        /// The long array pool.
-        /// </summary>
-        public static readonly ArrayPool<long> LongPool = ArrayPool<long>.Create(TableLength, 25);
-
-        /// <summary>
-        /// The float array pool.
-        /// </summary>
-        public static readonly ArrayPool<float> FloatPool = ArrayPool<float>.Create(TableLength, 5);
-
-        /// <summary>
-        /// The byte array pool.
-        /// </summary>
-        public static readonly ArrayPool<byte> BytePool = ArrayPool<byte>.Create(TableLength, 5);
-
-        /// <summary>
-        /// The table length. Matches the calculated value in <see cref="WuQuantizer{TPixel}"/>
-        /// </summary>
-        private const int TableLength = 2471625;
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
index cb9eb9b0e..bd3efe3f3 100644
--- a/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Quantizers.Base;
 
@@ -35,6 +36,8 @@ namespace SixLabors.ImageSharp.Quantizers
     public class WuQuantizer<TPixel> : QuantizerBase<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
+        private readonly MemoryManager memoryManager;
+
         /// <summary>
         /// The index bits.
         /// </summary>
@@ -68,37 +71,37 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <summary>
         /// Moment of <c>P(c)</c>.
         /// </summary>
-        private long[] vwt;
+        private Buffer<long> vwt;
 
         /// <summary>
         /// Moment of <c>r*P(c)</c>.
         /// </summary>
-        private long[] vmr;
+        private Buffer<long> vmr;
 
         /// <summary>
         /// Moment of <c>g*P(c)</c>.
         /// </summary>
-        private long[] vmg;
+        private Buffer<long> vmg;
 
         /// <summary>
         /// Moment of <c>b*P(c)</c>.
         /// </summary>
-        private long[] vmb;
+        private Buffer<long> vmb;
 
         /// <summary>
         /// Moment of <c>a*P(c)</c>.
         /// </summary>
-        private long[] vma;
+        private Buffer<long> vma;
 
         /// <summary>
         /// Moment of <c>c^2*P(c)</c>.
         /// </summary>
-        private float[] m2;
+        private Buffer<float> m2;
 
         /// <summary>
         /// Color space tag.
         /// </summary>
-        private byte[] tag;
+        private Buffer<byte> tag;
 
         /// <summary>
         /// Maximum allowed color depth
@@ -118,13 +121,14 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <summary>
         /// Initializes a new instance of the <see cref="WuQuantizer{TPixel}"/> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <remarks>
         /// The Wu quantizer is a two pass algorithm. The initial pass sets up the 3-D color histogram,
         /// the second pass quantizes a color based on the position in the histogram.
         /// </remarks>
-        public WuQuantizer()
-            : base(false)
-        {
+        public WuQuantizer(MemoryManager memoryManager)
+            : base(false) {
+            this.memoryManager = memoryManager;
         }
 
         /// <inheritdoc/>
@@ -138,28 +142,35 @@ namespace SixLabors.ImageSharp.Quantizers
 
             try
             {
-                this.vwt = WuArrayPool.LongPool.Rent(TableLength);
-                this.vmr = WuArrayPool.LongPool.Rent(TableLength);
-                this.vmg = WuArrayPool.LongPool.Rent(TableLength);
-                this.vmb = WuArrayPool.LongPool.Rent(TableLength);
-                this.vma = WuArrayPool.LongPool.Rent(TableLength);
-                this.m2 = WuArrayPool.FloatPool.Rent(TableLength);
-                this.tag = WuArrayPool.BytePool.Rent(TableLength);
+                this.vwt = this.memoryManager.Allocate<long>(TableLength, true);
+                this.vmr = this.memoryManager.Allocate<long>(TableLength, true);
+                this.vmg = this.memoryManager.Allocate<long>(TableLength, true);
+                this.vmb = this.memoryManager.Allocate<long>(TableLength, true);
+                this.vma = this.memoryManager.Allocate<long>(TableLength, true);
+                this.m2 = this.memoryManager.Allocate<float>(TableLength, true);
+                this.tag = this.memoryManager.Allocate<byte>(TableLength, true);
 
                 return base.Quantize(image, this.colors);
             }
             finally
             {
-                WuArrayPool.LongPool.Return(this.vwt, true);
-                WuArrayPool.LongPool.Return(this.vmr, true);
-                WuArrayPool.LongPool.Return(this.vmg, true);
-                WuArrayPool.LongPool.Return(this.vmb, true);
-                WuArrayPool.LongPool.Return(this.vma, true);
-                WuArrayPool.FloatPool.Return(this.m2, true);
-                WuArrayPool.BytePool.Return(this.tag, true);
+                this.DisposeBuffer(ref this.vwt);
+                this.DisposeBuffer(ref this.vmr);
+                this.DisposeBuffer(ref this.vmg);
+                this.DisposeBuffer(ref this.vmb);
+                this.DisposeBuffer(ref this.vma);
+                this.DisposeBuffer(ref this.m2);
+                this.DisposeBuffer(ref this.tag);
             }
         }
 
+        private void DisposeBuffer<T>(ref Buffer<T> buffer)
+            where T : struct
+        {
+            buffer?.Dispose();
+            buffer = null;
+        }
+
         /// <inheritdoc/>
         protected override TPixel[] GetPalette()
         {
@@ -170,14 +181,14 @@ namespace SixLabors.ImageSharp.Quantizers
                 {
                     this.Mark(ref this.colorCube[k], (byte)k);
 
-                    float weight = Volume(ref this.colorCube[k], this.vwt);
+                    float weight = Volume(ref this.colorCube[k], this.vwt.Array);
 
                     if (MathF.Abs(weight) > Constants.Epsilon)
                     {
-                        float r = Volume(ref this.colorCube[k], this.vmr);
-                        float g = Volume(ref this.colorCube[k], this.vmg);
-                        float b = Volume(ref this.colorCube[k], this.vmb);
-                        float a = Volume(ref this.colorCube[k], this.vma);
+                        float r = Volume(ref this.colorCube[k], this.vmr.Array);
+                        float g = Volume(ref this.colorCube[k], this.vmg.Array);
+                        float b = Volume(ref this.colorCube[k], this.vmb.Array);
+                        float a = Volume(ref this.colorCube[k], this.vma.Array);
 
                         ref TPixel color = ref this.palette[k];
                         color.PackFromVector4(new Vector4(r, g, b, a) / weight / 255F);
@@ -448,39 +459,37 @@ namespace SixLabors.ImageSharp.Quantizers
         /// </summary>
         private void Get3DMoments()
         {
-            long[] volume = ArrayPool<long>.Shared.Rent(IndexCount * IndexAlphaCount);
-            long[] volumeR = ArrayPool<long>.Shared.Rent(IndexCount * IndexAlphaCount);
-            long[] volumeG = ArrayPool<long>.Shared.Rent(IndexCount * IndexAlphaCount);
-            long[] volumeB = ArrayPool<long>.Shared.Rent(IndexCount * IndexAlphaCount);
-            long[] volumeA = ArrayPool<long>.Shared.Rent(IndexCount * IndexAlphaCount);
-            float[] volume2 = ArrayPool<float>.Shared.Rent(IndexCount * IndexAlphaCount);
-
-            long[] area = ArrayPool<long>.Shared.Rent(IndexAlphaCount);
-            long[] areaR = ArrayPool<long>.Shared.Rent(IndexAlphaCount);
-            long[] areaG = ArrayPool<long>.Shared.Rent(IndexAlphaCount);
-            long[] areaB = ArrayPool<long>.Shared.Rent(IndexAlphaCount);
-            long[] areaA = ArrayPool<long>.Shared.Rent(IndexAlphaCount);
-            float[] area2 = ArrayPool<float>.Shared.Rent(IndexAlphaCount);
-
-            try
+            using (Buffer<long> volume = this.memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (Buffer<long> volumeR = this.memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (Buffer<long> volumeG = this.memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (Buffer<long> volumeB = this.memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (Buffer<long> volumeA = this.memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (Buffer<float> volume2 = this.memoryManager.Allocate<float>(IndexCount * IndexAlphaCount))
+
+            using (Buffer<long> area = this.memoryManager.Allocate<long>(IndexAlphaCount))
+            using (Buffer<long> areaR = this.memoryManager.Allocate<long>(IndexAlphaCount))
+            using (Buffer<long> areaG = this.memoryManager.Allocate<long>(IndexAlphaCount))
+            using (Buffer<long> areaB = this.memoryManager.Allocate<long>(IndexAlphaCount))
+            using (Buffer<long> areaA = this.memoryManager.Allocate<long>(IndexAlphaCount))
+            using (Buffer<float> area2 = this.memoryManager.Allocate<float>(IndexAlphaCount))
             {
                 for (int r = 1; r < IndexCount; r++)
                 {
-                    Array.Clear(volume, 0, IndexCount * IndexAlphaCount);
-                    Array.Clear(volumeR, 0, IndexCount * IndexAlphaCount);
-                    Array.Clear(volumeG, 0, IndexCount * IndexAlphaCount);
-                    Array.Clear(volumeB, 0, IndexCount * IndexAlphaCount);
-                    Array.Clear(volumeA, 0, IndexCount * IndexAlphaCount);
-                    Array.Clear(volume2, 0, IndexCount * IndexAlphaCount);
+                    volume.Clear();
+                    volumeR.Clear();
+                    volumeG.Clear();
+                    volumeB.Clear();
+                    volumeA.Clear();
+                    volume2.Clear();
 
                     for (int g = 1; g < IndexCount; g++)
                     {
-                        Array.Clear(area, 0, IndexAlphaCount);
-                        Array.Clear(areaR, 0, IndexAlphaCount);
-                        Array.Clear(areaG, 0, IndexAlphaCount);
-                        Array.Clear(areaB, 0, IndexAlphaCount);
-                        Array.Clear(areaA, 0, IndexAlphaCount);
-                        Array.Clear(area2, 0, IndexAlphaCount);
+                        area.Clear();
+                        areaR.Clear();
+                        areaG.Clear();
+                        areaB.Clear();
+                        areaA.Clear();
+                        area2.Clear();
 
                         for (int b = 1; b < IndexCount; b++)
                         {
@@ -531,22 +540,6 @@ namespace SixLabors.ImageSharp.Quantizers
                     }
                 }
             }
-            finally
-            {
-                ArrayPool<long>.Shared.Return(volume);
-                ArrayPool<long>.Shared.Return(volumeR);
-                ArrayPool<long>.Shared.Return(volumeG);
-                ArrayPool<long>.Shared.Return(volumeB);
-                ArrayPool<long>.Shared.Return(volumeA);
-                ArrayPool<float>.Shared.Return(volume2);
-
-                ArrayPool<long>.Shared.Return(area);
-                ArrayPool<long>.Shared.Return(areaR);
-                ArrayPool<long>.Shared.Return(areaG);
-                ArrayPool<long>.Shared.Return(areaB);
-                ArrayPool<long>.Shared.Return(areaA);
-                ArrayPool<float>.Shared.Return(area2);
-            }
         }
 
         /// <summary>
@@ -556,10 +549,10 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <returns>The <see cref="float"/>.</returns>
         private float Variance(ref Box cube)
         {
-            float dr = Volume(ref cube, this.vmr);
-            float dg = Volume(ref cube, this.vmg);
-            float db = Volume(ref cube, this.vmb);
-            float da = Volume(ref cube, this.vma);
+            float dr = Volume(ref cube, this.vmr.Array);
+            float dg = Volume(ref cube, this.vmg.Array);
+            float db = Volume(ref cube, this.vmb.Array);
+            float da = Volume(ref cube, this.vma.Array);
 
             float xx =
                 this.m2[GetPaletteIndex(cube.R1, cube.G1, cube.B1, cube.A1)]
@@ -580,7 +573,7 @@ namespace SixLabors.ImageSharp.Quantizers
                 + this.m2[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A0)];
 
             var vector = new Vector4(dr, dg, db, da);
-            return xx - (Vector4.Dot(vector, vector) / Volume(ref cube, this.vwt));
+            return xx - (Vector4.Dot(vector, vector) / Volume(ref cube, this.vwt.Array));
         }
 
         /// <summary>
@@ -603,22 +596,22 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <returns>The <see cref="float"/>.</returns>
         private float Maximize(ref Box cube, int direction, int first, int last, out int cut, float wholeR, float wholeG, float wholeB, float wholeA, float wholeW)
         {
-            long baseR = Bottom(ref cube, direction, this.vmr);
-            long baseG = Bottom(ref cube, direction, this.vmg);
-            long baseB = Bottom(ref cube, direction, this.vmb);
-            long baseA = Bottom(ref cube, direction, this.vma);
-            long baseW = Bottom(ref cube, direction, this.vwt);
+            long baseR = Bottom(ref cube, direction, this.vmr.Array);
+            long baseG = Bottom(ref cube, direction, this.vmg.Array);
+            long baseB = Bottom(ref cube, direction, this.vmb.Array);
+            long baseA = Bottom(ref cube, direction, this.vma.Array);
+            long baseW = Bottom(ref cube, direction, this.vwt.Array);
 
             float max = 0F;
             cut = -1;
 
             for (int i = first; i < last; i++)
             {
-                float halfR = baseR + Top(ref cube, direction, i, this.vmr);
-                float halfG = baseG + Top(ref cube, direction, i, this.vmg);
-                float halfB = baseB + Top(ref cube, direction, i, this.vmb);
-                float halfA = baseA + Top(ref cube, direction, i, this.vma);
-                float halfW = baseW + Top(ref cube, direction, i, this.vwt);
+                float halfR = baseR + Top(ref cube, direction, i, this.vmr.Array);
+                float halfG = baseG + Top(ref cube, direction, i, this.vmg.Array);
+                float halfB = baseB + Top(ref cube, direction, i, this.vmb.Array);
+                float halfA = baseA + Top(ref cube, direction, i, this.vma.Array);
+                float halfW = baseW + Top(ref cube, direction, i, this.vwt.Array);
 
                 if (MathF.Abs(halfW) < Constants.Epsilon)
                 {
@@ -662,11 +655,11 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <returns>Returns a value indicating whether the box has been split.</returns>
         private bool Cut(ref Box set1, ref Box set2)
         {
-            float wholeR = Volume(ref set1, this.vmr);
-            float wholeG = Volume(ref set1, this.vmg);
-            float wholeB = Volume(ref set1, this.vmb);
-            float wholeA = Volume(ref set1, this.vma);
-            float wholeW = Volume(ref set1, this.vwt);
+            float wholeR = Volume(ref set1, this.vmr.Array);
+            float wholeG = Volume(ref set1, this.vmg.Array);
+            float wholeB = Volume(ref set1, this.vmb.Array);
+            float wholeA = Volume(ref set1, this.vma.Array);
+            float wholeW = Volume(ref set1, this.vwt.Array);
 
             float maxr = this.Maximize(ref set1, 3, set1.R0 + 1, set1.R1, out int cutr, wholeR, wholeG, wholeB, wholeA, wholeW);
             float maxg = this.Maximize(ref set1, 2, set1.G0 + 1, set1.G1, out int cutg, wholeR, wholeG, wholeB, wholeA, wholeW);
diff --git a/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs b/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
index a0b14b09b..3afaa2606 100644
--- a/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
+++ b/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
@@ -61,7 +61,7 @@
             {
                 Assert.True(image[0, 0].Equals(default(TPixel)));
 
-                IQuantizer<TPixel> quantizer = new WuQuantizer<TPixel> { Dither = dither };
+                IQuantizer<TPixel> quantizer = new WuQuantizer<TPixel>(Configuration.Default.MemoryManager) { Dither = dither };
 
                 foreach (ImageFrame<TPixel> frame in image.Frames)
                 {

From 41f51faf579436a9bebd8b6d03b87f2acb144f90 Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Sat, 13 Jan 2018 13:39:00 +0200
Subject: [PATCH 16/70] - Optional param -> second method

---
 src/ImageSharp/Memory/ArrayPoolMemoryManager.cs |  8 +++++++-
 src/ImageSharp/Memory/MemoryManager.cs          | 13 ++++++++++++-
 src/ImageSharp/Memory/NullMemoryManager.cs      |  8 +++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index 3e5628c75..f77a1f8ac 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -30,7 +30,13 @@ namespace SixLabors.ImageSharp.Memory
         }
 
         /// <inheritdoc />
-        internal override Buffer<T> Allocate<T>(int itemCount, bool clear = false)
+        internal override Buffer<T> Allocate<T>(int itemCount)
+        {
+            return this.Allocate<T>(itemCount, false);
+        }
+
+        /// <inheritdoc />
+        internal override Buffer<T> Allocate<T>(int itemCount, bool clear)
         {
             int itemSizeBytes = Unsafe.SizeOf<T>();
             int bufferSizeInBytes = itemCount * itemSizeBytes;
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index 67d72d2b4..1cefccfb2 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -11,6 +11,17 @@ namespace SixLabors.ImageSharp.Memory
     /// </summary>
     public abstract class MemoryManager
     {
+        /// <summary>
+        /// Allocates a <see cref="Buffer{T}"/> of size <paramref name="size"/>.
+        /// Note: Depending on the implementation, the buffer may not cleared before
+        /// returning, so it may contain data from an earlier use.
+        /// </summary>
+        /// <typeparam name="T">Type of the data stored in the buffer</typeparam>
+        /// <param name="size">Size of the buffer to allocate</param>
+        /// <returns>A buffer of values of type <typeparamref name="T"/>.</returns>
+        internal abstract Buffer<T> Allocate<T>(int size)
+            where T : struct;
+
         /// <summary>
         /// Allocates a <see cref="Buffer{T}"/> of size <paramref name="size"/>, optionally
         /// clearing the buffer before it gets returned.
@@ -19,7 +30,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="size">Size of the buffer to allocate</param>
         /// <param name="clear">True to clear the backing memory of the buffer</param>
         /// <returns>A buffer of values of type <typeparamref name="T"/>.</returns>
-        internal abstract Buffer<T> Allocate<T>(int size, bool clear = false)
+        internal abstract Buffer<T> Allocate<T>(int size, bool clear)
             where T : struct;
 
         /// <summary>
diff --git a/src/ImageSharp/Memory/NullMemoryManager.cs b/src/ImageSharp/Memory/NullMemoryManager.cs
index 32642dae4..d82f01353 100644
--- a/src/ImageSharp/Memory/NullMemoryManager.cs
+++ b/src/ImageSharp/Memory/NullMemoryManager.cs
@@ -6,7 +6,13 @@
     public class NullMemoryManager : MemoryManager
     {
         /// <inheritdoc />
-        internal override Buffer<T> Allocate<T>(int size, bool clear = false)
+        internal override Buffer<T> Allocate<T>(int size)
+        {
+            return new Buffer<T>(new T[size], size);
+        }
+
+        /// <inheritdoc />
+        internal override Buffer<T> Allocate<T>(int size, bool clear)
         {
             return new Buffer<T>(new T[size], size);
         }

From b747768800de18239262bb4db8d449b502066349 Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Sat, 13 Jan 2018 14:55:34 +0200
Subject: [PATCH 17/70] - Whitespace fix

---
 src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
index bd3efe3f3..789dcc25c 100644
--- a/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
@@ -127,7 +127,8 @@ namespace SixLabors.ImageSharp.Quantizers
         /// the second pass quantizes a color based on the position in the histogram.
         /// </remarks>
         public WuQuantizer(MemoryManager memoryManager)
-            : base(false) {
+            : base(false)
+        {
             this.memoryManager = memoryManager;
         }
 

From 1652f46ed16936d0248488949e48cc9b887ea774 Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Sat, 13 Jan 2018 16:22:15 +0200
Subject: [PATCH 18/70] - Reduced the threshold for ArrayPoolMemoryManager to
 512 bytes

---
 src/ImageSharp/Configuration.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs
index bc8ad1c52..37db84627 100644
--- a/src/ImageSharp/Configuration.cs
+++ b/src/ImageSharp/Configuration.cs
@@ -86,7 +86,7 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// Gets or sets the <see cref="MemoryManager"/> that is currently in use.
         /// </summary>
-        public MemoryManager MemoryManager { get; set; } = new ArrayPoolMemoryManager(1024 * 80);
+        public MemoryManager MemoryManager { get; set; } = new ArrayPoolMemoryManager(512);
 
         /// <summary>
         /// Gets the maximum header size of all the formats.

From d5b7000c8710917f521207dfce05f15147bdd624 Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Sat, 13 Jan 2018 22:04:40 +0200
Subject: [PATCH 19/70] - Oops, neglected to fix this test

---
 tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs b/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
index b4f78bee8..4ce5f5083 100644
--- a/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
+++ b/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
@@ -98,7 +98,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoder options = new PngEncoder(Configuration.Default.MemoryManager) { Quantizer = new WuQuantizer<Rgba32>(), PaletteSize = 256 };
+                PngEncoder options = new PngEncoder(Configuration.Default.MemoryManager) { Quantizer = new WuQuantizer<Rgba32>(Configuration.Default.MemoryManager), PaletteSize = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }

From d11aaf57ba9beedd41b9725ebcb417cbf28218bb Mon Sep 17 00:00:00 2001
From: Lauri Kotilainen <lauri@offbeat.fi>
Date: Sat, 13 Jan 2018 22:05:06 +0200
Subject: [PATCH 20/70] - Removed Configuration.Default.MemoryManager from
 PixelAccessor

---
 src/ImageSharp/Image/PixelAccessor{TPixel}.cs             | 5 +++--
 .../Processors/Convolution/Convolution2DProcessor.cs      | 2 +-
 .../Processors/Convolution/Convolution2PassProcessor.cs   | 2 +-
 .../Processors/Convolution/ConvolutionProcessor.cs        | 2 +-
 .../Processing/Processors/Effects/OilPaintingProcessor.cs | 2 +-
 .../Processing/Processors/Transforms/CropProcessor.cs     | 2 +-
 .../Processing/Processors/Transforms/FlipProcessor.cs     | 4 ++--
 .../Processing/Processors/Transforms/RotateProcessor.cs   | 8 ++++----
 .../Processing/Processors/Transforms/SkewProcessor.cs     | 2 +-
 src/ImageSharp/Quantizers/Quantize.cs                     | 2 +-
 10 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
index fca57b3c8..50e65a082 100644
--- a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
+++ b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
@@ -52,10 +52,11 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// Initializes a new instance of the <see cref="PixelAccessor{TPixel}"/> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="width">The width of the image represented by the pixel buffer.</param>
         /// <param name="height">The height of the image represented by the pixel buffer.</param>
-        public PixelAccessor(int width, int height)
-            : this(width, height, Configuration.Default.MemoryManager.Allocate2D<TPixel>(width, height, true), true)
+        public PixelAccessor(MemoryManager memoryManager, int width, int height)
+            : this(width, height, memoryManager.Allocate2D<TPixel>(width, height, true), true)
         {
         }
 
diff --git a/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
index b85432ac5..2e2f5e3a6 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
@@ -56,7 +56,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int maxY = endY - 1;
             int maxX = endX - 1;
 
-            using (var targetPixels = new PixelAccessor<TPixel>(source.Width, source.Height))
+            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, source.Width, source.Height))
             {
                 source.CopyTo(targetPixels);
 
diff --git a/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
index 362fa5c50..e79a6cf27 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
@@ -47,7 +47,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int height = source.Height;
             ParallelOptions parallelOptions = configuration.ParallelOptions;
 
-            using (var firstPassPixels = new PixelAccessor<TPixel>(width, height))
+            using (var firstPassPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
             using (PixelAccessor<TPixel> sourcePixels = source.Lock())
             {
                 this.ApplyConvolution(firstPassPixels, sourcePixels, source.Bounds(), this.KernelX, parallelOptions);
diff --git a/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
index c0d3fdcfe..da64a970e 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int maxY = endY - 1;
             int maxX = endX - 1;
 
-            using (var targetPixels = new PixelAccessor<TPixel>(source.Width, source.Height))
+            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, source.Width, source.Height))
             {
                 source.CopyTo(targetPixels);
 
diff --git a/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
index b22a49798..af2c29759 100644
--- a/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
@@ -65,7 +65,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int radius = this.BrushSize >> 1;
             int levels = this.Levels;
 
-            using (var targetPixels = new PixelAccessor<TPixel>(source.Width, source.Height))
+            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, source.Width, source.Height))
             {
                 source.CopyTo(targetPixels);
 
diff --git a/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
index 2657daaa8..556874586 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
@@ -44,7 +44,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int minX = Math.Max(this.CropRectangle.X, sourceRectangle.X);
             int maxX = Math.Min(this.CropRectangle.Right, sourceRectangle.Right);
 
-            using (var targetPixels = new PixelAccessor<TPixel>(this.CropRectangle.Width, this.CropRectangle.Height))
+            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, this.CropRectangle.Width, this.CropRectangle.Height))
             {
                 Parallel.For(
                     minY,
diff --git a/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
index de60177f2..f52bc97c1 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
@@ -58,7 +58,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int height = source.Height;
             int halfHeight = (int)Math.Ceiling(source.Height * .5F);
 
-            using (var targetPixels = new PixelAccessor<TPixel>(width, height))
+            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
             {
                 Parallel.For(
                     0,
@@ -92,7 +92,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int height = source.Height;
             int halfWidth = (int)Math.Ceiling(width * .5F);
 
-            using (var targetPixels = new PixelAccessor<TPixel>(width, height))
+            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
             {
                 Parallel.For(
                     0,
diff --git a/src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs
index 86a0c7360..ddacf219b 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs
@@ -48,7 +48,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             Matrix3x2 matrix = this.GetCenteredMatrix(source, this.processMatrix);
             Rectangle sourceBounds = source.Bounds();
 
-            using (var targetPixels = new PixelAccessor<TPixel>(width, height))
+            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
             {
                 Parallel.For(
                     0,
@@ -159,7 +159,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int width = source.Width;
             int height = source.Height;
 
-            using (var targetPixels = new PixelAccessor<TPixel>(height, width))
+            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, height, width))
             {
                 using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
@@ -193,7 +193,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int width = source.Width;
             int height = source.Height;
 
-            using (var targetPixels = new PixelAccessor<TPixel>(width, height))
+            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
             {
                 Parallel.For(
                     0,
@@ -224,7 +224,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int width = source.Width;
             int height = source.Height;
 
-            using (var targetPixels = new PixelAccessor<TPixel>(height, width))
+            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, height, width))
             {
                 Parallel.For(
                     0,
diff --git a/src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs
index 316e2a2af..9f6f1d17d 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs
@@ -47,7 +47,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             Matrix3x2 matrix = this.GetCenteredMatrix(source, this.processMatrix);
             Rectangle sourceBounds = source.Bounds();
 
-            using (var targetPixels = new PixelAccessor<TPixel>(width, height))
+            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
             {
                 Parallel.For(
                     0,
diff --git a/src/ImageSharp/Quantizers/Quantize.cs b/src/ImageSharp/Quantizers/Quantize.cs
index 296f4192d..11494a867 100644
--- a/src/ImageSharp/Quantizers/Quantize.cs
+++ b/src/ImageSharp/Quantizers/Quantize.cs
@@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp
                 QuantizedImage<TPixel> quantized = quantizer.Quantize(img.Frames.RootFrame, maxColors);
                 int palleteCount = quantized.Palette.Length - 1;
 
-                using (var pixels = new PixelAccessor<TPixel>(quantized.Width, quantized.Height))
+                using (var pixels = new PixelAccessor<TPixel>(source.GetMemoryManager(), quantized.Width, quantized.Height))
                 {
                     Parallel.For(
                         0,

From d50e446a6f816a54ed6dc8360a617b74e183ca5c Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sun, 14 Jan 2018 02:08:34 +0100
Subject: [PATCH 21/70] dropping minSizeBytes + fixing tests

---
 src/ImageSharp/Configuration.cs               |  2 +-
 .../Memory/ArrayPoolMemoryManager.cs          | 40 +++++--------------
 src/ImageSharp/Memory/MemoryManager.cs        |  2 +-
 .../Formats/Jpg/JpegDecoderTests.cs           |  3 +-
 .../PixelFormats/PixelOperationsTests.cs      |  5 ++-
 5 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs
index 37db84627..bd6c11235 100644
--- a/src/ImageSharp/Configuration.cs
+++ b/src/ImageSharp/Configuration.cs
@@ -86,7 +86,7 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// Gets or sets the <see cref="MemoryManager"/> that is currently in use.
         /// </summary>
-        public MemoryManager MemoryManager { get; set; } = new ArrayPoolMemoryManager(512);
+        public MemoryManager MemoryManager { get; set; } = new ArrayPoolMemoryManager();
 
         /// <summary>
         /// Gets the maximum header size of all the formats.
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index f77a1f8ac..9df9e794a 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -10,23 +10,20 @@ namespace SixLabors.ImageSharp.Memory
     /// </summary>
     public class ArrayPoolMemoryManager : MemoryManager
     {
-        private readonly int minSizeBytes;
+        /// <summary>
+        /// Defines the default maximum size of pooled arrays.
+        /// Currently set to a value equivalent to 16 Megapixels of an <see cref="Rgba32"/> image.
+        /// </summary>
+        public const int DefaultMaxSizeInBytes = 4096 * 4096 * 4;
+
         private readonly ArrayPool<byte> pool;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayPoolMemoryManager"/> class.
-        /// By passing an integer greater than 0 as <paramref name="minSizeBytes"/>, a
-        /// minimum threshold for pooled allocations is set. Any allocation requests that
-        /// would require less size than the threshold will not be managed within the array pool.
         /// </summary>
-        /// <param name="minSizeBytes">
-        /// Minimum size, in bytes, before an array pool is used to satisfy the request.
-        /// </param>
-        public ArrayPoolMemoryManager(int minSizeBytes = 0)
+        public ArrayPoolMemoryManager()
         {
-            this.minSizeBytes = minSizeBytes;
-
-            this.pool = ArrayPool<byte>.Create(CalculateMaxArrayLength(), 50);
+            this.pool = ArrayPool<byte>.Create(DefaultMaxSizeInBytes, 50);
         }
 
         /// <inheritdoc />
@@ -41,14 +38,6 @@ namespace SixLabors.ImageSharp.Memory
             int itemSizeBytes = Unsafe.SizeOf<T>();
             int bufferSizeInBytes = itemCount * itemSizeBytes;
 
-            if (this.minSizeBytes > 0 && bufferSizeInBytes < this.minSizeBytes)
-            {
-                // Minimum size set to 8 bytes to get past a misbehaving test
-                // (otherwise PngDecoderTests.Decode_IncorrectCRCForNonCriticalChunk_ExceptionIsThrown fails for the wrong reason)
-                // TODO: Remove this once the test is fixed
-                return new Buffer<T>(new T[Math.Max(itemCount, 8)], itemCount);
-            }
-
             byte[] byteBuffer = this.pool.Rent(bufferSizeInBytes);
             var buffer = new Buffer<T>(Unsafe.As<T[]>(byteBuffer), itemCount, this);
             if (clear)
@@ -62,19 +51,8 @@ namespace SixLabors.ImageSharp.Memory
         /// <inheritdoc />
         internal override void Release<T>(Buffer<T> buffer)
         {
-            var byteBuffer = Unsafe.As<byte[]>(buffer.Array);
+            byte[] byteBuffer = Unsafe.As<byte[]>(buffer.Array);
             this.pool.Return(byteBuffer);
         }
-
-        /// <summary>
-        /// Heuristically calculates a reasonable maxArrayLength value for the backing <see cref="ArrayPool{T}"/>.
-        /// </summary>
-        /// <returns>The maxArrayLength value</returns>
-        internal static int CalculateMaxArrayLength()
-        {
-            const int MaximumExpectedImageSize = 16384 * 16384;
-            const int MaximumBytesPerPixel = 4;
-            return MaximumExpectedImageSize * MaximumBytesPerPixel;
-        }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index 1cefccfb2..df1ecbd84 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.Memory
         internal Buffer2D<T> Allocate2D<T>(int width, int height, bool clear = false)
             where T : struct
         {
-            var buffer = this.Allocate<T>(width * height, clear);
+            Buffer<T> buffer = this.Allocate<T>(width * height, clear);
 
             return new Buffer2D<T>(buffer, width, height);
         }
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
index d529bbaeb..e310e1efa 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -118,8 +118,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         }
 
         public const string DecodeBaselineJpegOutputName = "DecodeBaselineJpeg";
-
-
+        
         [Theory]
         [WithFile(TestImages.Jpeg.Baseline.Calliphora, CommonNonDefaultPixelTypes, false)]
         [WithFile(TestImages.Jpeg.Baseline.Calliphora, CommonNonDefaultPixelTypes, true)]
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
index 4cd7ebeea..41711240c 100644
--- a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
@@ -362,8 +362,9 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
 
                 if (typeof(TDest) == typeof(Vector4))
                 {
-                    Vector4[] expected = this.ExpectedDestBuffer.Array as Vector4[];
-                    Vector4[] actual = this.ActualDestBuffer.Array as Vector4[];
+                    
+                    Span<Vector4> expected = this.ExpectedDestBuffer.Span.NonPortableCast<TDest, Vector4>();
+                    Span<Vector4> actual = this.ActualDestBuffer.Span.NonPortableCast<TDest, Vector4>();
 
                     for (int i = 0; i < count; i++)
                     {

From b63dbd3a6def2d27d342d500760193581df512ed Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sun, 14 Jan 2018 02:26:49 +0100
Subject: [PATCH 22/70] maxPoolSizeInBytes parameter + safer indexer for
 Buffer<T>

---
 src/ImageSharp/Memory/ArrayPoolMemoryManager.cs | 15 +++++++++++++--
 src/ImageSharp/Memory/Buffer{T}.cs              |  4 +++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index 9df9e794a..b062df711 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -12,7 +12,7 @@ namespace SixLabors.ImageSharp.Memory
     {
         /// <summary>
         /// Defines the default maximum size of pooled arrays.
-        /// Currently set to a value equivalent to 16 Megapixels of an <see cref="Rgba32"/> image.
+        /// Currently set to a value equivalent to 16 MegaPixels of an <see cref="Rgba32"/> image.
         /// </summary>
         public const int DefaultMaxSizeInBytes = 4096 * 4096 * 4;
 
@@ -22,8 +22,19 @@ namespace SixLabors.ImageSharp.Memory
         /// Initializes a new instance of the <see cref="ArrayPoolMemoryManager"/> class.
         /// </summary>
         public ArrayPoolMemoryManager()
+            : this(DefaultMaxSizeInBytes)
         {
-            this.pool = ArrayPool<byte>.Create(DefaultMaxSizeInBytes, 50);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArrayPoolMemoryManager"/> class.
+        /// <param name="maxPoolSizeInBytes">The maximum size of pooled arrays. Arrays over the thershold are gonna be always allocated.</param>
+        /// </summary>
+        public ArrayPoolMemoryManager(int maxPoolSizeInBytes)
+        {
+            Guard.MustBeGreaterThan(maxPoolSizeInBytes, 0, nameof(maxPoolSizeInBytes));
+
+            this.pool = ArrayPool<byte>.Create(maxPoolSizeInBytes, 50);
         }
 
         /// <inheritdoc />
diff --git a/src/ImageSharp/Memory/Buffer{T}.cs b/src/ImageSharp/Memory/Buffer{T}.cs
index d25cc232a..07a827a67 100644
--- a/src/ImageSharp/Memory/Buffer{T}.cs
+++ b/src/ImageSharp/Memory/Buffer{T}.cs
@@ -99,7 +99,9 @@ namespace SixLabors.ImageSharp.Memory
             get
             {
                 DebugGuard.MustBeLessThan(index, this.Length, nameof(index));
-                return ref this.Array[index];
+
+                Span<T> span = this.Span;
+                return ref span[index];
             }
         }
 

From c08b155d2cc6916e11f9ddeeca60f7a39fe9e328 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sat, 17 Feb 2018 19:32:17 +0100
Subject: [PATCH 23/70] fix build after merge

---
 src/ImageSharp/Advanced/AdvancedImageExtensions.cs  |  8 ++++++++
 src/ImageSharp/Formats/Gif/GifDecoderCore.cs        | 10 +++++++---
 src/ImageSharp/Formats/Png/PngDecoderCore.cs        | 13 ++++++++-----
 src/ImageSharp/Image/ImageFrame{TPixel}.cs          |  6 ++++--
 .../Transforms/AffineTransformProcessor.cs          |  8 +++++---
 .../Transforms/ProjectiveTransformProcessor.cs      | 13 +++++++++----
 .../Processors/Transforms/WeightsBuffer.cs          |  5 +++--
 .../Processors/Transforms/WeightsWindow.cs          |  2 +-
 .../ImageSharp.Tests/Formats/GeneralFormatTests.cs  |  9 +++++----
 .../Transforms/ResizeProfilingBenchmarks.cs         |  3 ++-
 .../Quantization/QuantizedImageTests.cs             |  2 +-
 11 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/src/ImageSharp/Advanced/AdvancedImageExtensions.cs b/src/ImageSharp/Advanced/AdvancedImageExtensions.cs
index 0acb846c5..612ced5d8 100644
--- a/src/ImageSharp/Advanced/AdvancedImageExtensions.cs
+++ b/src/ImageSharp/Advanced/AdvancedImageExtensions.cs
@@ -88,6 +88,14 @@ namespace SixLabors.ImageSharp.Advanced
             where TPixel : struct, IPixel<TPixel>
             => source.Frames.RootFrame.GetPixelRowSpan(row);
 
+        /// <summary>
+        /// Gets the <see cref="MemoryManager"/> assigned to 'source'.
+        /// </summary>
+        /// <param name="source">The source image</param>
+        /// <returns>Returns the configuration.</returns>
+        internal static MemoryManager GetMemoryManager(this IConfigurable source)
+            => GetConfiguration(source).MemoryManager;
+
         /// <summary>
         /// Gets the span to the backing buffer.
         /// </summary>
diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
index 0c1d8b21a..c120c9e11 100644
--- a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
@@ -92,6 +92,8 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// </summary>
         public FrameDecodingMode DecodingMode { get; }
 
+        private MemoryManager MemoryManager => this.configuration.MemoryManager;
+
         /// <summary>
         /// Decodes the stream to the image.
         /// </summary>
@@ -148,7 +150,8 @@ namespace SixLabors.ImageSharp.Formats.Gif
                     {
                         break;
                     }
-                    this.globalColorTable = this.configuration.MemoryManager.Allocate<byte>(this.globalColorTableLength, true);
+
+                    this.globalColorTable = this.MemoryManager.Allocate<byte>(this.globalColorTableLength, true);
 
                     nextFlag = stream.ReadByte();
                     if (nextFlag == -1)
@@ -334,7 +337,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
                     continue;
                 }
 
-                using (Buffer<byte> commentsBuffer = this.configuration.MemoryManager.Allocate<byte>(length))
+                using (Buffer<byte> commentsBuffer = this.MemoryManager.Allocate<byte>(length))
                 {
                     this.currentStream.Read(commentsBuffer.Array, 0, length);
                     string comments = this.TextEncoding.GetString(commentsBuffer.Array, 0, length);
@@ -601,7 +604,8 @@ namespace SixLabors.ImageSharp.Formats.Gif
             if (this.logicalScreenDescriptor.GlobalColorTableFlag)
             {
                 this.globalColorTableLength = this.logicalScreenDescriptor.GlobalColorTableSize * 3;
-                this.globalColorTable = Buffer<byte>.CreateClean(this.globalColorTableLength);
+
+                this.globalColorTable = this.MemoryManager.Allocate<byte>(this.globalColorTableLength, true);
 
                 // Read the global color table from the stream
                 stream.Read(this.globalColorTable.Array, 0, this.globalColorTableLength);
diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index 6a04c77b9..0546c5ee3 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -190,6 +190,8 @@ namespace SixLabors.ImageSharp.Formats.Png
             this.textEncoding = options.TextEncoding ?? PngConstants.DefaultEncoding;
             this.ignoreMetadata = options.IgnoreMetadata;
         }
+        
+        private MemoryManager MemoryManager => this.configuration.MemoryManager;
 
         /// <summary>
         /// Decodes the stream to the image.
@@ -297,17 +299,17 @@ namespace SixLabors.ImageSharp.Formats.Png
                         switch (currentChunk.Type)
                         {
                             case PngChunkTypes.Header:
-                                this.ReadHeaderChunk(currentChunk.Data);
+                                this.ReadHeaderChunk(currentChunk.Data.Array);
                                 this.ValidateHeader();
                                 break;
                             case PngChunkTypes.Physical:
-                                this.ReadPhysicalChunk(metadata, currentChunk.Data);
+                                this.ReadPhysicalChunk(metadata, currentChunk.Data.Array);
                                 break;
                             case PngChunkTypes.Data:
                                 this.SkipChunkDataAndCrc(currentChunk);
                                 break;
                             case PngChunkTypes.Text:
-                                this.ReadTextChunk(metadata, currentChunk.Data, currentChunk.Length);
+                                this.ReadTextChunk(metadata, currentChunk.Data.Array, currentChunk.Length);
                                 break;
                             case PngChunkTypes.End:
                                 this.isEndChunkReached = true;
@@ -319,7 +321,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                         // Data is rented in ReadChunkData()
                         if (currentChunk.Data != null)
                         {
-                            ArrayPool<byte>.Shared.Return(currentChunk.Data);
+                            ArrayPool<byte>.Shared.Return(currentChunk.Data.Array);
                         }
                     }
                 }
@@ -435,10 +437,11 @@ namespace SixLabors.ImageSharp.Formats.Png
                 this.bytesPerSample = this.header.BitDepth / 8;
             }
 
-            this.previousScanline = this.configuration.MemoryManager.Allocate<byte>(this.bytesPerScanline, true);
+            this.previousScanline = this.MemoryManager.Allocate<byte>(this.bytesPerScanline, true);
             this.scanline = this.configuration.MemoryManager.Allocate<byte>(this.bytesPerScanline, true);
         }
 
+
         /// <summary>
         /// Calculates the correct number of bits per pixel for the given color type.
         /// </summary>
diff --git a/src/ImageSharp/Image/ImageFrame{TPixel}.cs b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
index e96275a9f..eb34c2673 100644
--- a/src/ImageSharp/Image/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
@@ -61,16 +61,18 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageFrame{TPixel}" /> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="size">The <see cref="Size"/> of the frame.</param>
         /// <param name="metaData">The meta data.</param>
-        internal ImageFrame(Size size, ImageFrameMetaData metaData)
-            : this(size.Width, size.Height, metaData)
+        internal ImageFrame(MemoryManager memoryManager, Size size, ImageFrameMetaData metaData)
+            : this(memoryManager, size.Width, size.Height, metaData)
         {
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageFrame{TPixel}" /> class.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="source">The source.</param>
         internal ImageFrame(MemoryManager memoryManager, ImageFrame<TPixel> source)
         {
diff --git a/src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs
index 8595e8692..9a5b000de 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs
@@ -73,7 +73,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
 
             // We will always be creating the clone even for mutate because we may need to resize the canvas
             IEnumerable<ImageFrame<TPixel>> frames =
-                source.Frames.Select(x => new ImageFrame<TPixel>(this.targetDimensions, x.MetaData.Clone()));
+                source.Frames.Select(x => new ImageFrame<TPixel>(source.GetMemoryManager(), this.targetDimensions, x.MetaData.Clone()));
 
             // Use the overload to prevent an extra frame being added
             return new Image<TPixel>(source.GetConfiguration(), source.MetaData.Clone(), frames);
@@ -130,8 +130,10 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int xLength = (int)MathF.Ceiling((radius.X * 2) + 2);
             int yLength = (int)MathF.Ceiling((radius.Y * 2) + 2);
 
-            using (var yBuffer = new Buffer2D<float>(yLength, height))
-            using (var xBuffer = new Buffer2D<float>(xLength, height))
+            MemoryManager memoryManager = configuration.MemoryManager;
+
+            using (Buffer2D<float> yBuffer = memoryManager.Allocate2D<float>(yLength, height))
+            using (Buffer2D<float> xBuffer = memoryManager.Allocate2D<float>(xLength, height))
             {
                 Parallel.For(
                     0,
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs
index 7e547727e..3c04c2722 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs
@@ -73,8 +73,11 @@ namespace SixLabors.ImageSharp.Processing.Processors
             }
 
             // We will always be creating the clone even for mutate because we may need to resize the canvas
-            IEnumerable<ImageFrame<TPixel>> frames =
-                source.Frames.Select(x => new ImageFrame<TPixel>(this.targetRectangle.Width, this.targetRectangle.Height, x.MetaData.Clone()));
+            IEnumerable<ImageFrame<TPixel>> frames = source.Frames.Select(
+                x => new ImageFrame<TPixel>(
+                    source.GetMemoryManager(),
+                    this.targetRectangle.Size,
+                    x.MetaData.Clone()));
 
             // Use the overload to prevent an extra frame being added
             return new Image<TPixel>(source.GetConfiguration(), source.MetaData.Clone(), frames);
@@ -125,8 +128,10 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int xLength = (int)MathF.Ceiling((radius.X * 2) + 2);
             int yLength = (int)MathF.Ceiling((radius.Y * 2) + 2);
 
-            using (var yBuffer = new Buffer2D<float>(yLength, height))
-            using (var xBuffer = new Buffer2D<float>(xLength, height))
+            MemoryManager memoryManager = configuration.MemoryManager;
+
+            using (Buffer2D<float> yBuffer = memoryManager.Allocate2D<float>(yLength, height))
+            using (Buffer2D<float> xBuffer = memoryManager.Allocate2D<float>(xLength, height))
             {
                 Parallel.For(
                     0,
diff --git a/src/ImageSharp/Processing/Processors/Transforms/WeightsBuffer.cs b/src/ImageSharp/Processing/Processors/Transforms/WeightsBuffer.cs
index 0e91087f9..d633a3869 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/WeightsBuffer.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/WeightsBuffer.cs
@@ -17,11 +17,12 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <summary>
         /// Initializes a new instance of the <see cref="WeightsBuffer"/> class.
         /// </summary>
+        /// <param name="memoryManager">The MemoryManager to use for allocations.</param>
         /// <param name="sourceSize">The size of the source window</param>
         /// <param name="destinationSize">The size of the destination window</param>
-        public WeightsBuffer(int sourceSize, int destinationSize)
+        public WeightsBuffer(MemoryManager memoryManager, int sourceSize, int destinationSize)
         {
-            this.dataBuffer = Buffer2D<float>.CreateClean(sourceSize, destinationSize);
+            this.dataBuffer = memoryManager.Allocate2D<float>(sourceSize, destinationSize, true);
             this.Weights = new WeightsWindow[destinationSize];
         }
 
diff --git a/src/ImageSharp/Processing/Processors/Transforms/WeightsWindow.cs b/src/ImageSharp/Processing/Processors/Transforms/WeightsWindow.cs
index b0a530514..1ee61a9a6 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/WeightsWindow.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/WeightsWindow.cs
@@ -46,7 +46,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
         {
             this.flatStartIndex = (index * buffer.Width) + left;
             this.Left = left;
-            this.buffer = buffer;
+            this.buffer = buffer.Buffer;
             this.Length = length;
         }
 
diff --git a/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs b/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs
index 97128e2c9..a6a883d42 100644
--- a/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs
+++ b/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs
@@ -14,7 +14,8 @@ namespace SixLabors.ImageSharp.Tests
 {
     using System;
 
-    
+    using SixLabors.ImageSharp.Advanced;
+    using SixLabors.ImageSharp.Memory;
 
     public class GeneralFormatTests : FileTestBase
     {
@@ -178,7 +179,7 @@ namespace SixLabors.ImageSharp.Tests
             {
                 using (var memoryStream = new MemoryStream())
                 {
-                    image.Save(memoryStream, GetEncoder(format));
+                    image.Save(memoryStream, GetEncoder(image.GetMemoryManager(), format));
                     memoryStream.Position = 0;
 
                     var imageInfo = Image.Identify(memoryStream);
@@ -189,12 +190,12 @@ namespace SixLabors.ImageSharp.Tests
             }
         }
 
-        private static IImageEncoder GetEncoder(string format)
+        private static IImageEncoder GetEncoder(MemoryManager memoryManager, string format)
         {
             switch (format)
             {
                 case "png":
-                    return new PngEncoder();
+                    return new PngEncoder(memoryManager);
                 case "gif":
                     return new GifEncoder();
                 case "bmp":
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs
index c87dcb648..54a3b7418 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs
@@ -11,6 +11,8 @@ using Xunit.Abstractions;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
 {
+    using SixLabors.ImageSharp.Memory;
+
     public class ResizeProfilingBenchmarks : MeasureFixture
     {
         public ResizeProfilingBenchmarks(ITestOutputHelper output)
@@ -38,7 +40,6 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         // [Fact]
         public void PrintWeightsData()
         {
-            var proc = new ResizeProcessor<Rgba32>(KnownResamplers.Bicubic, 200, 200);
             var proc = new ResizeProcessor<Rgba32>(Configuration.Default.MemoryManager, new BicubicResampler(), 200, 200);
 
             WeightsBuffer weights = proc.PrecomputeWeights(200, 500);
diff --git a/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs b/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
index a9e5b440d..5d569aa8f 100644
--- a/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
+++ b/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
@@ -12,7 +12,7 @@
         {
             var palette = new PaletteQuantizer<Rgba32>();
             var octree = new OctreeQuantizer<Rgba32>();
-            var wu = new WuQuantizer<Rgba32>();
+            var wu = new WuQuantizer<Rgba32>(Configuration.Default.MemoryManager);
 
             Assert.True(palette.Dither);
             Assert.True(octree.Dither);

From efc5d6f3067e03f09fd287e69d356efbbc6472f6 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sat, 17 Feb 2018 19:56:40 +0100
Subject: [PATCH 24/70] moving common MemoryManager logic into extension
 methods

---
 src/ImageSharp/Image/ImageFrame{TPixel}.cs    |  2 +-
 .../Memory/ArrayPoolMemoryManager.cs          |  8 +---
 src/ImageSharp/Memory/MemoryManager.cs        | 19 --------
 .../Memory/MemoryManagerExtensions.cs         | 45 +++++++++++++++++++
 ...nager.cs => SimpleManagedMemoryManager.cs} |  8 +---
 .../Processors/Transforms/ResizeProcessor.cs  |  2 +-
 6 files changed, 49 insertions(+), 35 deletions(-)
 create mode 100644 src/ImageSharp/Memory/MemoryManagerExtensions.cs
 rename src/ImageSharp/Memory/{NullMemoryManager.cs => SimpleManagedMemoryManager.cs} (68%)

diff --git a/src/ImageSharp/Image/ImageFrame{TPixel}.cs b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
index eb34c2673..5170522de 100644
--- a/src/ImageSharp/Image/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
@@ -54,7 +54,7 @@ namespace SixLabors.ImageSharp
             Guard.NotNull(metaData, nameof(metaData));
 
             this.MemoryManager = memoryManager;
-            this.pixelBuffer = memoryManager.Allocate2D<TPixel>(width, height, true);
+            this.pixelBuffer = memoryManager.AllocateClean2D<TPixel>(width, height);
             this.MetaData = metaData;
         }
 
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index b062df711..86776fd35 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -28,8 +28,8 @@ namespace SixLabors.ImageSharp.Memory
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayPoolMemoryManager"/> class.
-        /// <param name="maxPoolSizeInBytes">The maximum size of pooled arrays. Arrays over the thershold are gonna be always allocated.</param>
         /// </summary>
+        /// <param name="maxPoolSizeInBytes">The maximum size of pooled arrays. Arrays over the thershold are gonna be always allocated.</param>
         public ArrayPoolMemoryManager(int maxPoolSizeInBytes)
         {
             Guard.MustBeGreaterThan(maxPoolSizeInBytes, 0, nameof(maxPoolSizeInBytes));
@@ -37,12 +37,6 @@ namespace SixLabors.ImageSharp.Memory
             this.pool = ArrayPool<byte>.Create(maxPoolSizeInBytes, 50);
         }
 
-        /// <inheritdoc />
-        internal override Buffer<T> Allocate<T>(int itemCount)
-        {
-            return this.Allocate<T>(itemCount, false);
-        }
-
         /// <inheritdoc />
         internal override Buffer<T> Allocate<T>(int itemCount, bool clear)
         {
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index df1ecbd84..6be7012e6 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -11,17 +11,6 @@ namespace SixLabors.ImageSharp.Memory
     /// </summary>
     public abstract class MemoryManager
     {
-        /// <summary>
-        /// Allocates a <see cref="Buffer{T}"/> of size <paramref name="size"/>.
-        /// Note: Depending on the implementation, the buffer may not cleared before
-        /// returning, so it may contain data from an earlier use.
-        /// </summary>
-        /// <typeparam name="T">Type of the data stored in the buffer</typeparam>
-        /// <param name="size">Size of the buffer to allocate</param>
-        /// <returns>A buffer of values of type <typeparamref name="T"/>.</returns>
-        internal abstract Buffer<T> Allocate<T>(int size)
-            where T : struct;
-
         /// <summary>
         /// Allocates a <see cref="Buffer{T}"/> of size <paramref name="size"/>, optionally
         /// clearing the buffer before it gets returned.
@@ -41,13 +30,5 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="buffer">The buffer to release</param>
         internal abstract void Release<T>(Buffer<T> buffer)
             where T : struct;
-
-        internal Buffer2D<T> Allocate2D<T>(int width, int height, bool clear = false)
-            where T : struct
-        {
-            Buffer<T> buffer = this.Allocate<T>(width * height, clear);
-
-            return new Buffer2D<T>(buffer, width, height);
-        }
     }
 }
diff --git a/src/ImageSharp/Memory/MemoryManagerExtensions.cs b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
new file mode 100644
index 000000000..8e1aa9850
--- /dev/null
+++ b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
@@ -0,0 +1,45 @@
+namespace SixLabors.ImageSharp.Memory
+{
+    /// <summary>
+    /// Extension methods for <see cref="MemoryManager"/>.
+    /// </summary>
+    internal static class MemoryManagerExtensions
+    {
+        /// <summary>
+        /// Allocates a <see cref="Buffer{T}"/> of size <paramref name="size"/>.
+        /// Note: Depending on the implementation, the buffer may not cleared before
+        /// returning, so it may contain data from an earlier use.
+        /// </summary>
+        /// <typeparam name="T">Type of the data stored in the buffer</typeparam>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/></param>
+        /// <param name="size">Size of the buffer to allocate</param>
+        /// <returns>A buffer of values of type <typeparamref name="T"/>.</returns>
+        public static Buffer<T> Allocate<T>(this MemoryManager memoryManager, int size)
+            where T : struct
+        {
+            return memoryManager.Allocate<T>(size, false);
+        }
+
+        public static Buffer<T> AllocateClean<T>(this MemoryManager memoryManager, int size)
+            where T : struct
+        {
+            return memoryManager.Allocate<T>(size, true);
+        }
+
+        public static Buffer2D<T> Allocate2D<T>(this MemoryManager memoryManager, int width, int height, bool clear)
+            where T : struct
+        {
+            Buffer<T> buffer = memoryManager.Allocate<T>(width * height, clear);
+
+            return new Buffer2D<T>(buffer, width, height);
+        }
+
+        public static Buffer2D<T> Allocate2D<T>(this MemoryManager memoryManager, int width, int height)
+            where T : struct =>
+            Allocate2D<T>(memoryManager, width, height, false);
+
+        public static Buffer2D<T> AllocateClean2D<T>(this MemoryManager memoryManager, int width, int height)
+            where T : struct =>
+            Allocate2D<T>(memoryManager, width, height, true);
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/NullMemoryManager.cs b/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
similarity index 68%
rename from src/ImageSharp/Memory/NullMemoryManager.cs
rename to src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
index d82f01353..2aefe898f 100644
--- a/src/ImageSharp/Memory/NullMemoryManager.cs
+++ b/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
@@ -3,14 +3,8 @@
     /// <summary>
     /// Implements <see cref="MemoryManager"/> by allocating new buffers on every call.
     /// </summary>
-    public class NullMemoryManager : MemoryManager
+    public class SimpleManagedMemoryManager : MemoryManager
     {
-        /// <inheritdoc />
-        internal override Buffer<T> Allocate<T>(int size)
-        {
-            return new Buffer<T>(new T[size], size);
-        }
-
         /// <inheritdoc />
         internal override Buffer<T> Allocate<T>(int size, bool clear)
         {
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
index e8463a266..1fa388da4 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
@@ -124,7 +124,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             // First process the columns. Since we are not using multiple threads startY and endY
             // are the upper and lower bounds of the source rectangle.
             // TODO: Using a transposed variant of 'firstPassPixels' could eliminate the need for the WeightsWindow.ComputeWeightedColumnSum() method, and improve speed!
-            using (var firstPassPixels = this.MemoryManager.Allocate2D<Vector4>(width, source.Height))
+            using (Buffer2D<Vector4> firstPassPixels = this.MemoryManager.Allocate2D<Vector4>(width, source.Height))
             {
                 firstPassPixels.Buffer.Clear();
 

From 27dade8d33b96398595bb4555080a1a60911166b Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Mon, 19 Feb 2018 17:37:05 +0100
Subject: [PATCH 25/70] dropping MemoryManager ctr. argument:

PngEncoder, WuQuantizer, ShapeRegion, ShapePath
---
 src/ImageSharp.Drawing/Paths/DrawPath.cs      |   2 +-
 src/ImageSharp.Drawing/Paths/FillPaths.cs     |   4 +-
 src/ImageSharp.Drawing/Paths/ShapePath.cs     |   5 +-
 src/ImageSharp.Drawing/Paths/ShapeRegion.cs   |  23 ++--
 .../Formats/Png/PngConfigurationModule.cs     |   2 +-
 src/ImageSharp/Formats/Png/PngDecoderCore.cs  |   3 +-
 src/ImageSharp/Formats/Png/PngEncoder.cs      |  15 +--
 src/ImageSharp/Formats/Png/PngEncoderCore.cs  |   2 +-
 .../Processors/Filters/PolaroidProcessor.cs   |   1 -
 src/ImageSharp/Quantizers/Quantize.cs         |   2 +-
 .../Quantizers/WuQuantizer{TPixel}.cs         |  52 ++++---
 .../Image/EncodeIndexedPng.cs                 |  10 +-
 .../ImageSharp.Benchmarks/Image/EncodePng.cs  |   2 +-
 .../Drawing/Paths/ShapeRegionTests.cs         | 127 ++++++++++--------
 .../Formats/GeneralFormatTests.cs             |   9 +-
 .../Formats/Png/PngEncoderTests.cs            |   2 +-
 .../Formats/Png/PngSmokeTests.cs              |   4 +-
 tests/ImageSharp.Tests/Image/ImageTests.cs    |   2 +-
 .../Quantization/QuantizedImageTests.cs       |   4 +-
 .../Tests/ReferenceCodecTests.cs              |   2 +-
 20 files changed, 131 insertions(+), 142 deletions(-)

diff --git a/src/ImageSharp.Drawing/Paths/DrawPath.cs b/src/ImageSharp.Drawing/Paths/DrawPath.cs
index a46d5751f..b6c821a60 100644
--- a/src/ImageSharp.Drawing/Paths/DrawPath.cs
+++ b/src/ImageSharp.Drawing/Paths/DrawPath.cs
@@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp
         public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, IPen<TPixel> pen, IPath path, GraphicsOptions options)
            where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(pen.StrokeFill, new ShapePath(source.GetMemoryManager(), path, pen), options);
+            return source.Fill(pen.StrokeFill, new ShapePath(path, pen), options);
         }
 
         /// <summary>
diff --git a/src/ImageSharp.Drawing/Paths/FillPaths.cs b/src/ImageSharp.Drawing/Paths/FillPaths.cs
index 5972c52a0..f554ed758 100644
--- a/src/ImageSharp.Drawing/Paths/FillPaths.cs
+++ b/src/ImageSharp.Drawing/Paths/FillPaths.cs
@@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp
         public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, IPath path, GraphicsOptions options)
           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(brush, new ShapeRegion(source.GetMemoryManager(), path), options);
+            return source.Fill(brush, new ShapeRegion(path), options);
         }
 
         /// <summary>
@@ -39,7 +39,7 @@ namespace SixLabors.ImageSharp
         public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, IPath path)
           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(brush, new ShapeRegion(source.GetMemoryManager(), path), GraphicsOptions.Default);
+            return source.Fill(brush, new ShapeRegion(path), GraphicsOptions.Default);
         }
 
         /// <summary>
diff --git a/src/ImageSharp.Drawing/Paths/ShapePath.cs b/src/ImageSharp.Drawing/Paths/ShapePath.cs
index 9e2b22a75..4c2278719 100644
--- a/src/ImageSharp.Drawing/Paths/ShapePath.cs
+++ b/src/ImageSharp.Drawing/Paths/ShapePath.cs
@@ -18,12 +18,11 @@ namespace SixLabors.ImageSharp.Drawing
         /// <summary>
         /// Initializes a new instance of the <see cref="ShapePath"/> class.
         /// </summary>
-        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="shape">The shape.</param>
         /// <param name="pen">The pen to apply to the shape.</param>
         // SixLabors.shape willbe moving to a Span/ReadOnlySpan based API shortly use ToArray for now.
-        public ShapePath(MemoryManager memoryManager, IPath shape, Pens.IPen pen)
-            : base(memoryManager, shape.GenerateOutline(pen.StrokeWidth, pen.StrokePattern.ToArray()))
+        public ShapePath(IPath shape, Pens.IPen pen)
+            : base(shape.GenerateOutline(pen.StrokeWidth, pen.StrokePattern.ToArray()))
         {
         }
     }
diff --git a/src/ImageSharp.Drawing/Paths/ShapeRegion.cs b/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
index 77a3b0115..072a38cf8 100644
--- a/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
+++ b/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
@@ -15,16 +15,12 @@ namespace SixLabors.ImageSharp.Drawing
     /// </summary>
     internal class ShapeRegion : Region
     {
-        private readonly MemoryManager memoryManager;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ShapeRegion"/> class.
         /// </summary>
-        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="shape">The shape.</param>
-        public ShapeRegion(MemoryManager memoryManager, IPath shape)
+        public ShapeRegion(IPath shape)
         {
-            this.memoryManager = memoryManager;
             this.Shape = shape.AsClosedPath();
             int left = (int)MathF.Floor(shape.Bounds.Left);
             int top = (int)MathF.Floor(shape.Bounds.Top);
@@ -50,18 +46,17 @@ namespace SixLabors.ImageSharp.Drawing
         {
             var start = new PointF(this.Bounds.Left - 1, y);
             var end = new PointF(this.Bounds.Right + 1, y);
-            using (var innerBuffer = this.memoryManager.Allocate<PointF>(buffer.Length))
-            {
-                PointF[] array = innerBuffer.Array;
-                int count = this.Shape.FindIntersections(start, end, array, 0);
 
-                for (int i = 0; i < count; i++)
-                {
-                    buffer[i + offset] = array[i].X;
-                }
+            // TODO: This is a temporal workaround because of the lack of Span<T> API-s on IPath. We should use MemoryManager.Allocate() here!
+            PointF[] innerBuffer = new PointF[buffer.Length];
+            int count = this.Shape.FindIntersections(start, end, innerBuffer, 0);
 
-                return count;
+            for (int i = 0; i < count; i++)
+            {
+                buffer[i + offset] = innerBuffer[i].X;
             }
+
+            return count;
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Png/PngConfigurationModule.cs b/src/ImageSharp/Formats/Png/PngConfigurationModule.cs
index abf5bc6bb..ab6f31d49 100644
--- a/src/ImageSharp/Formats/Png/PngConfigurationModule.cs
+++ b/src/ImageSharp/Formats/Png/PngConfigurationModule.cs
@@ -11,7 +11,7 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// <inheritdoc/>
         public void Configure(Configuration config)
         {
-            config.SetEncoder(ImageFormats.Png, new PngEncoder(config.MemoryManager));
+            config.SetEncoder(ImageFormats.Png, new PngEncoder());
             config.SetDecoder(ImageFormats.Png, new PngDecoder());
             config.AddImageFormatDetector(new PngImageFormatDetector());
         }
diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index 0546c5ee3..45d6fa3a2 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -190,7 +190,7 @@ namespace SixLabors.ImageSharp.Formats.Png
             this.textEncoding = options.TextEncoding ?? PngConstants.DefaultEncoding;
             this.ignoreMetadata = options.IgnoreMetadata;
         }
-        
+
         private MemoryManager MemoryManager => this.configuration.MemoryManager;
 
         /// <summary>
@@ -441,7 +441,6 @@ namespace SixLabors.ImageSharp.Formats.Png
             this.scanline = this.configuration.MemoryManager.Allocate<byte>(this.bytesPerScanline, true);
         }
 
-
         /// <summary>
         /// Calculates the correct number of bits per pixel for the given color type.
         /// </summary>
diff --git a/src/ImageSharp/Formats/Png/PngEncoder.cs b/src/ImageSharp/Formats/Png/PngEncoder.cs
index ee5651f2d..0c40ccf2a 100644
--- a/src/ImageSharp/Formats/Png/PngEncoder.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoder.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.IO;
-
+using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Quantizers;
@@ -14,17 +14,6 @@ namespace SixLabors.ImageSharp.Formats.Png
     /// </summary>
     public sealed class PngEncoder : IImageEncoder, IPngEncoderOptions
     {
-        private readonly MemoryManager memoryManager;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PngEncoder"/> class.
-        /// </summary>
-        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
-        public PngEncoder(MemoryManager memoryManager)
-        {
-            this.memoryManager = memoryManager;
-        }
-
         /// <summary>
         /// Gets or sets a value indicating whether the metadata should be ignored when the image is being encoded.
         /// </summary>
@@ -79,7 +68,7 @@ namespace SixLabors.ImageSharp.Formats.Png
         public void Encode<TPixel>(Image<TPixel> image, Stream stream)
             where TPixel : struct, IPixel<TPixel>
         {
-            using (var encoder = new PngEncoderCore(this.memoryManager, this))
+            using (var encoder = new PngEncoderCore(image.GetMemoryManager(), this))
             {
                 encoder.Encode(image, stream);
             }
diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
index e8e1726e9..d53125089 100644
--- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
@@ -508,7 +508,7 @@ namespace SixLabors.ImageSharp.Formats.Png
 
             if (this.quantizer == null)
             {
-                this.quantizer = new WuQuantizer<TPixel>(this.memoryManager);
+                this.quantizer = new WuQuantizer<TPixel>();
             }
 
             // Quantize the image returning a palette. This boxing is icky.
diff --git a/src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor.cs
index f5b4b7192..152d586af 100644
--- a/src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
diff --git a/src/ImageSharp/Quantizers/Quantize.cs b/src/ImageSharp/Quantizers/Quantize.cs
index 11494a867..0e3d806da 100644
--- a/src/ImageSharp/Quantizers/Quantize.cs
+++ b/src/ImageSharp/Quantizers/Quantize.cs
@@ -29,7 +29,7 @@ namespace SixLabors.ImageSharp
             switch (mode)
             {
                 case Quantization.Wu:
-                    quantizer = new WuQuantizer<TPixel>(source.GetMemoryManager());
+                    quantizer = new WuQuantizer<TPixel>();
                     break;
 
                 case Quantization.Palette:
diff --git a/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
index 966ec6034..8f89c4961 100644
--- a/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
@@ -36,8 +36,6 @@ namespace SixLabors.ImageSharp.Quantizers
     public class WuQuantizer<TPixel> : QuantizerBase<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
-        private readonly MemoryManager memoryManager;
-
         /// <summary>
         /// The index bits.
         /// </summary>
@@ -121,15 +119,13 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <summary>
         /// Initializes a new instance of the <see cref="WuQuantizer{TPixel}"/> class.
         /// </summary>
-        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <remarks>
         /// The Wu quantizer is a two pass algorithm. The initial pass sets up the 3-D color histogram,
         /// the second pass quantizes a color based on the position in the histogram.
         /// </remarks>
-        public WuQuantizer(MemoryManager memoryManager)
+        public WuQuantizer()
             : base(false)
         {
-            this.memoryManager = memoryManager;
         }
 
         /// <inheritdoc/>
@@ -141,15 +137,17 @@ namespace SixLabors.ImageSharp.Quantizers
             this.palette = null;
             this.colorMap.Clear();
 
+            MemoryManager memoryManager = image.MemoryManager;
+
             try
             {
-                this.vwt = this.memoryManager.Allocate<long>(TableLength, true);
-                this.vmr = this.memoryManager.Allocate<long>(TableLength, true);
-                this.vmg = this.memoryManager.Allocate<long>(TableLength, true);
-                this.vmb = this.memoryManager.Allocate<long>(TableLength, true);
-                this.vma = this.memoryManager.Allocate<long>(TableLength, true);
-                this.m2 = this.memoryManager.Allocate<float>(TableLength, true);
-                this.tag = this.memoryManager.Allocate<byte>(TableLength, true);
+                this.vwt = memoryManager.AllocateClean<long>(TableLength);
+                this.vmr = memoryManager.AllocateClean<long>(TableLength);
+                this.vmg = memoryManager.AllocateClean<long>(TableLength);
+                this.vmb = memoryManager.AllocateClean<long>(TableLength);
+                this.vma = memoryManager.AllocateClean<long>(TableLength);
+                this.m2 = memoryManager.AllocateClean<float>(TableLength);
+                this.tag = memoryManager.AllocateClean<byte>(TableLength);
 
                 return base.Quantize(image, this.colors);
             }
@@ -240,7 +238,7 @@ namespace SixLabors.ImageSharp.Quantizers
                 }
             }
 
-            this.Get3DMoments();
+            this.Get3DMoments(source.MemoryManager);
             this.BuildCube();
         }
 
@@ -458,21 +456,21 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <summary>
         /// Converts the histogram into moments so that we can rapidly calculate the sums of the above quantities over any desired box.
         /// </summary>
-        private void Get3DMoments()
+        private void Get3DMoments(MemoryManager memoryManager)
         {
-            using (Buffer<long> volume = this.memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (Buffer<long> volumeR = this.memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (Buffer<long> volumeG = this.memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (Buffer<long> volumeB = this.memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (Buffer<long> volumeA = this.memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (Buffer<float> volume2 = this.memoryManager.Allocate<float>(IndexCount * IndexAlphaCount))
-
-            using (Buffer<long> area = this.memoryManager.Allocate<long>(IndexAlphaCount))
-            using (Buffer<long> areaR = this.memoryManager.Allocate<long>(IndexAlphaCount))
-            using (Buffer<long> areaG = this.memoryManager.Allocate<long>(IndexAlphaCount))
-            using (Buffer<long> areaB = this.memoryManager.Allocate<long>(IndexAlphaCount))
-            using (Buffer<long> areaA = this.memoryManager.Allocate<long>(IndexAlphaCount))
-            using (Buffer<float> area2 = this.memoryManager.Allocate<float>(IndexAlphaCount))
+            using (Buffer<long> volume = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (Buffer<long> volumeR = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (Buffer<long> volumeG = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (Buffer<long> volumeB = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (Buffer<long> volumeA = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (Buffer<float> volume2 = memoryManager.Allocate<float>(IndexCount * IndexAlphaCount))
+
+            using (Buffer<long> area = memoryManager.Allocate<long>(IndexAlphaCount))
+            using (Buffer<long> areaR = memoryManager.Allocate<long>(IndexAlphaCount))
+            using (Buffer<long> areaG = memoryManager.Allocate<long>(IndexAlphaCount))
+            using (Buffer<long> areaB = memoryManager.Allocate<long>(IndexAlphaCount))
+            using (Buffer<long> areaA = memoryManager.Allocate<long>(IndexAlphaCount))
+            using (Buffer<float> area2 = memoryManager.Allocate<float>(IndexAlphaCount))
             {
                 for (int r = 1; r < IndexCount; r++)
                 {
diff --git a/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs b/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
index 4ce5f5083..e5eb29544 100644
--- a/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
+++ b/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
@@ -54,7 +54,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoder encoder = new PngEncoder(Configuration.Default.MemoryManager) { Quantizer = new OctreeQuantizer<Rgba32>(), PaletteSize = 256 };
+                PngEncoder encoder = new PngEncoder() { Quantizer = new OctreeQuantizer<Rgba32>(), PaletteSize = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, encoder);
             }
@@ -65,7 +65,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoder options = new PngEncoder(Configuration.Default.MemoryManager) { Quantizer = new OctreeQuantizer<Rgba32> { Dither = false }, PaletteSize = 256 };
+                PngEncoder options = new PngEncoder() { Quantizer = new OctreeQuantizer<Rgba32> { Dither = false }, PaletteSize = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
@@ -76,7 +76,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoder options = new PngEncoder(Configuration.Default.MemoryManager) { Quantizer = new PaletteQuantizer<Rgba32>(), PaletteSize = 256 };
+                PngEncoder options = new PngEncoder() { Quantizer = new PaletteQuantizer<Rgba32>(), PaletteSize = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
@@ -87,7 +87,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoder options = new PngEncoder(Configuration.Default.MemoryManager) { Quantizer = new PaletteQuantizer<Rgba32> { Dither = false }, PaletteSize = 256 };
+                PngEncoder options = new PngEncoder() { Quantizer = new PaletteQuantizer<Rgba32> { Dither = false }, PaletteSize = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
@@ -98,7 +98,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoder options = new PngEncoder(Configuration.Default.MemoryManager) { Quantizer = new WuQuantizer<Rgba32>(Configuration.Default.MemoryManager), PaletteSize = 256 };
+                PngEncoder options = new PngEncoder() { Quantizer = new WuQuantizer<Rgba32>(), PaletteSize = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
diff --git a/tests/ImageSharp.Benchmarks/Image/EncodePng.cs b/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
index 383505e0d..53522a51f 100644
--- a/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
+++ b/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
@@ -74,7 +74,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
                 new OctreeQuantizer<Rgba32>()
                 : new PaletteQuantizer<Rgba32>();
 
-                var options = new PngEncoder(Configuration.Default.MemoryManager) { Quantizer = quantizer };
+                var options = new PngEncoder() { Quantizer = quantizer };
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
         }
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/ShapeRegionTests.cs b/tests/ImageSharp.Tests/Drawing/Paths/ShapeRegionTests.cs
index d3fcc5322..5ca09ad1d 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/ShapeRegionTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/ShapeRegionTests.cs
@@ -1,131 +1,144 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.IO;
-using System.Numerics;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Drawing;
-using SixLabors.ImageSharp.Drawing.Brushes;
-using SixLabors.ImageSharp.Drawing.Pens;
-using SixLabors.ImageSharp.Drawing.Processors;
-using SixLabors.ImageSharp.Processing;
-using Moq;
-using SixLabors.Primitives;
-using SixLabors.Shapes;
-using Xunit;
-
 namespace SixLabors.ImageSharp.Tests.Drawing.Paths
 {
-    public class ShapeRegionTests 
+    using System;
+
+    using Moq;
+
+    using SixLabors.ImageSharp.Drawing;
+    using SixLabors.Primitives;
+    using SixLabors.Shapes;
+
+    using Xunit;
+
+    public class ShapeRegionTests
     {
         private readonly Mock<IPath> pathMock;
-        private readonly SixLabors.Primitives.RectangleF bounds;
+
+        private readonly RectangleF bounds;
 
         public ShapeRegionTests()
         {
             this.pathMock = new Mock<IPath>();
 
             this.bounds = new RectangleF(10.5f, 10, 10, 10);
-            pathMock.Setup(x => x.Bounds).Returns(this.bounds);
+            this.pathMock.Setup(x => x.Bounds).Returns(this.bounds);
             // wire up the 2 mocks to reference eachother
-            pathMock.Setup(x => x.AsClosedPath()).Returns(() => pathMock.Object);
+            this.pathMock.Setup(x => x.AsClosedPath()).Returns(() => this.pathMock.Object);
         }
 
         [Fact]
         public void ShapeRegionWithPathCallsAsShape()
         {
-            new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
+            new ShapeRegion(this.pathMock.Object);
 
-            pathMock.Verify(x => x.AsClosedPath());
+            this.pathMock.Verify(x => x.AsClosedPath());
         }
 
         [Fact]
         public void ShapeRegionWithPathRetainsShape()
         {
-            ShapeRegion region = new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
+            ShapeRegion region = new ShapeRegion(this.pathMock.Object);
 
-            Assert.Equal(pathMock.Object, region.Shape);
+            Assert.Equal(this.pathMock.Object, region.Shape);
         }
 
         [Fact]
         public void ShapeRegionFromPathConvertsBoundsProxyToShape()
         {
-            ShapeRegion region = new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
+            ShapeRegion region = new ShapeRegion(this.pathMock.Object);
 
-            Assert.Equal(Math.Floor(bounds.Left), region.Bounds.Left);
-            Assert.Equal(Math.Ceiling(bounds.Right), region.Bounds.Right);
+            Assert.Equal(Math.Floor(this.bounds.Left), region.Bounds.Left);
+            Assert.Equal(Math.Ceiling(this.bounds.Right), region.Bounds.Right);
 
-            pathMock.Verify(x => x.Bounds);
+            this.pathMock.Verify(x => x.Bounds);
         }
 
         [Fact]
         public void ShapeRegionFromPathMaxIntersectionsProxyToShape()
         {
-            ShapeRegion region = new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
+            ShapeRegion region = new ShapeRegion(this.pathMock.Object);
 
             int i = region.MaxIntersections;
-            pathMock.Verify(x => x.MaxIntersections);
+            this.pathMock.Verify(x => x.MaxIntersections);
         }
 
         [Fact]
         public void ShapeRegionFromPathScanYProxyToShape()
         {
             int yToScan = 10;
-            ShapeRegion region = new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
-
-            pathMock.Setup(x => x.FindIntersections(It.IsAny<PointF>(), It.IsAny<PointF>(), It.IsAny<PointF[]>(), It.IsAny<int>()))
-                .Callback<PointF, PointF, PointF[], int>((s, e, b, o) => {
-                    Assert.Equal(yToScan, s.Y);
-                    Assert.Equal(yToScan, e.Y);
-                    Assert.True(s.X < bounds.Left);
-                    Assert.True(e.X > bounds.Right);
-                }).Returns(0);
+            ShapeRegion region = new ShapeRegion(this.pathMock.Object);
+
+            this.pathMock
+                .Setup(
+                    x => x.FindIntersections(
+                        It.IsAny<PointF>(),
+                        It.IsAny<PointF>(),
+                        It.IsAny<PointF[]>(),
+                        It.IsAny<int>())).Callback<PointF, PointF, PointF[], int>(
+                    (s, e, b, o) =>
+                        {
+                            Assert.Equal(yToScan, s.Y);
+                            Assert.Equal(yToScan, e.Y);
+                            Assert.True(s.X < this.bounds.Left);
+                            Assert.True(e.X > this.bounds.Right);
+                        }).Returns(0);
 
             int i = region.Scan(yToScan, new float[0], 0);
 
-            pathMock.Verify(x => x.FindIntersections(It.IsAny<PointF>(), It.IsAny<PointF>(), It.IsAny<PointF[]>(), It.IsAny<int>()), Times.Once);
+            this.pathMock.Verify(
+                x => x.FindIntersections(It.IsAny<PointF>(), It.IsAny<PointF>(), It.IsAny<PointF[]>(), It.IsAny<int>()),
+                Times.Once);
         }
 
         [Fact]
         public void ShapeRegionFromShapeScanYProxyToShape()
         {
             int yToScan = 10;
-            ShapeRegion region = new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
-
-            pathMock.Setup(x => x.FindIntersections(It.IsAny<PointF>(), It.IsAny<PointF>(), It.IsAny<PointF[]>(), It.IsAny<int>()))
-                .Callback<PointF, PointF, PointF[], int>((s, e, b, o) => {
-                    Assert.Equal(yToScan, s.Y);
-                    Assert.Equal(yToScan, e.Y);
-                    Assert.True(s.X < bounds.Left);
-                    Assert.True(e.X > bounds.Right);
-                }).Returns(0);
+            ShapeRegion region = new ShapeRegion(this.pathMock.Object);
+
+            this.pathMock
+                .Setup(
+                    x => x.FindIntersections(
+                        It.IsAny<PointF>(),
+                        It.IsAny<PointF>(),
+                        It.IsAny<PointF[]>(),
+                        It.IsAny<int>())).Callback<PointF, PointF, PointF[], int>(
+                    (s, e, b, o) =>
+                        {
+                            Assert.Equal(yToScan, s.Y);
+                            Assert.Equal(yToScan, e.Y);
+                            Assert.True(s.X < this.bounds.Left);
+                            Assert.True(e.X > this.bounds.Right);
+                        }).Returns(0);
 
             int i = region.Scan(yToScan, new float[0], 0);
 
-            pathMock.Verify(x => x.FindIntersections(It.IsAny<PointF>(), It.IsAny<PointF>(), It.IsAny<PointF[]>(), It.IsAny<int>()), Times.Once);
+            this.pathMock.Verify(
+                x => x.FindIntersections(It.IsAny<PointF>(), It.IsAny<PointF>(), It.IsAny<PointF[]>(), It.IsAny<int>()),
+                Times.Once);
         }
 
         [Fact]
         public void ShapeRegionFromShapeConvertsBoundsProxyToShape()
         {
-            ShapeRegion region = new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
+            ShapeRegion region = new ShapeRegion(this.pathMock.Object);
 
-            Assert.Equal(Math.Floor(bounds.Left), region.Bounds.Left);
-            Assert.Equal(Math.Ceiling(bounds.Right), region.Bounds.Right);
+            Assert.Equal(Math.Floor(this.bounds.Left), region.Bounds.Left);
+            Assert.Equal(Math.Ceiling(this.bounds.Right), region.Bounds.Right);
 
-            pathMock.Verify(x => x.Bounds);
+            this.pathMock.Verify(x => x.Bounds);
         }
 
         [Fact]
         public void ShapeRegionFromShapeMaxIntersectionsProxyToShape()
         {
-            ShapeRegion region = new ShapeRegion(Configuration.Default.MemoryManager, pathMock.Object);
+            ShapeRegion region = new ShapeRegion(this.pathMock.Object);
 
             int i = region.MaxIntersections;
-            pathMock.Verify(x => x.MaxIntersections);
+            this.pathMock.Verify(x => x.MaxIntersections);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs b/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs
index a6a883d42..22a811fee 100644
--- a/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs
+++ b/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs
@@ -14,9 +14,6 @@ namespace SixLabors.ImageSharp.Tests
 {
     using System;
 
-    using SixLabors.ImageSharp.Advanced;
-    using SixLabors.ImageSharp.Memory;
-
     public class GeneralFormatTests : FileTestBase
     {
         [Theory]
@@ -179,7 +176,7 @@ namespace SixLabors.ImageSharp.Tests
             {
                 using (var memoryStream = new MemoryStream())
                 {
-                    image.Save(memoryStream, GetEncoder(image.GetMemoryManager(), format));
+                    image.Save(memoryStream, GetEncoder(format));
                     memoryStream.Position = 0;
 
                     var imageInfo = Image.Identify(memoryStream);
@@ -190,12 +187,12 @@ namespace SixLabors.ImageSharp.Tests
             }
         }
 
-        private static IImageEncoder GetEncoder(MemoryManager memoryManager, string format)
+        private static IImageEncoder GetEncoder(string format)
         {
             switch (format)
             {
                 case "png":
-                    return new PngEncoder(memoryManager);
+                    return new PngEncoder();
                 case "gif":
                     return new GifEncoder();
                 case "bmp":
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
index ba6c19e46..28f156279 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
@@ -155,7 +155,7 @@ namespace SixLabors.ImageSharp.Tests
             using (Image<TPixel> image = provider.GetImage())
             using (var ms = new MemoryStream())
             {
-                image.Save(ms, new PngEncoder(Configuration.Default.MemoryManager));
+                image.Save(ms, new PngEncoder());
                 
                 byte[] data = ms.ToArray().Take(8).ToArray(); 
                 byte[] expected = {
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
index 3a73867ba..fc17df93d 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
@@ -23,7 +23,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
             {
                 // image.Save(provider.Utility.GetTestOutputFileName("bmp"));
 
-                image.Save(ms, new PngEncoder(Configuration.Default.MemoryManager));
+                image.Save(ms, new PngEncoder());
                 ms.Position = 0;
                 using (Image<Rgba32> img2 = Image.Load<Rgba32>(ms, new PngDecoder()))
                 {
@@ -110,7 +110,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
                 image.Mutate(x => x.Resize(100, 100));
                 // image.Save(provider.Utility.GetTestOutputFileName("png", "resize"));
 
-                image.Save(ms, new PngEncoder(Configuration.Default.MemoryManager));
+                image.Save(ms, new PngEncoder());
                 ms.Position = 0;
                 using (Image<Rgba32> img2 = Image.Load<Rgba32>(ms, new PngDecoder()))
                 {
diff --git a/tests/ImageSharp.Tests/Image/ImageTests.cs b/tests/ImageSharp.Tests/Image/ImageTests.cs
index 45ecf60a0..da813f428 100644
--- a/tests/ImageSharp.Tests/Image/ImageTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageTests.cs
@@ -103,7 +103,7 @@ namespace SixLabors.ImageSharp.Tests
 
             using (Image<Rgba32> image = new Image<Rgba32>(10, 10))
             {
-                image.Save(file, new PngEncoder(Configuration.Default.MemoryManager));
+                image.Save(file, new PngEncoder());
             }
             using (Image<Rgba32> img = Image.Load(file, out var mime))
             {
diff --git a/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs b/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
index 5d569aa8f..18fd29237 100644
--- a/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
+++ b/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
@@ -12,7 +12,7 @@
         {
             var palette = new PaletteQuantizer<Rgba32>();
             var octree = new OctreeQuantizer<Rgba32>();
-            var wu = new WuQuantizer<Rgba32>(Configuration.Default.MemoryManager);
+            var wu = new WuQuantizer<Rgba32>();
 
             Assert.True(palette.Dither);
             Assert.True(octree.Dither);
@@ -73,7 +73,7 @@
             {
                 Assert.True(image[0, 0].Equals(default(TPixel)));
 
-                IQuantizer<TPixel> quantizer = new WuQuantizer<TPixel>(Configuration.Default.MemoryManager) { Dither = dither };
+                IQuantizer<TPixel> quantizer = new WuQuantizer<TPixel>() { Dither = dither };
 
                 foreach (ImageFrame<TPixel> frame in image.Frames)
                 {
diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs
index b454f1608..dde34fcc4 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Tests
                     sourceImage.Mutate(c => c.Opacity(1));
                 }
 
-                var encoder = new PngEncoder(Configuration.Default.MemoryManager) { PngColorType = pngColorType };
+                var encoder = new PngEncoder() { PngColorType = pngColorType };
                 return provider.Utility.SaveTestOutputFile(sourceImage, "png", encoder);
             }
         }

From 6a2bd3d617a70d4c30d8846e46be9549efa08c4d Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Mon, 19 Feb 2018 18:03:35 +0100
Subject: [PATCH 26/70] introducing FakeBuffer<T> workaround

---
 .../Processors/FillRegionProcessor.cs         |  4 +-
 .../Memory/ArrayPoolMemoryManager.cs          |  6 +-
 src/ImageSharp/Memory/FakeBuffer.cs           | 64 +++++++++++++++++++
 src/ImageSharp/Memory/MemoryManager.cs        | 16 ++++-
 .../Memory/SimpleManagedMemoryManager.cs      |  4 +-
 5 files changed, 84 insertions(+), 10 deletions(-)
 create mode 100644 src/ImageSharp/Memory/FakeBuffer.cs

diff --git a/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
index d5bc40107..fc3f289ab 100644
--- a/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
@@ -99,8 +99,8 @@ namespace SixLabors.ImageSharp.Drawing.Processors
             using (BrushApplicator<TPixel> applicator = this.Brush.CreateApplicator(source, rect, this.Options))
             {
                 int scanlineWidth = maxX - minX;
-                using (var buffer = source.MemoryManager.Allocate<float>(maxIntersections))
-                using (var scanline = source.MemoryManager.Allocate<float>(scanlineWidth))
+                using (FakeBuffer<float> buffer = source.MemoryManager.AllocateFake<float>(maxIntersections))
+                using (FakeBuffer<float> scanline = source.MemoryManager.AllocateFake<float>(scanlineWidth))
                 {
                     bool scanlineDirty = true;
                     for (int y = minY; y < maxY; y++)
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index 86776fd35..0cb1e38f8 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -38,13 +38,13 @@ namespace SixLabors.ImageSharp.Memory
         }
 
         /// <inheritdoc />
-        internal override Buffer<T> Allocate<T>(int itemCount, bool clear)
+        internal override Buffer<T> Allocate<T>(int length, bool clear)
         {
             int itemSizeBytes = Unsafe.SizeOf<T>();
-            int bufferSizeInBytes = itemCount * itemSizeBytes;
+            int bufferSizeInBytes = length * itemSizeBytes;
 
             byte[] byteBuffer = this.pool.Rent(bufferSizeInBytes);
-            var buffer = new Buffer<T>(Unsafe.As<T[]>(byteBuffer), itemCount, this);
+            var buffer = new Buffer<T>(Unsafe.As<T[]>(byteBuffer), length, this);
             if (clear)
             {
                 buffer.Clear();
diff --git a/src/ImageSharp/Memory/FakeBuffer.cs b/src/ImageSharp/Memory/FakeBuffer.cs
new file mode 100644
index 000000000..e4bc4e463
--- /dev/null
+++ b/src/ImageSharp/Memory/FakeBuffer.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Runtime.CompilerServices;
+
+namespace SixLabors.ImageSharp.Memory
+{
+    /// <summary>
+    /// Temporal workaround providing a "Buffer" based on a generic array without the 'Unsafe.As()' hackery.
+    /// </summary>
+    internal class FakeBuffer<T> : IBuffer<T>
+        where T : struct
+    {
+        public FakeBuffer(T[] array)
+        {
+            this.Array = array;
+        }
+
+        public T[] Array { get; }
+
+        public Span<T> Span => this.Array;
+
+        public int Length => this.Array.Length;
+
+        /// <summary>
+        /// Returns a reference to specified element of the buffer.
+        /// </summary>
+        /// <param name="index">The index</param>
+        /// <returns>The reference to the specified element</returns>
+        public ref T this[int index]
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get
+            {
+                DebugGuard.MustBeLessThan(index, this.Length, nameof(index));
+
+                Span<T> span = this.Span;
+                return ref span[index];
+            }
+        }
+
+        /// <summary>
+        /// Converts <see cref="Buffer{T}"/> to an <see cref="ReadOnlySpan{T}"/>.
+        /// </summary>
+        /// <param name="buffer">The <see cref="Buffer{T}"/> to convert.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static implicit operator ReadOnlySpan<T>(FakeBuffer<T> buffer)
+        {
+            return new ReadOnlySpan<T>(buffer.Array, 0, buffer.Length);
+        }
+
+        /// <summary>
+        /// Converts <see cref="Buffer{T}"/> to an <see cref="Span{T}"/>.
+        /// </summary>
+        /// <param name="buffer">The <see cref="Buffer{T}"/> to convert.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static implicit operator Span<T>(FakeBuffer<T> buffer)
+        {
+            return new Span<T>(buffer.Array, 0, buffer.Length);
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index 6be7012e6..6bad01cea 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -12,14 +12,14 @@ namespace SixLabors.ImageSharp.Memory
     public abstract class MemoryManager
     {
         /// <summary>
-        /// Allocates a <see cref="Buffer{T}"/> of size <paramref name="size"/>, optionally
+        /// Allocates a <see cref="Buffer{T}"/> of size <paramref name="length"/>, optionally
         /// clearing the buffer before it gets returned.
         /// </summary>
         /// <typeparam name="T">Type of the data stored in the buffer</typeparam>
-        /// <param name="size">Size of the buffer to allocate</param>
+        /// <param name="length">Size of the buffer to allocate</param>
         /// <param name="clear">True to clear the backing memory of the buffer</param>
         /// <returns>A buffer of values of type <typeparamref name="T"/>.</returns>
-        internal abstract Buffer<T> Allocate<T>(int size, bool clear)
+        internal abstract Buffer<T> Allocate<T>(int length, bool clear)
             where T : struct;
 
         /// <summary>
@@ -30,5 +30,15 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="buffer">The buffer to release</param>
         internal abstract void Release<T>(Buffer<T> buffer)
             where T : struct;
+
+        /// <summary>
+        /// Temporal workaround. A method providing a "Buffer" based on a generic array without the 'Unsafe.As()' hackery.
+        /// Should be replaced with 'Allocate()' as soon as SixLabors.Shapes has Span-based API-s!
+        /// </summary>
+        internal FakeBuffer<T> AllocateFake<T>(int length)
+            where T : struct
+        {
+            return new FakeBuffer<T>(new T[length]);
+        }
     }
 }
diff --git a/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs b/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
index 2aefe898f..7a92d6c9f 100644
--- a/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
+++ b/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
@@ -6,9 +6,9 @@
     public class SimpleManagedMemoryManager : MemoryManager
     {
         /// <inheritdoc />
-        internal override Buffer<T> Allocate<T>(int size, bool clear)
+        internal override Buffer<T> Allocate<T>(int length, bool clear)
         {
-            return new Buffer<T>(new T[size], size);
+            return new Buffer<T>(new T[length], length);
         }
 
         /// <inheritdoc />

From d8ebe2f03d16895dd23c4489f3c60beaef8654d8 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Mon, 19 Feb 2018 19:00:34 +0100
Subject: [PATCH 27/70] IManagedByteBuffer

---
 src/ImageSharp/Memory/ArrayPoolMemoryManager.cs | 12 ++++++++++++
 src/ImageSharp/Memory/IManagedByteBuffer.cs     | 13 +++++++++++++
 src/ImageSharp/Memory/ManagedByteBuffer.cs      | 10 ++++++++++
 src/ImageSharp/Memory/MemoryManager.cs          |  2 ++
 .../Memory/MemoryManagerExtensions.cs           | 17 +++++++++++------
 .../Memory/SimpleManagedMemoryManager.cs        |  5 +++++
 6 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 src/ImageSharp/Memory/IManagedByteBuffer.cs
 create mode 100644 src/ImageSharp/Memory/ManagedByteBuffer.cs

diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index 0cb1e38f8..403464334 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -53,6 +53,18 @@ namespace SixLabors.ImageSharp.Memory
             return buffer;
         }
 
+        internal override IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear)
+        {
+            byte[] array = this.pool.Rent(length);
+            var buffer = new ManagedByteBuffer(array, length, this);
+            if (clear)
+            {
+                buffer.Clear();
+            }
+
+            return buffer;
+        }
+
         /// <inheritdoc />
         internal override void Release<T>(Buffer<T> buffer)
         {
diff --git a/src/ImageSharp/Memory/IManagedByteBuffer.cs b/src/ImageSharp/Memory/IManagedByteBuffer.cs
new file mode 100644
index 000000000..541957f42
--- /dev/null
+++ b/src/ImageSharp/Memory/IManagedByteBuffer.cs
@@ -0,0 +1,13 @@
+namespace SixLabors.ImageSharp.Memory
+{
+    /// <summary>
+    /// Represents a byte buffer backed by a managed array.
+    /// </summary>
+    internal interface IManagedByteBuffer : IBuffer<byte>
+    {
+        /// <summary>
+        /// Gets the managed array backing this buffer instance.
+        /// </summary>
+        byte[] Array { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/ManagedByteBuffer.cs b/src/ImageSharp/Memory/ManagedByteBuffer.cs
new file mode 100644
index 000000000..17fe945d6
--- /dev/null
+++ b/src/ImageSharp/Memory/ManagedByteBuffer.cs
@@ -0,0 +1,10 @@
+namespace SixLabors.ImageSharp.Memory
+{
+    internal class ManagedByteBuffer : Buffer<byte>, IManagedByteBuffer
+    {
+        internal ManagedByteBuffer(byte[] array, int length, MemoryManager memoryManager)
+            : base(array, length, memoryManager)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index 6bad01cea..cac9b785b 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -22,6 +22,8 @@ namespace SixLabors.ImageSharp.Memory
         internal abstract Buffer<T> Allocate<T>(int length, bool clear)
             where T : struct;
 
+        internal abstract IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear);
+
         /// <summary>
         /// Releases the memory allocated for <paramref name="buffer"/>. After this, the buffer
         /// is no longer usable.
diff --git a/src/ImageSharp/Memory/MemoryManagerExtensions.cs b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
index 8e1aa9850..877230788 100644
--- a/src/ImageSharp/Memory/MemoryManagerExtensions.cs
+++ b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
@@ -6,24 +6,29 @@
     internal static class MemoryManagerExtensions
     {
         /// <summary>
-        /// Allocates a <see cref="Buffer{T}"/> of size <paramref name="size"/>.
+        /// Allocates a <see cref="Buffer{T}"/> of size <paramref name="length"/>.
         /// Note: Depending on the implementation, the buffer may not cleared before
         /// returning, so it may contain data from an earlier use.
         /// </summary>
         /// <typeparam name="T">Type of the data stored in the buffer</typeparam>
         /// <param name="memoryManager">The <see cref="MemoryManager"/></param>
-        /// <param name="size">Size of the buffer to allocate</param>
+        /// <param name="length">Size of the buffer to allocate</param>
         /// <returns>A buffer of values of type <typeparamref name="T"/>.</returns>
-        public static Buffer<T> Allocate<T>(this MemoryManager memoryManager, int size)
+        public static Buffer<T> Allocate<T>(this MemoryManager memoryManager, int length)
             where T : struct
         {
-            return memoryManager.Allocate<T>(size, false);
+            return memoryManager.Allocate<T>(length, false);
         }
 
-        public static Buffer<T> AllocateClean<T>(this MemoryManager memoryManager, int size)
+        public static Buffer<T> AllocateClean<T>(this MemoryManager memoryManager, int length)
             where T : struct
         {
-            return memoryManager.Allocate<T>(size, true);
+            return memoryManager.Allocate<T>(length, true);
+        }
+
+        public static IManagedByteBuffer AllocateCleanManagedByteBuffer(this MemoryManager memoryManager, int length)
+        {
+            return memoryManager.AllocateManagedByteBuffer(length, true);
         }
 
         public static Buffer2D<T> Allocate2D<T>(this MemoryManager memoryManager, int width, int height, bool clear)
diff --git a/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs b/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
index 7a92d6c9f..12d8582c7 100644
--- a/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
+++ b/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
@@ -11,6 +11,11 @@
             return new Buffer<T>(new T[length], length);
         }
 
+        internal override IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear)
+        {
+            return new ManagedByteBuffer(new byte[length], length, this);
+        }
+
         /// <inheritdoc />
         internal override void Release<T>(Buffer<T> buffer)
         {

From 17018555c530a567fa80be15847284f00f3d5d82 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Mon, 19 Feb 2018 21:19:12 +0100
Subject: [PATCH 28/70] hide Buffer<T>.Array, use IManagedByteBuffer when
 necessary

---
 .../CieXyChromaticityCoordinates.cs           |   4 +-
 src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs  |  10 +-
 src/ImageSharp/Formats/Gif/GifDecoderCore.cs  |  21 +-
 src/ImageSharp/Formats/Gif/GifEncoderCore.cs  |  10 +-
 .../GolangPort/Components/Decoder/Bytes.cs    |  19 +-
 .../PdfJsPort/Components/PdfJsHuffmanTable.cs |  21 +-
 .../Jpeg/PdfJsPort/Components/PdfJsIDCT.cs    |   2 +
 .../Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs    |  14 +-
 src/ImageSharp/Formats/Png/PngChunk.cs        |   2 +-
 src/ImageSharp/Formats/Png/PngDecoderCore.cs  |  71 ++--
 src/ImageSharp/Formats/Png/PngEncoderCore.cs  |  71 ++--
 src/ImageSharp/Image/Image.Decode.cs          |   4 +-
 src/ImageSharp/Image/PixelAccessor{TPixel}.cs |  12 +-
 src/ImageSharp/Image/PixelArea{TPixel}.cs     |  41 +-
 .../Memory/ArrayPoolMemoryManager.cs          |   2 +-
 src/ImageSharp/Memory/Buffer2DExtensions.cs   |   1 +
 src/ImageSharp/Memory/Buffer2D{T}.cs          |   4 +-
 src/ImageSharp/Memory/BufferExtensions.cs     |  54 +++
 src/ImageSharp/Memory/Buffer{T}.cs            |  87 ++---
 src/ImageSharp/Memory/ManagedByteBuffer.cs    |   2 +
 src/ImageSharp/Memory/MemoryManager.cs        |   2 +-
 .../Memory/MemoryManagerExtensions.cs         |   5 +
 .../Quantizers/WuQuantizer{TPixel}.cs         |  56 +--
 .../Color/Bulk/PackFromVector4.cs             |   7 +-
 .../Bulk/PackFromVector4ReferenceVsPointer.cs |   4 +-
 .../Color/Bulk/PackFromXyzw.cs                |   8 +-
 .../Color/Bulk/ToVector4.cs                   |   5 +-
 .../ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs |   8 +-
 .../Color/Bulk/ToXyzw.cs                      |   5 +-
 .../General/ClearBuffer.cs                    |  42 --
 .../General/PixelIndexing.cs                  | 362 ------------------
 .../ImageSharp.Tests/Memory/Buffer2DTests.cs  |   7 +-
 tests/ImageSharp.Tests/Memory/BufferTests.cs  | 251 ------------
 .../Memory/SpanUtilityTests.cs                | 248 +-----------
 .../PixelFormats/PixelOperationsTests.cs      |  10 +-
 35 files changed, 322 insertions(+), 1150 deletions(-)
 create mode 100644 src/ImageSharp/Memory/BufferExtensions.cs
 delete mode 100644 tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
 delete mode 100644 tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
 delete mode 100644 tests/ImageSharp.Tests/Memory/BufferTests.cs

diff --git a/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs b/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs
index d9767d45e..92687a563 100644
--- a/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs
+++ b/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs
@@ -5,6 +5,7 @@ using System;
 using System.ComponentModel;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+// ReSharper disable CompareOfFloatsByEqualityOperator
 
 namespace SixLabors.ImageSharp.ColorSpaces
 {
@@ -143,7 +144,8 @@ namespace SixLabors.ImageSharp.ColorSpaces
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool Equals(CieXyChromaticityCoordinates other)
         {
-            return this.backingVector.Equals(other.backingVector);
+            // The memberwise comparison here is a workaround for https://github.com/dotnet/coreclr/issues/16443
+            return this.X == other.X && this.Y == other.Y;
         }
 
         /// <inheritdoc/>
diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
index b4db7527d..201c041a2 100644
--- a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
@@ -343,15 +343,17 @@ namespace SixLabors.ImageSharp.Formats.Bmp
                 padding = 4 - padding;
             }
 
-            using (var row = this.configuration.MemoryManager.Allocate<byte>(arrayWidth + padding, true))
+            using (IManagedByteBuffer row = this.configuration.MemoryManager.AllocateManagedByteBuffer(arrayWidth + padding, true))
             {
                 var color = default(TPixel);
                 var rgba = new Rgba32(0, 0, 0, 255);
 
+                Span<byte> rowSpan = row.Span;
+
                 for (int y = 0; y < height; y++)
                 {
                     int newY = Invert(y, height, inverted);
-                    this.currentStream.Read(row.Array, 0, row.Length);
+                    this.currentStream.Read(row.Array, 0, row.Length());
                     int offset = 0;
                     Span<TPixel> pixelRow = pixels.GetRowSpan(newY);
 
@@ -362,7 +364,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
 
                         for (int shift = 0; shift < ppb && (x + shift) < width; shift++)
                         {
-                            int colorIndex = ((row[offset] >> (8 - bits - (shift * bits))) & mask) * 4;
+                            int colorIndex = ((rowSpan[offset] >> (8 - bits - (shift * bits))) & mask) * 4;
                             int newX = colOffset + shift;
 
                             // Stored in b-> g-> r order.
@@ -393,7 +395,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             var color = default(TPixel);
             var rgba = new Rgba32(0, 0, 0, 255);
 
-            using (var buffer = this.configuration.MemoryManager.Allocate<byte>(stride))
+            using (var buffer = this.configuration.MemoryManager.AllocateManagedByteBuffer(stride))
             {
                 for (int y = 0; y < height; y++)
                 {
diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
index c120c9e11..c35d506df 100644
--- a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
@@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <summary>
         /// The global color table.
         /// </summary>
-        private Buffer<byte> globalColorTable;
+        private IManagedByteBuffer globalColorTable;
 
         /// <summary>
         /// The global color table length
@@ -151,7 +151,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
                         break;
                     }
 
-                    this.globalColorTable = this.MemoryManager.Allocate<byte>(this.globalColorTableLength, true);
+                    this.globalColorTable = this.MemoryManager.AllocateManagedByteBuffer(this.globalColorTableLength, true);
 
                     nextFlag = stream.ReadByte();
                     if (nextFlag == -1)
@@ -337,7 +337,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
                     continue;
                 }
 
-                using (Buffer<byte> commentsBuffer = this.MemoryManager.Allocate<byte>(length))
+                using (IManagedByteBuffer commentsBuffer = this.MemoryManager.AllocateManagedByteBuffer(length))
                 {
                     this.currentStream.Read(commentsBuffer.Array, 0, length);
                     string comments = this.TextEncoding.GetString(commentsBuffer.Array, 0, length);
@@ -357,22 +357,23 @@ namespace SixLabors.ImageSharp.Formats.Gif
         {
             GifImageDescriptor imageDescriptor = this.ReadImageDescriptor();
 
-            Buffer<byte> localColorTable = null;
-            Buffer<byte> indices = null;
+            IManagedByteBuffer localColorTable = null;
+            IManagedByteBuffer indices = null;
             try
             {
                 // Determine the color table for this frame. If there is a local one, use it otherwise use the global color table.
                 if (imageDescriptor.LocalColorTableFlag)
                 {
                     int length = imageDescriptor.LocalColorTableSize * 3;
-                    localColorTable = this.configuration.MemoryManager.Allocate<byte>(length, true);
+                    localColorTable = this.configuration.MemoryManager.AllocateManagedByteBuffer(length, true);
                     this.currentStream.Read(localColorTable.Array, 0, length);
                 }
 
-                indices = this.configuration.MemoryManager.Allocate<byte>(imageDescriptor.Width * imageDescriptor.Height, true);
+                indices = this.configuration.MemoryManager.AllocateManagedByteBuffer(imageDescriptor.Width * imageDescriptor.Height, true);
 
-                this.ReadFrameIndices(imageDescriptor, indices);
-                this.ReadFrameColors(ref image, ref previousFrame, indices, localColorTable ?? this.globalColorTable, imageDescriptor);
+                this.ReadFrameIndices(imageDescriptor, indices.Span);
+                IManagedByteBuffer colorTable = localColorTable ?? this.globalColorTable;
+                this.ReadFrameColors(ref image, ref previousFrame, indices.Span, colorTable.Span, imageDescriptor);
 
                 // Skip any remaining blocks
                 this.Skip(0);
@@ -605,7 +606,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
             {
                 this.globalColorTableLength = this.logicalScreenDescriptor.GlobalColorTableSize * 3;
 
-                this.globalColorTable = this.MemoryManager.Allocate<byte>(this.globalColorTableLength, true);
+                this.globalColorTable = this.MemoryManager.AllocateManagedByteBuffer(this.globalColorTableLength, true);
 
                 // Read the global color table from the stream
                 stream.Read(this.globalColorTable.Array, 0, this.globalColorTableLength);
diff --git a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
index 43d48605c..13ca5f2c6 100644
--- a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
@@ -356,15 +356,17 @@ namespace SixLabors.ImageSharp.Formats.Gif
             // Get max colors for bit depth.
             int colorTableLength = (int)Math.Pow(2, this.bitDepth) * 3;
             var rgb = default(Rgb24);
-            using (Buffer<byte> colorTable = this.memoryManager.Allocate<byte>(colorTableLength))
+            using (IManagedByteBuffer colorTable = this.memoryManager.AllocateManagedByteBuffer(colorTableLength))
             {
+                Span<byte> colorTableSpan = colorTable.Span;
+
                 for (int i = 0; i < pixelCount; i++)
                 {
                     int offset = i * 3;
                     image.Palette[i].ToRgb24(ref rgb);
-                    colorTable[offset] = rgb.R;
-                    colorTable[offset + 1] = rgb.G;
-                    colorTable[offset + 2] = rgb.B;
+                    colorTableSpan[offset] = rgb.R;
+                    colorTableSpan[offset + 1] = rgb.G;
+                    colorTableSpan[offset + 2] = rgb.B;
                 }
 
                 writer.Write(colorTable.Array, 0, colorTableLength);
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
index 7c1cd7206..56a85bc9d 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
@@ -26,8 +26,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// Gets or sets the buffer.
         /// buffer[i:j] are the buffered bytes read from the underlying
         /// stream that haven't yet been passed further on.
+        /// TODO: Do we really need buffer here? Might be an optimiziation opportunity.
         /// </summary>
-        public Buffer<byte> Buffer;
+        public IManagedByteBuffer Buffer;
 
         /// <summary>
         /// Values of <see cref="Buffer"/> converted to <see cref="int"/>-s
@@ -59,7 +60,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         {
             return new Bytes
             {
-                Buffer = memoryManager.Allocate<byte>(BufferSize),
+                Buffer = memoryManager.AllocateManagedByteBuffer(BufferSize),
                 BufferAsInt = memoryManager.Allocate<int>(BufferSize)
             };
         }
@@ -169,7 +170,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                 }
             }
 
-            result = this.Buffer[this.I];
+            result = this.Buffer.Span[this.I];
             this.I++;
             this.UnreadableBytes = 0;
             return errorCode;
@@ -229,18 +230,20 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                 DecoderThrowHelper.ThrowImageFormatException.FillCalledWhenUnreadBytesExist();
             }
 
+            Span<byte> bufferSpan = this.Buffer.Span;
+
             // Move the last 2 bytes to the start of the buffer, in case we need
             // to call UnreadByteStuffedByte.
             if (this.J > 2)
             {
-                this.Buffer[0] = this.Buffer[this.J - 2];
-                this.Buffer[1] = this.Buffer[this.J - 1];
+                bufferSpan[0] = bufferSpan[this.J - 2];
+                bufferSpan[1] = bufferSpan[this.J - 1];
                 this.I = 2;
                 this.J = 2;
             }
 
             // Fill in the rest of the buffer.
-            int n = inputStream.Read(this.Buffer.Array, this.J, this.Buffer.Length - this.J);
+            int n = inputStream.Read(this.Buffer.Array, this.J, bufferSpan.Length - this.J);
             if (n == 0)
             {
                 return OrigDecoderErrorCode.UnexpectedEndOfStream;
@@ -248,9 +251,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 
             this.J += n;
 
-            for (int i = 0; i < this.Buffer.Length; i++)
+            for (int i = 0; i < bufferSpan.Length; i++)
             {
-                this.BufferAsInt[i] = this.Buffer[i];
+                this.BufferAsInt[i] = bufferSpan[i];
             }
 
             return OrigDecoderErrorCode.NoError;
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
index f1beab114..95631a7e6 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
@@ -12,10 +12,10 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
     /// </summary>
     internal struct PdfJsHuffmanTable : IDisposable
     {
-        private Buffer<short> lookahead;
-        private Buffer<short> valOffset;
-        private Buffer<long> maxcode;
-        private Buffer<byte> huffval;
+        private FakeBuffer<short> lookahead;
+        private FakeBuffer<short> valOffset;
+        private FakeBuffer<long> maxcode;
+        private IManagedByteBuffer huffval;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PdfJsHuffmanTable"/> struct.
@@ -25,12 +25,13 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// <param name="values">The huffman values</param>
         public PdfJsHuffmanTable(MemoryManager memoryManager, byte[] lengths, byte[] values)
         {
-            this.lookahead = memoryManager.Allocate<short>(256, true);
-            this.valOffset = memoryManager.Allocate<short>(18, true);
-            this.maxcode = memoryManager.Allocate<long>(18, true);
+            // TODO: Replace FakeBuffer<T> usages with standard or array orfixed-sized arrays
+            this.lookahead = memoryManager.AllocateFake<short>(256);
+            this.valOffset = memoryManager.AllocateFake<short>(18);
+            this.maxcode = memoryManager.AllocateFake<long>(18);
 
-            using (var huffsize = memoryManager.Allocate<short>(257, true))
-            using (var huffcode = memoryManager.Allocate<short>(257, true))
+            using (FakeBuffer<short> huffsize = memoryManager.AllocateFake<short>(257))
+            using (FakeBuffer<short> huffcode = memoryManager.AllocateFake<short>(257))
             {
                 GenerateSizeTable(lengths, huffsize);
                 GenerateCodeTable(huffsize, huffcode);
@@ -38,7 +39,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
                 GenerateLookaheadTables(lengths, values, this.lookahead);
             }
 
-            this.huffval = memoryManager.Allocate<byte>(values.Length, true);
+            this.huffval = memoryManager.AllocateManagedByteBuffer(values.Length, true);
             Buffer.BlockCopy(values, 0, this.huffval.Array, 0, values.Length);
 
             this.MaxCode = this.maxcode.Array;
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsIDCT.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsIDCT.cs
index 49bdc2423..f2e269f6c 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsIDCT.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsIDCT.cs
@@ -6,6 +6,8 @@ using System.Runtime.CompilerServices;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
 {
+    using SixLabors.ImageSharp.Memory;
+
     /// <summary>
     /// Performs the inverse Descrete Cosine Transform on each frame component.
     /// </summary>
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
index 863c4380b..f05a8a136 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
@@ -673,23 +673,25 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
                 throw new ImageFormatException($"DHT has wrong length: {remaining}");
             }
 
-            using (var huffmanData = this.configuration.MemoryManager.Allocate<byte>(256, true))
+            using (IManagedByteBuffer huffmanData = this.configuration.MemoryManager.AllocateCleanManagedByteBuffer(256))
             {
+                Span<byte> huffmanSpan = huffmanData.Span;
                 for (int i = 2; i < remaining;)
                 {
                     byte huffmanTableSpec = (byte)this.InputStream.ReadByte();
                     this.InputStream.Read(huffmanData.Array, 0, 16);
 
-                    using (var codeLengths = this.configuration.MemoryManager.Allocate<byte>(17, true))
+                    using (IManagedByteBuffer codeLengths = this.configuration.MemoryManager.AllocateCleanManagedByteBuffer(17))
                     {
+                        Span<byte> codeLengthsSpan = codeLengths.Span;
                         int codeLengthSum = 0;
 
                         for (int j = 1; j < 17; j++)
                         {
-                            codeLengthSum += codeLengths[j] = huffmanData[j - 1];
+                            codeLengthSum += codeLengthsSpan[j] = huffmanSpan[j - 1];
                         }
 
-                        using (var huffmanValues = this.configuration.MemoryManager.Allocate<byte>(256, true))
+                        using (IManagedByteBuffer huffmanValues = this.configuration.MemoryManager.AllocateCleanManagedByteBuffer(256))
                         {
                             this.InputStream.Read(huffmanValues.Array, 0, codeLengthSum);
 
@@ -784,8 +786,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
         {
             int blocksPerLine = component.BlocksPerLine;
             int blocksPerColumn = component.BlocksPerColumn;
-            using (var computationBuffer = this.configuration.MemoryManager.Allocate<short>(64, true))
-            using (var multiplicationBuffer = this.configuration.MemoryManager.Allocate<short>(64, true))
+            using (Buffer<short> computationBuffer = this.configuration.MemoryManager.Allocate<short>(64, true))
+            using (Buffer<short> multiplicationBuffer = this.configuration.MemoryManager.Allocate<short>(64, true))
             {
                 Span<short> quantizationTable = this.quantizationTables.Tables.GetRowSpan(frameComponent.QuantizationTableIndex);
                 Span<short> computationBufferSpan = computationBuffer;
diff --git a/src/ImageSharp/Formats/Png/PngChunk.cs b/src/ImageSharp/Formats/Png/PngChunk.cs
index 7412fdfcd..2483a3ad9 100644
--- a/src/ImageSharp/Formats/Png/PngChunk.cs
+++ b/src/ImageSharp/Formats/Png/PngChunk.cs
@@ -27,7 +27,7 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// Gets or sets the data bytes appropriate to the chunk type, if any.
         /// This field can be of zero length.
         /// </summary>
-        public Buffer<byte> Data { get; set; }
+        public IManagedByteBuffer Data { get; set; }
 
         /// <summary>
         /// Gets or sets a CRC (Cyclic Redundancy Check) calculated on the preceding bytes in the chunk,
diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index 45d6fa3a2..fbff0ae1d 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -137,12 +137,12 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// <summary>
         /// Previous scanline processed
         /// </summary>
-        private Buffer<byte> previousScanline;
+        private IManagedByteBuffer previousScanline;
 
         /// <summary>
         /// The current scanline that is being processed
         /// </summary>
-        private Buffer<byte> scanline;
+        private IManagedByteBuffer scanline;
 
         /// <summary>
         /// The index of the current scanline being processed
@@ -437,8 +437,8 @@ namespace SixLabors.ImageSharp.Formats.Png
                 this.bytesPerSample = this.header.BitDepth / 8;
             }
 
-            this.previousScanline = this.MemoryManager.Allocate<byte>(this.bytesPerScanline, true);
-            this.scanline = this.configuration.MemoryManager.Allocate<byte>(this.bytesPerScanline, true);
+            this.previousScanline = this.MemoryManager.AllocateCleanManagedByteBuffer(this.bytesPerScanline);
+            this.scanline = this.configuration.MemoryManager.AllocateCleanManagedByteBuffer(this.bytesPerScanline);
         }
 
         /// <summary>
@@ -558,7 +558,8 @@ namespace SixLabors.ImageSharp.Formats.Png
                 }
 
                 this.currentRowBytesRead = 0;
-                var filterType = (FilterType)this.scanline[0];
+                Span<byte> scanlineSpan = this.scanline.Span;
+                var filterType = (FilterType)scanlineSpan[0];
 
                 switch (filterType)
                 {
@@ -567,22 +568,22 @@ namespace SixLabors.ImageSharp.Formats.Png
 
                     case FilterType.Sub:
 
-                        SubFilter.Decode(this.scanline, this.bytesPerPixel);
+                        SubFilter.Decode(scanlineSpan, this.bytesPerPixel);
                         break;
 
                     case FilterType.Up:
 
-                        UpFilter.Decode(this.scanline, this.previousScanline);
+                        UpFilter.Decode(scanlineSpan, this.previousScanline.Span);
                         break;
 
                     case FilterType.Average:
 
-                        AverageFilter.Decode(this.scanline, this.previousScanline, this.bytesPerPixel);
+                        AverageFilter.Decode(scanlineSpan, this.previousScanline.Span, this.bytesPerPixel);
                         break;
 
                     case FilterType.Paeth:
 
-                        PaethFilter.Decode(this.scanline, this.previousScanline, this.bytesPerPixel);
+                        PaethFilter.Decode(scanlineSpan, this.previousScanline.Span, this.bytesPerPixel);
                         break;
 
                     default:
@@ -753,11 +754,11 @@ namespace SixLabors.ImageSharp.Formats.Png
                         if (this.header.BitDepth == 16)
                         {
                             int length = this.header.Width * 3;
-                            using (var compressed = this.configuration.MemoryManager.Allocate<byte>(length))
+                            using (IBuffer<byte> compressed = this.configuration.MemoryManager.Allocate<byte>(length))
                             {
                                 // TODO: Should we use pack from vector here instead?
-                                this.From16BitTo8Bit(scanlineBuffer, compressed, length);
-                                PixelOperations<TPixel>.Instance.PackFromRgb24Bytes(compressed, rowSpan, this.header.Width);
+                                this.From16BitTo8Bit(scanlineBuffer, compressed.Span, length);
+                                PixelOperations<TPixel>.Instance.PackFromRgb24Bytes(compressed.Span, rowSpan, this.header.Width);
                             }
                         }
                         else
@@ -770,10 +771,10 @@ namespace SixLabors.ImageSharp.Formats.Png
                         if (this.header.BitDepth == 16)
                         {
                             int length = this.header.Width * 3;
-                            using (var compressed = this.configuration.MemoryManager.Allocate<byte>(length))
+                            using (IBuffer<byte> compressed = this.configuration.MemoryManager.Allocate<byte>(length))
                             {
                                 // TODO: Should we use pack from vector here instead?
-                                this.From16BitTo8Bit(scanlineBuffer, compressed, length);
+                                this.From16BitTo8Bit(scanlineBuffer, compressed.Span, length);
 
                                 Span<Rgb24> rgb24Span = compressed.Span.NonPortableCast<byte, Rgb24>();
                                 for (int x = 0; x < this.header.Width; x++)
@@ -811,11 +812,11 @@ namespace SixLabors.ImageSharp.Formats.Png
                     if (this.header.BitDepth == 16)
                     {
                         int length = this.header.Width * 4;
-                        using (var compressed = this.configuration.MemoryManager.Allocate<byte>(length))
+                        using (IBuffer<byte> compressed = this.configuration.MemoryManager.Allocate<byte>(length))
                         {
                             // TODO: Should we use pack from vector here instead?
-                            this.From16BitTo8Bit(scanlineBuffer, compressed, length);
-                            PixelOperations<TPixel>.Instance.PackFromRgba32Bytes(compressed, rowSpan, this.header.Width);
+                            this.From16BitTo8Bit(scanlineBuffer, compressed.Span, length);
+                            PixelOperations<TPixel>.Instance.PackFromRgba32Bytes(compressed.Span, rowSpan, this.header.Width);
                         }
                     }
                     else
@@ -1014,18 +1015,20 @@ namespace SixLabors.ImageSharp.Formats.Png
                     if (this.header.BitDepth == 16)
                     {
                         int length = this.header.Width * 3;
-                        using (var compressed = this.configuration.MemoryManager.Allocate<byte>(length))
+                        using (IBuffer<byte> compressed = this.configuration.MemoryManager.Allocate<byte>(length))
                         {
+                            Span<byte> compressedSpan = compressed.Span;
+
                             // TODO: Should we use pack from vector here instead?
-                            this.From16BitTo8Bit(scanlineBuffer, compressed, length);
+                            this.From16BitTo8Bit(scanlineBuffer, compressedSpan, length);
 
                             if (this.hasTrans)
                             {
                                 for (int x = pixelOffset, o = 0; x < this.header.Width; x += increment, o += 3)
                                 {
-                                    rgba.R = compressed[o];
-                                    rgba.G = compressed[o + 1];
-                                    rgba.B = compressed[o + 2];
+                                    rgba.R = compressedSpan[o];
+                                    rgba.G = compressedSpan[o + 1];
+                                    rgba.B = compressedSpan[o + 2];
                                     rgba.A = (byte)(this.rgb24Trans.Equals(rgba.Rgb) ? 0 : 255);
 
                                     color.PackFromRgba32(rgba);
@@ -1036,9 +1039,9 @@ namespace SixLabors.ImageSharp.Formats.Png
                             {
                                 for (int x = pixelOffset, o = 0; x < this.header.Width; x += increment, o += 3)
                                 {
-                                    rgba.R = compressed[o];
-                                    rgba.G = compressed[o + 1];
-                                    rgba.B = compressed[o + 2];
+                                    rgba.R = compressedSpan[o];
+                                    rgba.G = compressedSpan[o + 1];
+                                    rgba.B = compressedSpan[o + 2];
 
                                     color.PackFromRgba32(rgba);
                                     rowSpan[x] = color;
@@ -1082,16 +1085,18 @@ namespace SixLabors.ImageSharp.Formats.Png
                     if (this.header.BitDepth == 16)
                     {
                         int length = this.header.Width * 4;
-                        using (var compressed = this.configuration.MemoryManager.Allocate<byte>(length))
+                        using (IBuffer<byte> compressed = this.configuration.MemoryManager.Allocate<byte>(length))
                         {
+                            Span<byte> compressedSpan = compressed.Span;
+
                             // TODO: Should we use pack from vector here instead?
-                            this.From16BitTo8Bit(scanlineBuffer, compressed, length);
+                            this.From16BitTo8Bit(scanlineBuffer, compressedSpan, length);
                             for (int x = pixelOffset, o = 0; x < this.header.Width; x += increment, o += 4)
                             {
-                                rgba.R = compressed[o];
-                                rgba.G = compressed[o + 1];
-                                rgba.B = compressed[o + 2];
-                                rgba.A = compressed[o + 3];
+                                rgba.R = compressedSpan[o];
+                                rgba.G = compressedSpan[o + 1];
+                                rgba.B = compressedSpan[o + 2];
+                                rgba.A = compressedSpan[o + 3];
 
                                 color.PackFromRgba32(rgba);
                                 rowSpan[x] = color;
@@ -1281,7 +1286,7 @@ namespace SixLabors.ImageSharp.Formats.Png
         private void ReadChunkData(PngChunk chunk)
         {
             // We rent the buffer here to return it afterwards in Decode()
-            chunk.Data = this.configuration.MemoryManager.Allocate<byte>(chunk.Length);
+            chunk.Data = this.configuration.MemoryManager.AllocateCleanManagedByteBuffer(chunk.Length);
             this.currentStream.Read(chunk.Data.Array, 0, chunk.Length);
         }
 
@@ -1353,7 +1358,7 @@ namespace SixLabors.ImageSharp.Formats.Png
 
         private void SwapBuffers()
         {
-            Buffer<byte> temp = this.previousScanline;
+            IManagedByteBuffer temp = this.previousScanline;
             this.previousScanline = this.scanline;
             this.scanline = temp;
         }
diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
index d53125089..1ab7a83ce 100644
--- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
@@ -74,37 +74,37 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// <summary>
         /// The previous scanline.
         /// </summary>
-        private Buffer<byte> previousScanline;
+        private IManagedByteBuffer previousScanline;
 
         /// <summary>
         /// The raw scanline.
         /// </summary>
-        private Buffer<byte> rawScanline;
+        private IManagedByteBuffer rawScanline;
 
         /// <summary>
         /// The filtered scanline result.
         /// </summary>
-        private Buffer<byte> result;
+        private IManagedByteBuffer result;
 
         /// <summary>
         /// The buffer for the sub filter
         /// </summary>
-        private Buffer<byte> sub;
+        private IManagedByteBuffer sub;
 
         /// <summary>
         /// The buffer for the up filter
         /// </summary>
-        private Buffer<byte> up;
+        private IManagedByteBuffer up;
 
         /// <summary>
         /// The buffer for the average filter
         /// </summary>
-        private Buffer<byte> average;
+        private IManagedByteBuffer average;
 
         /// <summary>
         /// The buffer for the paeth filter
         /// </summary>
-        private Buffer<byte> paeth;
+        private IManagedByteBuffer paeth;
 
         /// <summary>
         /// The png color type.
@@ -357,11 +357,11 @@ namespace SixLabors.ImageSharp.Formats.Png
         {
             if (this.bytesPerPixel == 4)
             {
-                PixelOperations<TPixel>.Instance.ToRgba32Bytes(rowSpan, this.rawScanline, this.width);
+                PixelOperations<TPixel>.Instance.ToRgba32Bytes(rowSpan, this.rawScanline.Span, this.width);
             }
             else
             {
-                PixelOperations<TPixel>.Instance.ToRgb24Bytes(rowSpan, this.rawScanline, this.width);
+                PixelOperations<TPixel>.Instance.ToRgb24Bytes(rowSpan, this.rawScanline.Span, this.width);
             }
         }
 
@@ -373,13 +373,14 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// <param name="rowSpan">The row span.</param>
         /// <param name="row">The row.</param>
         /// <returns>The <see cref="T:byte[]"/></returns>
-        private Buffer<byte> EncodePixelRow<TPixel>(Span<TPixel> rowSpan, int row)
+        private IManagedByteBuffer EncodePixelRow<TPixel>(Span<TPixel> rowSpan, int row)
             where TPixel : struct, IPixel<TPixel>
         {
             switch (this.pngColorType)
             {
                 case PngColorType.Palette:
-                    Buffer.BlockCopy(this.palettePixelData, row * this.rawScanline.Length, this.rawScanline.Array, 0, this.rawScanline.Length);
+                    // TODO: Use Span copy!
+                    Buffer.BlockCopy(this.palettePixelData, row * this.rawScanline.Length(), this.rawScanline.Array, 0, this.rawScanline.Length());
                     break;
                 case PngColorType.Grayscale:
                 case PngColorType.GrayscaleWithAlpha:
@@ -398,7 +399,7 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// to be most compressible, using lowest total variation as proxy for compressibility.
         /// </summary>
         /// <returns>The <see cref="T:byte[]"/></returns>
-        private Buffer<byte> GetOptimalFilteredScanline()
+        private IManagedByteBuffer GetOptimalFilteredScanline()
         {
             Span<byte> scanSpan = this.rawScanline.Span;
             Span<byte> prevSpan = this.previousScanline.Span;
@@ -406,18 +407,18 @@ namespace SixLabors.ImageSharp.Formats.Png
             // Palette images don't compress well with adaptive filtering.
             if (this.pngColorType == PngColorType.Palette || this.bitDepth < 8)
             {
-                NoneFilter.Encode(this.rawScanline, this.result);
+                NoneFilter.Encode(this.rawScanline.Span, this.result.Span);
                 return this.result;
             }
 
             // This order, while different to the enumerated order is more likely to produce a smaller sum
             // early on which shaves a couple of milliseconds off the processing time.
-            UpFilter.Encode(scanSpan, prevSpan, this.up, out int currentSum);
+            UpFilter.Encode(scanSpan, prevSpan, this.up.Span, out int currentSum);
 
             int lowestSum = currentSum;
-            Buffer<byte> actualResult = this.up;
+            IManagedByteBuffer actualResult = this.up;
 
-            PaethFilter.Encode(scanSpan, prevSpan, this.paeth, this.bytesPerPixel, out currentSum);
+            PaethFilter.Encode(scanSpan, prevSpan, this.paeth.Span, this.bytesPerPixel, out currentSum);
 
             if (currentSum < lowestSum)
             {
@@ -425,7 +426,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                 actualResult = this.paeth;
             }
 
-            SubFilter.Encode(scanSpan, this.sub, this.bytesPerPixel, out currentSum);
+            SubFilter.Encode(scanSpan, this.sub.Span, this.bytesPerPixel, out currentSum);
 
             if (currentSum < lowestSum)
             {
@@ -433,7 +434,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                 actualResult = this.sub;
             }
 
-            AverageFilter.Encode(scanSpan, prevSpan, this.average, this.bytesPerPixel, out currentSum);
+            AverageFilter.Encode(scanSpan, prevSpan, this.average.Span, this.bytesPerPixel, out currentSum);
 
             if (currentSum < lowestSum)
             {
@@ -522,9 +523,13 @@ namespace SixLabors.ImageSharp.Formats.Png
             int colorTableLength = (int)Math.Pow(2, header.BitDepth) * 3;
             var rgba = default(Rgba32);
             bool anyAlpha = false;
-            using (Buffer<byte> colorTable = this.memoryManager.Allocate<byte>(colorTableLength))
-            using (Buffer<byte> alphaTable = this.memoryManager.Allocate<byte>(pixelCount))
+
+            using (IManagedByteBuffer colorTable = this.memoryManager.AllocateManagedByteBuffer(colorTableLength))
+            using (IManagedByteBuffer alphaTable = this.memoryManager.AllocateManagedByteBuffer(pixelCount))
             {
+                Span<byte> colorTableSpan = colorTable.Span;
+                Span<byte> alphaTableSpan = alphaTable.Span;
+
                 for (byte i = 0; i < pixelCount; i++)
                 {
                     if (quantized.Pixels.Contains(i))
@@ -534,9 +539,9 @@ namespace SixLabors.ImageSharp.Formats.Png
 
                         byte alpha = rgba.A;
 
-                        colorTable[offset] = rgba.R;
-                        colorTable[offset + 1] = rgba.G;
-                        colorTable[offset + 2] = rgba.B;
+                        colorTableSpan[offset] = rgba.R;
+                        colorTableSpan[offset + 1] = rgba.G;
+                        colorTableSpan[offset + 2] = rgba.B;
 
                         if (alpha > this.threshold)
                         {
@@ -544,7 +549,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                         }
 
                         anyAlpha = anyAlpha || alpha < 255;
-                        alphaTable[i] = alpha;
+                        alphaTableSpan[i] = alpha;
                     }
                 }
 
@@ -617,16 +622,16 @@ namespace SixLabors.ImageSharp.Formats.Png
             this.bytesPerScanline = this.width * this.bytesPerPixel;
             int resultLength = this.bytesPerScanline + 1;
 
-            this.previousScanline = this.memoryManager.Allocate<byte>(this.bytesPerScanline, true);
-            this.rawScanline = this.memoryManager.Allocate<byte>(this.bytesPerScanline, true);
-            this.result = this.memoryManager.Allocate<byte>(resultLength, true);
+            this.previousScanline = this.memoryManager.AllocateCleanManagedByteBuffer(this.bytesPerScanline);
+            this.rawScanline = this.memoryManager.AllocateCleanManagedByteBuffer(this.bytesPerScanline);
+            this.result = this.memoryManager.AllocateCleanManagedByteBuffer(resultLength);
 
             if (this.pngColorType != PngColorType.Palette)
             {
-                this.sub = this.memoryManager.Allocate<byte>(resultLength, true);
-                this.up = this.memoryManager.Allocate<byte>(resultLength, true);
-                this.average = this.memoryManager.Allocate<byte>(resultLength, true);
-                this.paeth = this.memoryManager.Allocate<byte>(resultLength, true);
+                this.sub = this.memoryManager.AllocateCleanManagedByteBuffer(resultLength);
+                this.up = this.memoryManager.AllocateCleanManagedByteBuffer(resultLength);
+                this.average = this.memoryManager.AllocateCleanManagedByteBuffer(resultLength);
+                this.paeth = this.memoryManager.AllocateCleanManagedByteBuffer(resultLength);
             }
 
             byte[] buffer;
@@ -639,10 +644,10 @@ namespace SixLabors.ImageSharp.Formats.Png
                 {
                     for (int y = 0; y < this.height; y++)
                     {
-                        Buffer<byte> r = this.EncodePixelRow(pixels.GetPixelRowSpan(y), y);
+                        IManagedByteBuffer r = this.EncodePixelRow(pixels.GetPixelRowSpan(y), y);
                         deflateStream.Write(r.Array, 0, resultLength);
 
-                        Buffer<byte> temp = this.rawScanline;
+                        IManagedByteBuffer temp = this.rawScanline;
                         this.rawScanline = this.previousScanline;
                         this.previousScanline = temp;
                     }
diff --git a/src/ImageSharp/Image/Image.Decode.cs b/src/ImageSharp/Image/Image.Decode.cs
index a2eacd373..72492a494 100644
--- a/src/ImageSharp/Image/Image.Decode.cs
+++ b/src/ImageSharp/Image/Image.Decode.cs
@@ -29,12 +29,12 @@ namespace SixLabors.ImageSharp
                 return null;
             }
 
-            using (var buffer = config.MemoryManager.Allocate<byte>(maxHeaderSize))
+            using (IManagedByteBuffer buffer = config.MemoryManager.AllocateManagedByteBuffer(maxHeaderSize))
             {
                 long startPosition = stream.Position;
                 stream.Read(buffer.Array, 0, maxHeaderSize);
                 stream.Position = startPosition;
-                return config.FormatDetectors.Select(x => x.DetectFormat(buffer)).LastOrDefault(x => x != null);
+                return config.FormatDetectors.Select(x => x.DetectFormat(buffer.Span)).LastOrDefault(x => x != null);
             }
         }
 
diff --git a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
index 50e65a082..80c0ce4e6 100644
--- a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
+++ b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
@@ -84,11 +84,6 @@ namespace SixLabors.ImageSharp
             this.Dispose();
         }
 
-        /// <summary>
-        /// Gets the pixel buffer array.
-        /// </summary>
-        public TPixel[] PixelArray => this.PixelBuffer.Buffer.Array;
-
         /// <summary>
         /// Gets the size of a single pixel in the number of bytes.
         /// </summary>
@@ -106,7 +101,7 @@ namespace SixLabors.ImageSharp
         public int Height { get; private set; }
 
         /// <inheritdoc />
-        Span<TPixel> IBuffer2D<TPixel>.Span => this.PixelBuffer.Span;
+        public Span<TPixel> Span => this.PixelBuffer.Span;
 
         private static PixelOperations<TPixel> Operations => PixelOperations<TPixel>.Instance;
 
@@ -122,14 +117,15 @@ namespace SixLabors.ImageSharp
             get
             {
                 this.CheckCoordinates(x, y);
-                return this.PixelArray[(y * this.Width) + x];
+                return this.Span[(y * this.Width) + x];
             }
 
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             set
             {
                 this.CheckCoordinates(x, y);
-                this.PixelArray[(y * this.Width) + x] = value;
+                Span<TPixel> span = this.Span;
+                span[(y * this.Width) + x] = value;
             }
         }
 
diff --git a/src/ImageSharp/Image/PixelArea{TPixel}.cs b/src/ImageSharp/Image/PixelArea{TPixel}.cs
index fa3499b6d..764801722 100644
--- a/src/ImageSharp/Image/PixelArea{TPixel}.cs
+++ b/src/ImageSharp/Image/PixelArea{TPixel}.cs
@@ -30,44 +30,7 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// The underlying buffer containing the raw pixel data.
         /// </summary>
-        private readonly Buffer<byte> byteBuffer;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelArea{TPixel}"/> class.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <param name="bytes">The bytes.</param>
-        /// <param name="componentOrder">The component order.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown if <paramref name="bytes"></paramref> is the incorrect length.
-        /// </exception>
-        public PixelArea(int width, byte[] bytes, ComponentOrder componentOrder)
-            : this(width, 1, bytes, componentOrder)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelArea{TPixel}"/> class.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        /// <param name="bytes">The bytes.</param>
-        /// <param name="componentOrder">The component order.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown if <paramref name="bytes"></paramref> is the incorrect length.
-        /// </exception>
-        public PixelArea(int width, int height, byte[] bytes, ComponentOrder componentOrder)
-        {
-            this.CheckBytesLength(width, height, bytes, componentOrder);
-
-            this.Width = width;
-            this.Height = height;
-            this.ComponentOrder = componentOrder;
-            this.RowStride = width * GetComponentCount(componentOrder);
-            this.Length = bytes.Length; // TODO: Is this the right value for Length?
-
-            this.byteBuffer = new Buffer<byte>(bytes);
-        }
+        private readonly IManagedByteBuffer byteBuffer;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PixelArea{TPixel}"/> class.
@@ -116,7 +79,7 @@ namespace SixLabors.ImageSharp
             this.RowStride = (width * GetComponentCount(componentOrder)) + padding;
             this.Length = this.RowStride * height;
 
-            this.byteBuffer = Configuration.Default.MemoryManager.Allocate<byte>(this.Length, true);
+            this.byteBuffer = Configuration.Default.MemoryManager.AllocateCleanManagedByteBuffer(this.Length);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index 403464334..e14ba443f 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -68,7 +68,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <inheritdoc />
         internal override void Release<T>(Buffer<T> buffer)
         {
-            byte[] byteBuffer = Unsafe.As<byte[]>(buffer.Array);
+            byte[] byteBuffer = Unsafe.As<byte[]>(buffer.GetArray());
             this.pool.Return(byteBuffer);
         }
     }
diff --git a/src/ImageSharp/Memory/Buffer2DExtensions.cs b/src/ImageSharp/Memory/Buffer2DExtensions.cs
index ac5ab09db..0cbffde77 100644
--- a/src/ImageSharp/Memory/Buffer2DExtensions.cs
+++ b/src/ImageSharp/Memory/Buffer2DExtensions.cs
@@ -12,6 +12,7 @@ namespace SixLabors.ImageSharp.Memory
     /// </summary>
     internal static class Buffer2DExtensions
     {
+        
         /// <summary>
         /// Gets a <see cref="Span{T}"/> to the row 'y' beginning from the pixel at 'x'.
         /// </summary>
diff --git a/src/ImageSharp/Memory/Buffer2D{T}.cs b/src/ImageSharp/Memory/Buffer2D{T}.cs
index 82cb25f47..e527c90c0 100644
--- a/src/ImageSharp/Memory/Buffer2D{T}.cs
+++ b/src/ImageSharp/Memory/Buffer2D{T}.cs
@@ -51,8 +51,8 @@ namespace SixLabors.ImageSharp.Memory
             {
                 DebugGuard.MustBeLessThan(x, this.Width, nameof(x));
                 DebugGuard.MustBeLessThan(y, this.Height, nameof(y));
-
-                return ref this.Buffer.Array[(this.Width * y) + x];
+                Span<T> span = this.Buffer.Span;
+                return ref span[(this.Width * y) + x];
             }
         }
 
diff --git a/src/ImageSharp/Memory/BufferExtensions.cs b/src/ImageSharp/Memory/BufferExtensions.cs
new file mode 100644
index 000000000..8975d3b45
--- /dev/null
+++ b/src/ImageSharp/Memory/BufferExtensions.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Runtime.CompilerServices;
+
+namespace SixLabors.ImageSharp.Memory
+{
+    internal static class BufferExtensions
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static int Length<T>(this IBuffer<T> buffer)
+            where T : struct => buffer.Span.Length;
+
+        /// <summary>
+        /// Gets a <see cref="Span{T}"/> to an offseted position inside the buffer.
+        /// </summary>
+        /// <param name="buffer">The buffer</param>
+        /// <param name="start">The start</param>
+        /// <returns>The <see cref="Span{T}"/></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Span<T> Slice<T>(this IBuffer<T> buffer, int start)
+            where T : struct
+        {
+            return buffer.Span.Slice(start);
+        }
+
+        /// <summary>
+        /// Gets a <see cref="Span{T}"/> to an offsetted position inside the buffer.
+        /// </summary>
+        /// <param name="buffer">The buffer</param>
+        /// <param name="start">The start</param>
+        /// <param name="length">The length of the slice</param>
+        /// <returns>The <see cref="Span{T}"/></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Span<T> Slice<T>(this IBuffer<T> buffer, int start, int length)
+            where T : struct
+        {
+            return buffer.Span.Slice(start, length);
+        }
+
+        /// <summary>
+        /// Clears the contents of this buffer.
+        /// </summary>
+        /// <param name="buffer">The buffer</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void Clear<T>(this IBuffer<T> buffer)
+            where T : struct
+        {
+            buffer.Span.Clear();
+        }
+
+        public static ref T DangerousGetPinnableReference<T>(this IBuffer<T> buffer)
+            where T : struct =>
+            ref buffer.Span.DangerousGetPinnableReference();
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/Buffer{T}.cs b/src/ImageSharp/Memory/Buffer{T}.cs
index 07a827a67..1ee1571c8 100644
--- a/src/ImageSharp/Memory/Buffer{T}.cs
+++ b/src/ImageSharp/Memory/Buffer{T}.cs
@@ -19,15 +19,23 @@ namespace SixLabors.ImageSharp.Memory
         private MemoryManager memoryManager;
 
         /// <summary>
-        /// A pointer to the first element of <see cref="Array"/> when pinned.
+        /// A pointer to the first element of <see cref="array"/> when pinned.
         /// </summary>
         private IntPtr pointer;
 
         /// <summary>
-        /// A handle that allows to access the managed <see cref="Array"/> as an unmanaged memory by pinning.
+        /// A handle that allows to access the managed <see cref="array"/> as an unmanaged memory by pinning.
         /// </summary>
         private GCHandle handle;
 
+        // why is there such a rule? :S Protected should be fine for a field!
+#pragma warning disable SA1401 // Fields should be private
+        /// <summary>
+        /// The backing array.
+        /// </summary>
+        protected T[] array;
+#pragma warning restore SA1401 // Fields should be private
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Buffer{T}"/> class.
         /// </summary>
@@ -35,7 +43,7 @@ namespace SixLabors.ImageSharp.Memory
         public Buffer(T[] array)
         {
             this.Length = array.Length;
-            this.Array = array;
+            this.array = array;
         }
 
         /// <summary>
@@ -51,7 +59,7 @@ namespace SixLabors.ImageSharp.Memory
             }
 
             this.Length = length;
-            this.Array = array;
+            this.array = array;
         }
 
         internal Buffer(T[] array, int length, MemoryManager memoryManager)
@@ -69,20 +77,15 @@ namespace SixLabors.ImageSharp.Memory
         }
 
         /// <summary>
-        /// Gets a value indicating whether this <see cref="Buffer{T}"/> instance is disposed, or has lost ownership of <see cref="Array"/>.
+        /// Gets a value indicating whether this <see cref="Buffer{T}"/> instance is disposed, or has lost ownership of <see cref="array"/>.
         /// </summary>
         public bool IsDisposedOrLostArrayOwnership { get; private set; }
 
         /// <summary>
-        /// Gets the count of "relevant" elements. It's usually smaller than 'Array.Length' when <see cref="Array"/> is pooled.
+        /// Gets the count of "relevant" elements. It's usually smaller than 'Array.Length' when <see cref="array"/> is pooled.
         /// </summary>
         public int Length { get; private set; }
 
-        /// <summary>
-        /// Gets the backing pinned array.
-        /// </summary>
-        public T[] Array { get; private set; }
-
         /// <summary>
         /// Gets a <see cref="Span{T}"/> to the backing buffer.
         /// </summary>
@@ -112,7 +115,7 @@ namespace SixLabors.ImageSharp.Memory
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static implicit operator ReadOnlySpan<T>(Buffer<T> buffer)
         {
-            return new ReadOnlySpan<T>(buffer.Array, 0, buffer.Length);
+            return new ReadOnlySpan<T>(buffer.array, 0, buffer.Length);
         }
 
         /// <summary>
@@ -122,30 +125,7 @@ namespace SixLabors.ImageSharp.Memory
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static implicit operator Span<T>(Buffer<T> buffer)
         {
-            return new Span<T>(buffer.Array, 0, buffer.Length);
-        }
-
-        /// <summary>
-        /// Gets a <see cref="Span{T}"/> to an offseted position inside the buffer.
-        /// </summary>
-        /// <param name="start">The start</param>
-        /// <returns>The <see cref="Span{T}"/></returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Span<T> Slice(int start)
-        {
-            return new Span<T>(this.Array, start, this.Length - start);
-        }
-
-        /// <summary>
-        /// Gets a <see cref="Span{T}"/> to an offsetted position inside the buffer.
-        /// </summary>
-        /// <param name="start">The start</param>
-        /// <param name="length">The length of the slice</param>
-        /// <returns>The <see cref="Span{T}"/></returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Span<T> Slice(int start, int length)
-        {
-            return new Span<T>(this.Array, start, length);
+            return new Span<T>(buffer.array, 0, buffer.Length);
         }
 
         /// <summary>
@@ -165,17 +145,17 @@ namespace SixLabors.ImageSharp.Memory
             this.memoryManager?.Release(this);
 
             this.memoryManager = null;
-            this.Array = null;
+            this.array = null;
             this.Length = 0;
 
             GC.SuppressFinalize(this);
         }
 
         /// <summary>
-        /// Unpins <see cref="Array"/> and makes the object "quasi-disposed" so the array is no longer owned by this object.
-        /// If <see cref="Array"/> is rented, it's the callers responsibility to return it to it's pool.
+        /// Unpins <see cref="array"/> and makes the object "quasi-disposed" so the array is no longer owned by this object.
+        /// If <see cref="array"/> is rented, it's the callers responsibility to return it to it's pool.
         /// </summary>
-        /// <returns>The unpinned <see cref="Array"/></returns>
+        /// <returns>The unpinned <see cref="array"/></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public T[] TakeArrayOwnership()
         {
@@ -187,23 +167,14 @@ namespace SixLabors.ImageSharp.Memory
 
             this.IsDisposedOrLostArrayOwnership = true;
             this.UnPin();
-            T[] array = this.Array;
-            this.Array = null;
+            T[] array = this.array;
+            this.array = null;
             this.memoryManager = null;
             return array;
         }
 
         /// <summary>
-        /// Clears the contents of this buffer.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Clear()
-        {
-            this.Span.Clear();
-        }
-
-        /// <summary>
-        /// Pins <see cref="Array"/>.
+        /// Pins <see cref="array"/>.
         /// </summary>
         /// <returns>The pinned pointer</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -217,7 +188,7 @@ namespace SixLabors.ImageSharp.Memory
 
             if (this.pointer == IntPtr.Zero)
             {
-                this.handle = GCHandle.Alloc(this.Array, GCHandleType.Pinned);
+                this.handle = GCHandle.Alloc(this.array, GCHandleType.Pinned);
                 this.pointer = this.handle.AddrOfPinnedObject();
             }
 
@@ -225,7 +196,15 @@ namespace SixLabors.ImageSharp.Memory
         }
 
         /// <summary>
-        /// Unpins <see cref="Array"/>.
+        /// TODO: Refactor this
+        /// </summary>
+        internal T[] GetArray()
+        {
+            return this.array;
+        }
+
+        /// <summary>
+        /// Unpins <see cref="array"/>.
         /// </summary>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private void UnPin()
diff --git a/src/ImageSharp/Memory/ManagedByteBuffer.cs b/src/ImageSharp/Memory/ManagedByteBuffer.cs
index 17fe945d6..94d08e2aa 100644
--- a/src/ImageSharp/Memory/ManagedByteBuffer.cs
+++ b/src/ImageSharp/Memory/ManagedByteBuffer.cs
@@ -6,5 +6,7 @@ namespace SixLabors.ImageSharp.Memory
             : base(array, length, memoryManager)
         {
         }
+
+        public byte[] Array => this.array;
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index cac9b785b..58f245819 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Memory
         /// Temporal workaround. A method providing a "Buffer" based on a generic array without the 'Unsafe.As()' hackery.
         /// Should be replaced with 'Allocate()' as soon as SixLabors.Shapes has Span-based API-s!
         /// </summary>
-        internal FakeBuffer<T> AllocateFake<T>(int length)
+        internal FakeBuffer<T> AllocateFake<T>(int length, bool dummy = false)
             where T : struct
         {
             return new FakeBuffer<T>(new T[length]);
diff --git a/src/ImageSharp/Memory/MemoryManagerExtensions.cs b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
index 877230788..f15776721 100644
--- a/src/ImageSharp/Memory/MemoryManagerExtensions.cs
+++ b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
@@ -26,6 +26,11 @@
             return memoryManager.Allocate<T>(length, true);
         }
 
+        public static IManagedByteBuffer AllocateManagedByteBuffer(this MemoryManager memoryManager, int length)
+        {
+            return memoryManager.AllocateManagedByteBuffer(length, false);
+        }
+
         public static IManagedByteBuffer AllocateCleanManagedByteBuffer(this MemoryManager memoryManager, int length)
         {
             return memoryManager.AllocateManagedByteBuffer(length, true);
diff --git a/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
index 8f89c4961..b5d31014b 100644
--- a/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
@@ -180,14 +180,14 @@ namespace SixLabors.ImageSharp.Quantizers
                 {
                     this.Mark(ref this.colorCube[k], (byte)k);
 
-                    float weight = Volume(ref this.colorCube[k], this.vwt.Array);
+                    float weight = Volume(ref this.colorCube[k], this.vwt.Span);
 
                     if (MathF.Abs(weight) > Constants.Epsilon)
                     {
-                        float r = Volume(ref this.colorCube[k], this.vmr.Array);
-                        float g = Volume(ref this.colorCube[k], this.vmg.Array);
-                        float b = Volume(ref this.colorCube[k], this.vmb.Array);
-                        float a = Volume(ref this.colorCube[k], this.vma.Array);
+                        float r = Volume(ref this.colorCube[k], this.vmr.Span);
+                        float g = Volume(ref this.colorCube[k], this.vmg.Span);
+                        float b = Volume(ref this.colorCube[k], this.vmb.Span);
+                        float a = Volume(ref this.colorCube[k], this.vma.Span);
 
                         ref TPixel color = ref this.palette[k];
                         color.PackFromVector4(new Vector4(r, g, b, a) / weight / 255F);
@@ -312,7 +312,7 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <param name="cube">The cube.</param>
         /// <param name="moment">The moment.</param>
         /// <returns>The result.</returns>
-        private static float Volume(ref Box cube, long[] moment)
+        private static float Volume(ref Box cube, Span<long> moment)
         {
             return moment[GetPaletteIndex(cube.R1, cube.G1, cube.B1, cube.A1)]
                    - moment[GetPaletteIndex(cube.R1, cube.G1, cube.B1, cube.A0)]
@@ -339,7 +339,7 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <param name="direction">The direction.</param>
         /// <param name="moment">The moment.</param>
         /// <returns>The result.</returns>
-        private static long Bottom(ref Box cube, int direction, long[] moment)
+        private static long Bottom(ref Box cube, int direction, Span<long> moment)
         {
             switch (direction)
             {
@@ -400,7 +400,7 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <param name="position">The position.</param>
         /// <param name="moment">The moment.</param>
         /// <returns>The result.</returns>
-        private static long Top(ref Box cube, int direction, int position, long[] moment)
+        private static long Top(ref Box cube, int direction, int position, Span<long> moment)
         {
             switch (direction)
             {
@@ -548,10 +548,10 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <returns>The <see cref="float"/>.</returns>
         private float Variance(ref Box cube)
         {
-            float dr = Volume(ref cube, this.vmr.Array);
-            float dg = Volume(ref cube, this.vmg.Array);
-            float db = Volume(ref cube, this.vmb.Array);
-            float da = Volume(ref cube, this.vma.Array);
+            float dr = Volume(ref cube, this.vmr.Span);
+            float dg = Volume(ref cube, this.vmg.Span);
+            float db = Volume(ref cube, this.vmb.Span);
+            float da = Volume(ref cube, this.vma.Span);
 
             float xx =
                 this.m2[GetPaletteIndex(cube.R1, cube.G1, cube.B1, cube.A1)]
@@ -572,7 +572,7 @@ namespace SixLabors.ImageSharp.Quantizers
                 + this.m2[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A0)];
 
             var vector = new Vector4(dr, dg, db, da);
-            return xx - (Vector4.Dot(vector, vector) / Volume(ref cube, this.vwt.Array));
+            return xx - (Vector4.Dot(vector, vector) / Volume(ref cube, this.vwt.Span));
         }
 
         /// <summary>
@@ -595,22 +595,22 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <returns>The <see cref="float"/>.</returns>
         private float Maximize(ref Box cube, int direction, int first, int last, out int cut, float wholeR, float wholeG, float wholeB, float wholeA, float wholeW)
         {
-            long baseR = Bottom(ref cube, direction, this.vmr.Array);
-            long baseG = Bottom(ref cube, direction, this.vmg.Array);
-            long baseB = Bottom(ref cube, direction, this.vmb.Array);
-            long baseA = Bottom(ref cube, direction, this.vma.Array);
-            long baseW = Bottom(ref cube, direction, this.vwt.Array);
+            long baseR = Bottom(ref cube, direction, this.vmr.Span);
+            long baseG = Bottom(ref cube, direction, this.vmg.Span);
+            long baseB = Bottom(ref cube, direction, this.vmb.Span);
+            long baseA = Bottom(ref cube, direction, this.vma.Span);
+            long baseW = Bottom(ref cube, direction, this.vwt.Span);
 
             float max = 0F;
             cut = -1;
 
             for (int i = first; i < last; i++)
             {
-                float halfR = baseR + Top(ref cube, direction, i, this.vmr.Array);
-                float halfG = baseG + Top(ref cube, direction, i, this.vmg.Array);
-                float halfB = baseB + Top(ref cube, direction, i, this.vmb.Array);
-                float halfA = baseA + Top(ref cube, direction, i, this.vma.Array);
-                float halfW = baseW + Top(ref cube, direction, i, this.vwt.Array);
+                float halfR = baseR + Top(ref cube, direction, i, this.vmr.Span);
+                float halfG = baseG + Top(ref cube, direction, i, this.vmg.Span);
+                float halfB = baseB + Top(ref cube, direction, i, this.vmb.Span);
+                float halfA = baseA + Top(ref cube, direction, i, this.vma.Span);
+                float halfW = baseW + Top(ref cube, direction, i, this.vwt.Span);
 
                 if (MathF.Abs(halfW) < Constants.Epsilon)
                 {
@@ -654,11 +654,11 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <returns>Returns a value indicating whether the box has been split.</returns>
         private bool Cut(ref Box set1, ref Box set2)
         {
-            float wholeR = Volume(ref set1, this.vmr.Array);
-            float wholeG = Volume(ref set1, this.vmg.Array);
-            float wholeB = Volume(ref set1, this.vmb.Array);
-            float wholeA = Volume(ref set1, this.vma.Array);
-            float wholeW = Volume(ref set1, this.vwt.Array);
+            float wholeR = Volume(ref set1, this.vmr.Span);
+            float wholeG = Volume(ref set1, this.vmg.Span);
+            float wholeB = Volume(ref set1, this.vmb.Span);
+            float wholeA = Volume(ref set1, this.vma.Span);
+            float wholeW = Volume(ref set1, this.vwt.Span);
 
             float maxr = this.Maximize(ref set1, 3, set1.R0 + 1, set1.R1, out int cutr, wholeR, wholeG, wholeB, wholeA, wholeW);
             float maxg = this.Maximize(ref set1, 2, set1.G0 + 1, set1.G1, out int cutg, wholeR, wholeG, wholeB, wholeA, wholeW);
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
index 1f660466d..53a55e06e 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
@@ -2,6 +2,7 @@
 namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
 {
     using System.Numerics;
+    using System.Runtime.CompilerServices;
 
     using BenchmarkDotNet.Attributes;
 
@@ -36,12 +37,12 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [Benchmark(Baseline = true)]
         public void PerElement()
         {
-            Vector4[] s = this.source.Array;
-            TPixel[] d = this.destination.Array;
+            ref Vector4 s = ref this.source.Span.DangerousGetPinnableReference();
+            ref TPixel d = ref this.destination.Span.DangerousGetPinnableReference();
             
             for (int i = 0; i < this.Count; i++)
             {
-                d[i].PackFromVector4(s[i]);
+                Unsafe.Add(ref d, i).PackFromVector4(Unsafe.Add(ref s, i));
             }
         }
 
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
index fd96c02cd..8925fe903 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
@@ -61,8 +61,8 @@
         [Benchmark]
         public void PackUsingReferences()
         {
-            ref Vector4 sp = ref this.source.Array[0];
-            ref Rgba32 dp = ref this.destination.Array[0];
+            ref Vector4 sp = ref this.source.DangerousGetPinnableReference();
+            ref Rgba32 dp = ref this.destination.DangerousGetPinnableReference();
             int count = this.Count;
 
             for (int i = 0; i < count; i++)
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
index eab65bb33..fb2f03d74 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
@@ -1,6 +1,8 @@
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
 {
+    using System;
+
     using BenchmarkDotNet.Attributes;
 
     using SixLabors.ImageSharp.Memory;
@@ -33,13 +35,13 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [Benchmark(Baseline = true)]
         public void PerElement()
         {
-            byte[] s = this.source.Array;
-            TPixel[] d = this.destination.Array;
+            Span<byte> s = this.source.Span;
+            Span<TPixel> d = this.destination.Span;
             
             for (int i = 0; i < this.Count; i++)
             {
                 int i4 = i * 4;
-                TPixel c = default(TPixel);
+                var c = default(TPixel);
                 c.PackFromRgba32(new Rgba32(s[i4], s[i4 + 1], s[i4 + 2], s[i4 + 3]));
                 d[i] = c;
             }
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
index f9ecc9635..cddf0f9a8 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
@@ -1,6 +1,7 @@
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
 {
+    using System;
     using System.Numerics;
 
     using BenchmarkDotNet.Attributes;
@@ -35,8 +36,8 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [Benchmark(Baseline = true)]
         public void PerElement()
         {
-            TPixel[] s = this.source.Array;
-            Vector4[] d = this.destination.Array;
+            Span<TPixel> s = this.source.Span;
+            Span<Vector4> d = this.destination.Span;
 
             for (int i = 0; i < this.Count; i++)
             {
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
index 8475a9e82..6593a28ae 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
@@ -1,6 +1,9 @@
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
 {
+    using System;
+    using System.Numerics;
+
     using BenchmarkDotNet.Attributes;
 
     using SixLabors.ImageSharp.Memory;
@@ -33,8 +36,9 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [Benchmark(Baseline = true)]
         public void PerElement()
         {
-            TPixel[] s = this.source.Array;
-            byte[] d = this.destination.Array;
+            Span<TPixel> s = this.source.Span;
+            Span<byte> d = this.destination.Span;
+
             var rgb = default(Rgb24);
 
             for (int i = 0; i < this.Count; i++)
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
index b3e0eff14..58b80d550 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
@@ -38,8 +38,9 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [Benchmark(Baseline = true)]
         public void PerElement()
         {
-            TPixel[] s = this.source.Array;
-            byte[] d = this.destination.Array;
+            Span<TPixel> s = this.source.Span;
+            Span<byte> d = this.destination.Span;
+
             var rgba = default(Rgba32);
 
             for (int i = 0; i < this.Count; i++)
diff --git a/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs b/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
deleted file mode 100644
index 6926d9253..000000000
--- a/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Benchmarks.General
-{
-    using System;
-    using System.Runtime.CompilerServices;
-
-    using BenchmarkDotNet.Attributes;
-
-    using SixLabors.ImageSharp.Memory;
-
-    public unsafe class ClearBuffer
-    {
-        private Buffer<Rgba32> buffer;
-
-        [Params(32, 128, 512)]
-        public int Count { get; set; }
-
-        [GlobalSetup]
-        public void Setup()
-        {
-            this.buffer = Configuration.Default.MemoryManager.Allocate<Rgba32>(this.Count);
-        }
-
-        [GlobalCleanup]
-        public void Cleanup()
-        {
-            this.buffer.Dispose();
-        }
-
-        [Benchmark(Baseline = true)]
-        public void Array_Clear()
-        {
-            Array.Clear(this.buffer.Array, 0, this.Count);
-        }
-
-        [Benchmark]
-        public void Unsafe_InitBlock()
-        {
-            Unsafe.InitBlock((void*)this.buffer.Pin(), default(byte), (uint)this.Count * sizeof(uint));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs b/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
deleted file mode 100644
index 50e0bd610..000000000
--- a/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
+++ /dev/null
@@ -1,362 +0,0 @@
-namespace SixLabors.ImageSharp.Benchmarks.General
-{
-    using System.Numerics;
-    using System.Runtime.CompilerServices;
-
-    using BenchmarkDotNet.Attributes;
-
-    using SixLabors.ImageSharp.Memory;
-
-    // Pixel indexing benchmarks compare different methods for getting/setting all pixel values in a subsegment of a single pixel row.
-    public abstract unsafe class PixelIndexing
-    {
-        /// <summary>
-        /// https://github.com/dotnet/corefx/blob/master/src/System.Memory/src/System/Pinnable.cs
-        /// </summary>
-        protected class Pinnable<T>
-        {
-            public T Data;
-        }
-
-        /// <summary>
-        /// The indexer methods are encapsulated into a struct to make sure everything is inlined.
-        /// </summary>
-        internal struct Data
-        {
-            private Vector4* pointer;
-
-            private Pinnable<Vector4> pinnable;
-
-            private Vector4[] array;
-
-            private int width;
-
-            public Data(Buffer2D<Vector4> buffer)
-            {
-                this.pointer = (Vector4*)buffer.Buffer.Pin();
-                this.pinnable = Unsafe.As<Pinnable<Vector4>>(buffer.Buffer.Array);
-                this.array = buffer.Buffer.Array;
-                this.width = buffer.Width;
-            }
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Vector4 GetPointersBasicImpl(int x, int y)
-            {
-                return this.pointer[y * this.width + x];
-            }
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Vector4 GetPointersSrcsUnsafeImpl(int x, int y)
-            {
-                // This is the original solution in PixelAccessor:
-                return Unsafe.Read<Vector4>((byte*)this.pointer + (((y * this.width) + x) * Unsafe.SizeOf<Vector4>()));
-            }
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Vector4 GetReferencesImpl(int x, int y)
-            {
-                int elementOffset = (y * this.width) + x;
-                return Unsafe.Add(ref this.pinnable.Data, elementOffset);
-            }
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public ref Vector4 GetReferencesRefReturnsImpl(int x, int y)
-            {
-                int elementOffset = (y * this.width) + x;
-                return ref Unsafe.Add(ref this.pinnable.Data, elementOffset);
-            }
-
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public void IndexWithPointersBasicImpl(int x, int y, Vector4 v)
-            {
-                this.pointer[y * this.width + x] = v;
-            }
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public void IndexWithPointersSrcsUnsafeImpl(int x, int y, Vector4 v)
-            {
-                Unsafe.Write((byte*)this.pointer + (((y * this.width) + x) * Unsafe.SizeOf<Vector4>()), v);
-            }
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public void IndexWithReferencesOnPinnableIncorrectImpl(int x, int y, Vector4 v)
-            {
-                int elementOffset = (y * this.width) + x;
-                // Incorrect, because also should add a runtime-specific byte offset here. See https://github.com/dotnet/corefx/blob/master/src/System.Memory/src/System/Span.cs#L68
-                Unsafe.Add(ref this.pinnable.Data, elementOffset) = v;
-            }
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public ref Vector4 IndexWithReferencesOnPinnableIncorrectRefReturnImpl(int x, int y)
-            {
-                int elementOffset = (y * this.width) + x;
-                // Incorrect, because also should add a runtime-specific byte offset here. See https://github.com/dotnet/corefx/blob/master/src/System.Memory/src/System/Span.cs#L68
-                return ref Unsafe.Add(ref this.pinnable.Data, elementOffset);
-            }
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public void IndexWithUnsafeReferenceArithmeticsOnArray0Impl(int x, int y, Vector4 v)
-            {
-                int elementOffset = (y * this.width) + x;
-                Unsafe.Add(ref this.array[0], elementOffset) = v;
-            }
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public ref Vector4 IndexWithUnsafeReferenceArithmeticsOnArray0RefReturnImpl(int x, int y)
-            {
-                int elementOffset = (y * this.width) + x;
-                return ref Unsafe.Add(ref this.array[0], elementOffset);
-            }
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public void IndexSetArrayStraightforward(int x, int y, Vector4 v)
-            {
-                // No magic.
-                // We just index right into the array as normal people do.
-                // And it looks like this is the fastest way!
-                this.array[(y * this.width) + x] = v;
-            }
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public ref Vector4 IndexWithReferencesOnArrayStraightforwardRefReturnImpl(int x, int y)
-            {
-                // No magic.
-                // We just index right into the array as normal people do.
-                // And it looks like this is the fastest way!
-                return ref this.array[(y * this.width) + x];
-            }
-        }
-
-        internal Buffer2D<Vector4> buffer;
-
-        protected int width;
-
-        protected int startIndex;
-
-        protected int endIndex;
-
-        protected Vector4* pointer;
-
-        protected Vector4[] array;
-
-        protected Pinnable<Vector4> pinnable;
-
-        // [Params(1024)]
-        public int Count { get; set; } = 1024;
-
-        [GlobalSetup]
-        public void Setup()
-        {
-            this.width = 2048;
-            this.buffer = Configuration.Default.MemoryManager.Allocate2D<Vector4>(2048, 2048);
-            this.pointer = (Vector4*)this.buffer.Buffer.Pin();
-            this.array = this.buffer.Buffer.Array;
-            this.pinnable = Unsafe.As<Pinnable<Vector4>>(this.array);
-
-            this.startIndex = 2048 / 2 - (this.Count / 2);
-            this.endIndex = 2048 / 2 + (this.Count / 2);
-        }
-
-        [GlobalCleanup]
-        public void Cleanup()
-        {
-            this.buffer.Dispose();
-        }
-
-    }
-
-    public class PixelIndexingGetter : PixelIndexing
-    {
-        [Benchmark(Description = "Index.Get: Pointers+arithmetics", Baseline = true)]
-        public Vector4 IndexWithPointersBasic()
-        {
-            Vector4 sum = Vector4.Zero;
-            Data data = new Data(this.buffer);
-            int y = this.startIndex;
-            for (int x = this.startIndex; x < this.endIndex; x++)
-            {
-                sum += data.GetPointersBasicImpl(x, y);
-            }
-
-            return sum;
-        }
-
-        [Benchmark(Description = "Index.Get: Pointers+SRCS.Unsafe")]
-        public Vector4 IndexWithPointersSrcsUnsafe()
-        {
-            Vector4 sum = Vector4.Zero;
-            Data data = new Data(this.buffer);
-
-            int y = this.startIndex;
-            for (int x = this.startIndex; x < this.endIndex; x++)
-            {
-                sum += data.GetPointersSrcsUnsafeImpl(x, y);
-            }
-
-            return sum;
-        }
-
-        [Benchmark(Description = "Index.Get: References")]
-        public Vector4 IndexWithReferences()
-        {
-            Vector4 sum = Vector4.Zero;
-            Data data = new Data(this.buffer);
-
-            int y = this.startIndex;
-            for (int x = this.startIndex; x < this.endIndex; x++)
-            {
-                sum += data.GetReferencesImpl(x, y);
-            }
-
-            return sum;
-        }
-
-        [Benchmark(Description = "Index.Get: References|refreturns")]
-        public Vector4 IndexWithReferencesRefReturns()
-        {
-            Vector4 sum = Vector4.Zero;
-            Data data = new Data(this.buffer);
-
-            int y = this.startIndex;
-            for (int x = this.startIndex; x < this.endIndex; x++)
-            {
-                sum += data.GetReferencesRefReturnsImpl(x, y);
-            }
-
-            return sum;
-        }
-    }
-
-    public class PixelIndexingSetter : PixelIndexing
-    {
-        [Benchmark(Description = "!!! Index.Set: Pointers|arithmetics", Baseline = true)]
-        public void IndexWithPointersBasic()
-        {
-            Vector4 v = new Vector4(1, 2, 3, 4);
-            Data data = new Data(this.buffer);
-
-            int y = this.startIndex;
-            for (int x = this.startIndex; x < this.endIndex; x++)
-            {
-                data.IndexWithPointersBasicImpl(x, y, v);
-            }
-        }
-
-        [Benchmark(Description = "Index.Set: Pointers|SRCS.Unsafe")]
-        public void IndexWithPointersSrcsUnsafe()
-        {
-            Vector4 v = new Vector4(1, 2, 3, 4);
-            Data data = new Data(this.buffer);
-
-            int y = this.startIndex;
-            for (int x = this.startIndex; x < this.endIndex; x++)
-            {
-                data.IndexWithPointersSrcsUnsafeImpl(x, y, v);
-            }
-        }
-
-        [Benchmark(Description = "Index.Set: References|IncorrectPinnable")]
-        public void IndexWithReferencesPinnableBasic()
-        {
-            Vector4 v = new Vector4(1, 2, 3, 4);
-            Data data = new Data(this.buffer);
-
-            int y = this.startIndex;
-            for (int x = this.startIndex; x < this.endIndex; x++)
-            {
-                data.IndexWithReferencesOnPinnableIncorrectImpl(x, y, v);
-            }
-        }
-
-        [Benchmark(Description = "Index.Set: References|IncorrectPinnable|refreturn")]
-        public void IndexWithReferencesPinnableRefReturn()
-        {
-            Vector4 v = new Vector4(1, 2, 3, 4);
-            Data data = new Data(this.buffer);
-
-            int y = this.startIndex;
-            for (int x = this.startIndex; x < this.endIndex; x++)
-            {
-                data.IndexWithReferencesOnPinnableIncorrectRefReturnImpl(x, y) = v;
-            }
-        }
-
-        [Benchmark(Description = "Index.Set: References|Array[0]Unsafe")]
-        public void IndexWithReferencesArrayBasic()
-        {
-            Vector4 v = new Vector4(1, 2, 3, 4);
-            Data data = new Data(this.buffer);
-
-            int y = this.startIndex;
-            for (int x = this.startIndex; x < this.endIndex; x++)
-            {
-                data.IndexWithUnsafeReferenceArithmeticsOnArray0Impl(x, y, v);
-            }
-        }
-
-        [Benchmark(Description = "Index.Set: References|Array[0]Unsafe|refreturn")]
-        public void IndexWithReferencesArrayRefReturn()
-        {
-            Vector4 v = new Vector4(1, 2, 3, 4);
-            Data data = new Data(this.buffer);
-
-            int y = this.startIndex;
-            for (int x = this.startIndex; x < this.endIndex; x++)
-            {
-                data.IndexWithUnsafeReferenceArithmeticsOnArray0RefReturnImpl(x, y) = v;
-            }
-        }
-
-        [Benchmark(Description = "!!! Index.Set: References|Array+Straight")]
-        public void IndexWithReferencesArrayStraightforward()
-        {
-            Vector4 v = new Vector4(1, 2, 3, 4);
-            Data data = new Data(this.buffer);
-
-            int y = this.startIndex;
-            for (int x = this.startIndex; x < this.endIndex; x++)
-            {
-                // No magic.
-                // We just index right into the array as normal people do.
-                // And it looks like this is the fastest way!
-                data.IndexSetArrayStraightforward(x, y, v);
-            }
-        }
-
-
-        [Benchmark(Description = "!!! Index.Set: References|Array+Straight|refreturn")]
-        public void IndexWithReferencesArrayStraightforwardRefReturn()
-        {
-            Vector4 v = new Vector4(1, 2, 3, 4);
-            Data data = new Data(this.buffer);
-            
-            int y = this.startIndex;
-            for (int x = this.startIndex; x < this.endIndex; x++)
-            {
-                // No magic.
-                // We just index right into the array as normal people do.
-                // And it looks like this is the fastest way!
-                data.IndexWithReferencesOnArrayStraightforwardRefReturnImpl(x, y) = v;
-            }
-        }
-
-        [Benchmark(Description = "!!! Index.Set: SmartUnsafe")]
-        public void SmartUnsafe()
-        {
-            Vector4 v = new Vector4(1, 2, 3, 4);
-            Data data = new Data(this.buffer);
-
-            // This method is basically an unsafe variant of .GetRowSpan(y) + indexing individual pixels in the row.
-            // If a user seriously needs by-pixel manipulation to be performant, we should provide this option.
-            
-            ref Vector4 rowStart = ref data.IndexWithReferencesOnArrayStraightforwardRefReturnImpl(this.startIndex, this.startIndex);
-
-            for (int i = 0; i < this.Count; i++)
-            {
-                // We don't have to add 'Width * y' here!
-                Unsafe.Add(ref rowStart, i) = v;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
index 7f78ef39c..50c3ff005 100644
--- a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
+++ b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
@@ -46,10 +46,11 @@ namespace SixLabors.ImageSharp.Tests.Memory
             {
                 using (Buffer2D<int> buffer = Configuration.Default.MemoryManager.Allocate2D<int>(42, 42, true))
                 {
+                    Span<int> span = buffer.Span;
                     for (int j = 0; j < buffer.Buffer.Length; j++)
                     {
-                        Assert.Equal(0, buffer.Buffer.Array[j]);
-                        buffer.Buffer.Array[j] = 666;
+                        Assert.Equal(0, span[j]);
+                        span[j] = 666;
                     }
                 }
             }
@@ -95,7 +96,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         {
             using (Buffer2D<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate2D<TestStructs.Foo>(width, height))
             {
-                TestStructs.Foo[] array = buffer.Buffer.Array;
+                Span<TestStructs.Foo> array = buffer.Buffer.Span;
 
                 ref TestStructs.Foo actual = ref buffer[x, y];
 
diff --git a/tests/ImageSharp.Tests/Memory/BufferTests.cs b/tests/ImageSharp.Tests/Memory/BufferTests.cs
deleted file mode 100644
index d0a83a094..000000000
--- a/tests/ImageSharp.Tests/Memory/BufferTests.cs
+++ /dev/null
@@ -1,251 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-namespace SixLabors.ImageSharp.Tests.Memory
-{
-    using System;
-    using System.Runtime.CompilerServices;
-
-    using SixLabors.ImageSharp.Memory;
-
-    using Xunit;
-
-    public unsafe class BufferTests
-    {
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class Assert : Xunit.Assert
-        {
-            public static void SpanPointsTo<T>(Span<T> span, Buffer<T> buffer, int bufferOffset = 0)
-                where T : struct
-            {
-                ref T actual = ref span.DangerousGetPinnableReference();
-                ref T expected = ref Unsafe.Add(ref buffer[0], bufferOffset);
-
-                Assert.True(Unsafe.AreSame(ref expected, ref actual), "span does not point to the expected position");
-            }
-
-            public static void Equal(void* expected, void* actual)
-            {
-                Assert.Equal((IntPtr)expected, (IntPtr)actual);
-            }
-        }
-
-        [Theory]
-        [InlineData(42)]
-        [InlineData(1111)]
-        public void ConstructWithOwnArray(int count)
-        {
-            using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(count))
-            {
-                Assert.False(buffer.IsDisposedOrLostArrayOwnership);
-                Assert.NotNull(buffer.Array);
-                Assert.Equal(count, buffer.Length);
-                Assert.True(buffer.Array.Length >= count);
-            }
-        }
-        
-        [Theory]
-        [InlineData(42)]
-        [InlineData(1111)]
-        public void ConstructWithExistingArray(int count)
-        {
-            TestStructs.Foo[] array = new TestStructs.Foo[count];
-            using (Buffer<TestStructs.Foo> buffer = new Buffer<TestStructs.Foo>(array))
-            {
-                Assert.False(buffer.IsDisposedOrLostArrayOwnership);
-                Assert.Equal(array, buffer.Array);
-                Assert.Equal(count, buffer.Length);
-            }
-        }
-
-        [Fact]
-        public void Clear()
-        {
-            TestStructs.Foo[] a = { new TestStructs.Foo() { A = 1, B = 2 }, new TestStructs.Foo() { A = 3, B = 4 } };
-            using (Buffer<TestStructs.Foo> buffer = new Buffer<TestStructs.Foo>(a))
-            {
-                buffer.Clear();
-
-                Assert.Equal(default(TestStructs.Foo), a[0]);
-                Assert.Equal(default(TestStructs.Foo), a[1]);
-            }
-        }
-
-        [Fact]
-        public void CreateClean()
-        {
-            for (int i = 0; i < 100; i++)
-            {
-                using (Buffer<int> buffer = Configuration.Default.MemoryManager.Allocate<int>(42, true))
-                {
-                    for (int j = 0; j < buffer.Length; j++)
-                    {
-                        Assert.Equal(0, buffer.Array[j]);
-                        buffer.Array[j] = 666;
-                    }
-                }
-            }
-        }
-
-        public class Indexer
-        {
-            public static readonly TheoryData<int, int> IndexerData =
-                new TheoryData<int,int>()
-                    {
-                        { 10, 0 },
-                        { 16, 3 },
-                        { 10, 9 }
-                    };
-
-            [Theory]
-            [MemberData(nameof(IndexerData))]
-            public void Read(int length, int index)
-            {
-                TestStructs.Foo[] a = TestStructs.Foo.CreateArray(length);
-                
-                using (Buffer<TestStructs.Foo> buffer = new Buffer<TestStructs.Foo>(a))
-                {
-                    TestStructs.Foo element = buffer[index];
-
-                    Assert.Equal(a[index], element);
-                }
-            }
-
-            [Theory]
-            [MemberData(nameof(IndexerData))]
-            public void Write(int length, int index)
-            {
-                TestStructs.Foo[] a = TestStructs.Foo.CreateArray(length);
-
-                using (Buffer<TestStructs.Foo> buffer = new Buffer<TestStructs.Foo>(a))
-                {
-                    buffer[index] = new TestStructs.Foo(666, 666);
-
-                    Assert.Equal(new TestStructs.Foo(666, 666), a[index]);
-                }
-            }
-        }
-
-        [Fact]
-        public void Dispose()
-        {
-            Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(42);
-            buffer.Dispose();
-
-            Assert.True(buffer.IsDisposedOrLostArrayOwnership);
-        }
-        
-        [Theory]
-        [InlineData(7)]
-        [InlineData(123)]
-        public void CastToSpan(int bufferLength)
-        {
-            using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(bufferLength))
-            {
-                Span<TestStructs.Foo> span = buffer;
-
-                //Assert.Equal(buffer.Array, span.ToArray());
-                //Assert.Equal(0, span.Start);
-                Assert.SpanPointsTo(span, buffer);
-                Assert.Equal(span.Length, bufferLength);
-            }
-        }
-
-        [Fact]
-        public void Span()
-        {
-            using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(42))
-            {
-                Span<TestStructs.Foo> span = buffer.Span;
-
-                // Assert.Equal(buffer.Array, span.ToArray());
-                // Assert.Equal(0, span.Start);
-                Assert.SpanPointsTo(span, buffer);
-                Assert.Equal(42, span.Length);
-            }
-        }
-
-        public class Slice
-        {
-
-            [Theory]
-            [InlineData(7, 2)]
-            [InlineData(123, 17)]
-            public void WithStartOnly(int bufferLength, int start)
-            {
-                using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(bufferLength))
-                {
-                    Span<TestStructs.Foo> span = buffer.Slice(start);
-
-                    Assert.SpanPointsTo(span, buffer, start);
-                    Assert.Equal(span.Length, bufferLength - start);
-                }
-            }
-
-            [Theory]
-            [InlineData(7, 2, 5)]
-            [InlineData(123, 17, 42)]
-            public void WithStartAndLength(int bufferLength, int start, int spanLength)
-            {
-                using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(bufferLength))
-                {
-                    Span<TestStructs.Foo> span = buffer.Slice(start, spanLength);
-
-                    Assert.SpanPointsTo(span, buffer, start);
-                    Assert.Equal(span.Length, spanLength);
-                }
-            }
-        }
-        
-        [Fact]
-        public void UnPinAndTakeArrayOwnership()
-        {
-            TestStructs.Foo[] data = null;
-            using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(42))
-            {
-                data = buffer.TakeArrayOwnership();
-                Assert.True(buffer.IsDisposedOrLostArrayOwnership);
-            }
-
-            Assert.NotNull(data);
-            Assert.True(data.Length >= 42);
-        }
-
-        public class Pin
-        {
-            [Fact]
-            public void ReturnsPinnedPointerToTheBeginningOfArray()
-            {
-                using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(42))
-                {
-                    TestStructs.Foo* actual = (TestStructs.Foo*)buffer.Pin();
-                    fixed (TestStructs.Foo* expected = buffer.Array)
-                    {
-                        Assert.Equal(expected, actual);
-                    }
-                }
-            }
-
-            [Fact]
-            public void SecondCallReturnsTheSamePointer()
-            {
-                using (Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(42))
-                {
-                    IntPtr ptr1 = buffer.Pin();
-                    IntPtr ptr2 = buffer.Pin();
-
-                    Assert.Equal(ptr1, ptr2);
-                }
-            }
-
-            [Fact]
-            public void WhenCalledOnDisposedBuffer_ThrowsInvalidOperationException()
-            {
-                Buffer<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate<TestStructs.Foo>(42);
-                buffer.Dispose();
-
-                Assert.Throws<InvalidOperationException>(() => buffer.Pin());
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs b/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs
index 757c8fcf9..049c4c6ba 100644
--- a/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs
+++ b/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+// ReSharper disable InconsistentNaming
+// ReSharper disable AccessToStaticMemberViaDerivedType
 namespace SixLabors.ImageSharp.Tests.Memory
 {
     using System;
@@ -30,7 +32,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         {
             float[] stuff = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 
-            Span<float> span = new Span<float>(stuff);
+            var span = new Span<float>(stuff);
 
             ref Vector<float> v = ref span.FetchVector();
 
@@ -39,199 +41,8 @@ namespace SixLabors.ImageSharp.Tests.Memory
             Assert.Equal(2, v[2]);
             Assert.Equal(3, v[3]);
         }
-
-        [Fact]
-        public void AsBytes()
-        {
-            TestStructs.Foo[] fooz = { new TestStructs.Foo(1, 2), new TestStructs.Foo(3, 4), new TestStructs.Foo(5, 6) };
-
-            using (Buffer<TestStructs.Foo> colorBuf = new Buffer<TestStructs.Foo>(fooz))
-            {
-                Span<TestStructs.Foo> orig = colorBuf.Slice(1);
-                Span<byte> asBytes = orig.AsBytes();
-
-                //  Assert.Equal(asBytes.Start, sizeof(Foo));
-                Assert.Equal(orig.Length * Unsafe.SizeOf<TestStructs.Foo>(), asBytes.Length);
-                Assert.SameRefs(ref orig.DangerousGetPinnableReference(), ref asBytes.DangerousGetPinnableReference());
-            }
-        }
-
-        public class Construct
-        {
-            [Fact]
-            public void Basic()
-            {
-                TestStructs.Foo[] array = TestStructs.Foo.CreateArray(3);
-
-                // Act:
-                Span<TestStructs.Foo> span = new Span<TestStructs.Foo>(array);
-
-                // Assert:
-                Assert.Equal(array, span.ToArray());
-                Assert.Equal(3, span.Length);
-                Assert.SameRefs(ref array[0], ref span.DangerousGetPinnableReference());
-            }
-
-            [Fact]
-            public void WithStart()
-            {
-                TestStructs.Foo[] array = TestStructs.Foo.CreateArray(4);
-                int start = 2;
-
-                // Act:
-                Span<TestStructs.Foo> span = new Span<TestStructs.Foo>(array, start);
-
-                // Assert:
-                Assert.SameRefs(ref array[start], ref span.DangerousGetPinnableReference());
-                Assert.Equal(array.Length - start, span.Length);
-            }
-
-            [Fact]
-            public void WithStartAndLength()
-            {
-                TestStructs.Foo[] array = TestStructs.Foo.CreateArray(10);
-                int start = 2;
-                int length = 3;
-                // Act:
-                Span<TestStructs.Foo> span = new Span<TestStructs.Foo>(array, start, length);
-
-                // Assert:
-                Assert.SameRefs(ref array[start], ref span.DangerousGetPinnableReference());
-                Assert.Equal(length, span.Length);
-            }
-        }
-
-        public class Slice
-        {
-            [Fact]
-            public void StartOnly()
-            {
-                TestStructs.Foo[] array = TestStructs.Foo.CreateArray(5);
-                int start0 = 2;
-                int start1 = 2;
-                int totalOffset = start0 + start1;
-
-                Span<TestStructs.Foo> span = new Span<TestStructs.Foo>(array, start0);
-
-                // Act:
-                span = span.Slice(start1);
-
-                // Assert:
-                Assert.SameRefs(ref array[totalOffset], ref span.DangerousGetPinnableReference());
-                Assert.Equal(array.Length - totalOffset, span.Length);
-            }
-
-            [Fact]
-            public void StartAndLength()
-            {
-                TestStructs.Foo[] array = TestStructs.Foo.CreateArray(10);
-                int start0 = 2;
-                int start1 = 2;
-                int totalOffset = start0 + start1;
-                int sliceLength = 3;
-
-                Span<TestStructs.Foo> span = new Span<TestStructs.Foo>(array, start0);
-
-                // Act:
-                span = span.Slice(start1, sliceLength);
-
-                // Assert:
-                Assert.SameRefs(ref array[totalOffset], ref span.DangerousGetPinnableReference());
-                Assert.Equal(sliceLength, span.Length);
-            }
-        }
-
-        //[Theory]
-        //[InlineData(4)]
-        //[InlineData(1500)]
-        //public void Clear(int count)
-        //{
-        //    Foo[] array = Foo.CreateArray(count + 42);
-
-        //    int offset = 2;
-        //    Span<Foo> ap = new Span<Foo>(array, offset);
-
-        //    // Act:
-        //    ap.Clear(count);
-
-        //    Assert.NotEqual(default(Foo), array[offset - 1]);
-        //    Assert.Equal(default(Foo), array[offset]);
-        //    Assert.Equal(default(Foo), array[offset + count - 1]);
-        //    Assert.NotEqual(default(Foo), array[offset + count]);
-        //}
-
-        public class Indexer
-        {
-            public static readonly TheoryData<int, int, int> IndexerData =
-                new TheoryData<int, int, int>()
-                    {
-                        { 10, 0, 0 },
-                        { 10, 2, 0 },
-                        { 16, 0, 3 },
-                        { 16, 2, 3 },
-                        { 10, 0, 9 },
-                        { 10, 1, 8 }
-                    };
-
-            [Theory]
-            [MemberData(nameof(IndexerData))]
-            public void Read(int length, int start, int index)
-            {
-                TestStructs.Foo[] a = TestStructs.Foo.CreateArray(length);
-                Span<TestStructs.Foo> span = new Span<TestStructs.Foo>(a, start);
-
-                TestStructs.Foo element = span[index];
-
-                Assert.Equal(a[start + index], element);
-            }
-
-            [Theory]
-            [MemberData(nameof(IndexerData))]
-            public void Write(int length, int start, int index)
-            {
-                TestStructs.Foo[] a = TestStructs.Foo.CreateArray(length);
-                Span<TestStructs.Foo> span = new Span<TestStructs.Foo>(a, start);
-
-                span[index] = new TestStructs.Foo(666, 666);
-
-                Assert.Equal(new TestStructs.Foo(666, 666), a[start + index]);
-            }
-
-            [Theory]
-            [InlineData(10, 0, 0, 5)]
-            [InlineData(10, 1, 1, 5)]
-            [InlineData(10, 1, 1, 6)]
-            [InlineData(10, 1, 1, 7)]
-            public void AsBytes_Read(int length, int start, int index, int byteOffset)
-            {
-                TestStructs.Foo[] a = TestStructs.Foo.CreateArray(length);
-                Span<TestStructs.Foo> span = new Span<TestStructs.Foo>(a, start);
-
-                Span<byte> bytes = span.AsBytes();
-
-                byte actual = bytes[index * Unsafe.SizeOf<TestStructs.Foo>() + byteOffset];
-
-                ref byte baseRef = ref Unsafe.As<TestStructs.Foo, byte>(ref a[0]);
-                byte expected = Unsafe.Add(ref baseRef, (start + index) * Unsafe.SizeOf<TestStructs.Foo>() + byteOffset);
-
-                Assert.Equal(expected, actual);
-            }
-        }
-
-        [Theory]
-        [InlineData(0, 4)]
-        [InlineData(2, 4)]
-        [InlineData(3, 4)]
-        public void DangerousGetPinnableReference(int start, int length)
-        {
-            TestStructs.Foo[] a = TestStructs.Foo.CreateArray(length);
-            Span<TestStructs.Foo> span = new Span<TestStructs.Foo>(a, start);
-            ref TestStructs.Foo r = ref span.DangerousGetPinnableReference();
-
-            Assert.True(Unsafe.AreSame(ref a[start], ref r));
-        }
-
-        public class Copy
+        
+        public class SpanHelper_Copy
         {
             private static void AssertNotDefault<T>(T[] data, int idx)
                 where T : struct
@@ -267,8 +78,8 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 TestStructs.Foo[] source = TestStructs.Foo.CreateArray(count + 2);
                 TestStructs.Foo[] dest = new TestStructs.Foo[count + 5];
 
-                Span<TestStructs.Foo> apSource = new Span<TestStructs.Foo>(source, 1);
-                Span<TestStructs.Foo> apDest = new Span<TestStructs.Foo>(dest, 1);
+                var apSource = new Span<TestStructs.Foo>(source, 1);
+                var apDest = new Span<TestStructs.Foo>(dest, 1);
 
                 SpanHelper.Copy(apSource, apDest, count - 1);
 
@@ -290,8 +101,8 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 TestStructs.AlignedFoo[] source = TestStructs.AlignedFoo.CreateArray(count + 2);
                 TestStructs.AlignedFoo[] dest = new TestStructs.AlignedFoo[count + 5];
 
-                Span<TestStructs.AlignedFoo> apSource = new Span<TestStructs.AlignedFoo>(source, 1);
-                Span<TestStructs.AlignedFoo> apDest = new Span<TestStructs.AlignedFoo>(dest, 1);
+                var apSource = new Span<TestStructs.AlignedFoo>(source, 1);
+                var apDest = new Span<TestStructs.AlignedFoo>(dest, 1);
 
                 SpanHelper.Copy(apSource, apDest, count - 1);
 
@@ -313,8 +124,8 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 int[] source = CreateTestInts(count + 2);
                 int[] dest = new int[count + 5];
 
-                Span<int> apSource = new Span<int>(source, 1);
-                Span<int> apDest = new Span<int>(dest, 1);
+                var apSource = new Span<int>(source, 1);
+                var apDest = new Span<int>(dest, 1);
 
                 SpanHelper.Copy(apSource, apDest, count - 1);
 
@@ -337,8 +148,8 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 TestStructs.Foo[] source = TestStructs.Foo.CreateArray(count + 2);
                 byte[] dest = new byte[destCount + sizeof(TestStructs.Foo) * 2];
 
-                Span<TestStructs.Foo> apSource = new Span<TestStructs.Foo>(source, 1);
-                Span<byte> apDest = new Span<byte>(dest, sizeof(TestStructs.Foo));
+                var apSource = new Span<TestStructs.Foo>(source, 1);
+                var apDest = new Span<byte>(dest, sizeof(TestStructs.Foo));
 
                 SpanHelper.Copy(apSource.AsBytes(), apDest, (count - 1) * sizeof(TestStructs.Foo));
 
@@ -360,8 +171,8 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 TestStructs.AlignedFoo[] source = TestStructs.AlignedFoo.CreateArray(count + 2);
                 byte[] dest = new byte[destCount + sizeof(TestStructs.AlignedFoo) * 2];
 
-                Span<TestStructs.AlignedFoo> apSource = new Span<TestStructs.AlignedFoo>(source, 1);
-                Span<byte> apDest = new Span<byte>(dest, sizeof(TestStructs.AlignedFoo));
+                var apSource = new Span<TestStructs.AlignedFoo>(source, 1);
+                var apDest = new Span<byte>(dest, sizeof(TestStructs.AlignedFoo));
 
                 SpanHelper.Copy(apSource.AsBytes(), apDest, (count - 1) * sizeof(TestStructs.AlignedFoo));
 
@@ -383,8 +194,8 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 int[] source = CreateTestInts(count + 2);
                 byte[] dest = new byte[destCount + sizeof(int) + 1];
 
-                Span<int> apSource = new Span<int>(source);
-                Span<byte> apDest = new Span<byte>(dest);
+                var apSource = new Span<int>(source);
+                var apDest = new Span<byte>(dest);
 
                 SpanHelper.Copy(apSource.AsBytes(), apDest, count * sizeof(int));
 
@@ -404,8 +215,8 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 byte[] source = CreateTestBytes(srcCount);
                 TestStructs.Foo[] dest = new TestStructs.Foo[count + 2];
 
-                Span<byte> apSource = new Span<byte>(source);
-                Span<TestStructs.Foo> apDest = new Span<TestStructs.Foo>(dest);
+                var apSource = new Span<byte>(source);
+                var apDest = new Span<TestStructs.Foo>(dest);
 
                 SpanHelper.Copy(apSource, apDest.AsBytes(), count * sizeof(TestStructs.Foo));
 
@@ -417,26 +228,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 Assert.True((bool)ElementsAreEqual(dest, source, count - 1));
                 Assert.False((bool)ElementsAreEqual(dest, source, count));
             }
-
-            [Fact]
-            public void Color32ToBytes()
-            {
-                Rgba32[] colors = { new Rgba32(0, 1, 2, 3), new Rgba32(4, 5, 6, 7), new Rgba32(8, 9, 10, 11), };
-
-                using (Buffer<Rgba32> colorBuf = new Buffer<Rgba32>(colors))
-                using (Buffer<byte> byteBuf = Configuration.Default.MemoryManager.Allocate<byte>(colors.Length * 4))
-                {
-                    SpanHelper.Copy(colorBuf.Span.AsBytes(), byteBuf, colorBuf.Length * sizeof(Rgba32));
-
-                    byte[] a = byteBuf.Array;
-
-                    for (int i = 0; i < byteBuf.Length; i++)
-                    {
-                        Assert.Equal((byte)i, a[i]);
-                    }
-                }
-            }
-
+            
             internal static bool ElementsAreEqual(TestStructs.Foo[] array, byte[] rawArray, int index)
             {
                 fixed (TestStructs.Foo* pArray = array)
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
index 39cc0f35e..8787fba55 100644
--- a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
@@ -375,8 +375,8 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
                 }
                 else
                 {
-                    TDest[] expected = this.ExpectedDestBuffer.Array;
-                    TDest[] actual = this.ActualDestBuffer.Array;
+                    Span<TDest> expected = this.ExpectedDestBuffer.Span;
+                    Span<TDest> actual = this.ActualDestBuffer.Span;
                     for (int i = 0; i < count; i++)
                     {
                         Assert.Equal(expected[i], actual[i]);
@@ -402,7 +402,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
         internal static Vector4[] CreateVector4TestData(int length)
         {
             Vector4[] result = new Vector4[length];
-            Random rnd = new Random(42); // Deterministic random values
+            var rnd = new Random(42); // Deterministic random values
 
             for (int i = 0; i < result.Length; i++)
             {
@@ -415,7 +415,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
         {
             TPixel[] result = new TPixel[length];
 
-            Random rnd = new Random(42); // Deterministic random values
+            var rnd = new Random(42); // Deterministic random values
 
             for (int i = 0; i < result.Length; i++)
             {
@@ -429,7 +429,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
         internal static byte[] CreateByteTestData(int length)
         {
             byte[] result = new byte[length];
-            Random rnd = new Random(42); // Deterministic random values
+            var rnd = new Random(42); // Deterministic random values
 
             for (int i = 0; i < result.Length; i++)
             {

From 1e70705621cf37b1c7cc7228cdb5b80eedef061c Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Mon, 19 Feb 2018 21:53:23 +0100
Subject: [PATCH 29/70] fix regression in GifDecoderCore

---
 src/ImageSharp/Formats/Gif/GifDecoderCore.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
index c35d506df..da92665be 100644
--- a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
@@ -151,8 +151,6 @@ namespace SixLabors.ImageSharp.Formats.Gif
                         break;
                     }
 
-                    this.globalColorTable = this.MemoryManager.AllocateManagedByteBuffer(this.globalColorTableLength, true);
-
                     nextFlag = stream.ReadByte();
                     if (nextFlag == -1)
                     {

From b61574fdd047b6cce929fa65daf4761be32e7826 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Mon, 19 Feb 2018 22:23:20 +0100
Subject: [PATCH 30/70] clean up Buffer<T> API

---
 src/ImageSharp/Memory/Buffer2D{T}.cs          |  4 +-
 src/ImageSharp/Memory/Buffer{T}.cs            | 83 +------------------
 .../Memory/SimpleManagedMemoryManager.cs      |  2 +-
 .../Processors/Transforms/WeightsWindow.cs    |  5 +-
 .../Bulk/PackFromVector4ReferenceVsPointer.cs | 77 -----------------
 .../General/IterateArray.cs                   | 73 ----------------
 .../Formats/Jpg/JpegColorConverterTests.cs    |  2 +-
 .../Formats/Jpg/SpectralJpegTests.cs          |  2 +-
 .../ImageSharp.Tests/Memory/Buffer2DTests.cs  |  8 +-
 .../PixelFormats/PixelOperationsTests.cs      | 16 ++--
 .../ReferenceCodecs/SystemDrawingBridge.cs    | 50 ++++++-----
 .../TestUtilities/TestImageExtensions.cs      |  8 +-
 12 files changed, 55 insertions(+), 275 deletions(-)
 delete mode 100644 tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
 delete mode 100644 tests/ImageSharp.Benchmarks/General/IterateArray.cs

diff --git a/src/ImageSharp/Memory/Buffer2D{T}.cs b/src/ImageSharp/Memory/Buffer2D{T}.cs
index e527c90c0..6b18aaa8f 100644
--- a/src/ImageSharp/Memory/Buffer2D{T}.cs
+++ b/src/ImageSharp/Memory/Buffer2D{T}.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="wrappedBuffer">The buffer to wrap</param>
         /// <param name="width">The number of elements in a row</param>
         /// <param name="height">The number of rows</param>
-        public Buffer2D(Buffer<T> wrappedBuffer, int width, int height)
+        public Buffer2D(IBuffer<T> wrappedBuffer, int width, int height)
         {
             this.Buffer = wrappedBuffer;
             this.Width = width;
@@ -36,7 +36,7 @@ namespace SixLabors.ImageSharp.Memory
 
         public Span<T> Span => this.Buffer.Span;
 
-        public Buffer<T> Buffer { get; }
+        public IBuffer<T> Buffer { get; }
 
         /// <summary>
         /// Gets a reference to the element at the specified position.
diff --git a/src/ImageSharp/Memory/Buffer{T}.cs b/src/ImageSharp/Memory/Buffer{T}.cs
index 1ee1571c8..55eb44820 100644
--- a/src/ImageSharp/Memory/Buffer{T}.cs
+++ b/src/ImageSharp/Memory/Buffer{T}.cs
@@ -18,16 +18,6 @@ namespace SixLabors.ImageSharp.Memory
     {
         private MemoryManager memoryManager;
 
-        /// <summary>
-        /// A pointer to the first element of <see cref="array"/> when pinned.
-        /// </summary>
-        private IntPtr pointer;
-
-        /// <summary>
-        /// A handle that allows to access the managed <see cref="array"/> as an unmanaged memory by pinning.
-        /// </summary>
-        private GCHandle handle;
-
         // why is there such a rule? :S Protected should be fine for a field!
 #pragma warning disable SA1401 // Fields should be private
         /// <summary>
@@ -36,22 +26,7 @@ namespace SixLabors.ImageSharp.Memory
         protected T[] array;
 #pragma warning restore SA1401 // Fields should be private
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Buffer{T}"/> class.
-        /// </summary>
-        /// <param name="array">The array to pin.</param>
-        public Buffer(T[] array)
-        {
-            this.Length = array.Length;
-            this.array = array;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Buffer{T}"/> class.
-        /// </summary>
-        /// <param name="array">The array to pin.</param>
-        /// <param name="length">The count of "relevant" elements in 'array'.</param>
-        public Buffer(T[] array, int length)
+        internal Buffer(T[] array, int length, MemoryManager memoryManager)
         {
             if (array.Length < length)
             {
@@ -60,22 +35,9 @@ namespace SixLabors.ImageSharp.Memory
 
             this.Length = length;
             this.array = array;
-        }
-
-        internal Buffer(T[] array, int length, MemoryManager memoryManager)
-            : this(array, length)
-        {
             this.memoryManager = memoryManager;
         }
 
-        /// <summary>
-        /// Finalizes an instance of the <see cref="Buffer{T}"/> class.
-        /// </summary>
-        ~Buffer()
-        {
-            this.UnPin();
-        }
-
         /// <summary>
         /// Gets a value indicating whether this <see cref="Buffer{T}"/> instance is disposed, or has lost ownership of <see cref="array"/>.
         /// </summary>
@@ -140,7 +102,6 @@ namespace SixLabors.ImageSharp.Memory
             }
 
             this.IsDisposedOrLostArrayOwnership = true;
-            this.UnPin();
 
             this.memoryManager?.Release(this);
 
@@ -166,33 +127,10 @@ namespace SixLabors.ImageSharp.Memory
             }
 
             this.IsDisposedOrLostArrayOwnership = true;
-            this.UnPin();
-            T[] array = this.array;
+            T[] a = this.array;
             this.array = null;
             this.memoryManager = null;
-            return array;
-        }
-
-        /// <summary>
-        /// Pins <see cref="array"/>.
-        /// </summary>
-        /// <returns>The pinned pointer</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public IntPtr Pin()
-        {
-            if (this.IsDisposedOrLostArrayOwnership)
-            {
-                throw new InvalidOperationException(
-                    "Pin() is invalid on a buffer with IsDisposedOrLostArrayOwnership == true!");
-            }
-
-            if (this.pointer == IntPtr.Zero)
-            {
-                this.handle = GCHandle.Alloc(this.array, GCHandleType.Pinned);
-                this.pointer = this.handle.AddrOfPinnedObject();
-            }
-
-            return this.pointer;
+            return a;
         }
 
         /// <summary>
@@ -202,20 +140,5 @@ namespace SixLabors.ImageSharp.Memory
         {
             return this.array;
         }
-
-        /// <summary>
-        /// Unpins <see cref="array"/>.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void UnPin()
-        {
-            if (this.pointer == IntPtr.Zero || !this.handle.IsAllocated)
-            {
-                return;
-            }
-
-            this.handle.Free();
-            this.pointer = IntPtr.Zero;
-        }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs b/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
index 12d8582c7..ac4098c71 100644
--- a/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
+++ b/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
@@ -8,7 +8,7 @@
         /// <inheritdoc />
         internal override Buffer<T> Allocate<T>(int length, bool clear)
         {
-            return new Buffer<T>(new T[length], length);
+            return new Buffer<T>(new T[length], length, this);
         }
 
         internal override IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear)
diff --git a/src/ImageSharp/Processing/Processors/Transforms/WeightsWindow.cs b/src/ImageSharp/Processing/Processors/Transforms/WeightsWindow.cs
index 1ee61a9a6..399b3db84 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/WeightsWindow.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/WeightsWindow.cs
@@ -32,7 +32,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <summary>
         /// The buffer containing the weights values.
         /// </summary>
-        private readonly Buffer<float> buffer;
+        private readonly IBuffer<float> buffer;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WeightsWindow"/> struct.
@@ -57,7 +57,8 @@ namespace SixLabors.ImageSharp.Processing.Processors
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ref float GetStartReference()
         {
-            return ref this.buffer[this.flatStartIndex];
+            Span<float> span = this.buffer.Span;
+            return ref span[this.flatStartIndex];
         }
 
         /// <summary>
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
deleted file mode 100644
index 8925fe903..000000000
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-namespace SixLabors.ImageSharp.Benchmarks
-{
-    using System.Numerics;
-    using System.Runtime.CompilerServices;
-
-    using BenchmarkDotNet.Attributes;
-
-    using SixLabors.ImageSharp;
-    using SixLabors.ImageSharp.Memory;
-
-    /// <summary>
-    /// Compares two implementation candidates for general BulkPixelOperations.ToVector4():
-    /// - One iterating with pointers
-    /// - One iterating with ref locals
-    /// </summary>
-    public unsafe class PackFromVector4ReferenceVsPointer
-    {
-        private Buffer<Rgba32> destination;
-
-        private Buffer<Vector4> source;
-
-        [Params(16, 128, 1024)]
-        public int Count { get; set; }
-
-        [GlobalSetup]
-        public void Setup()
-        {
-            this.destination = Configuration.Default.MemoryManager.Allocate<Rgba32>(this.Count);
-            this.source = Configuration.Default.MemoryManager.Allocate<Vector4>(this.Count * 4);
-            this.source.Pin();
-            this.destination.Pin();
-        }
-
-        [GlobalCleanup]
-        public void Cleanup()
-        {
-            this.source.Dispose();
-            this.destination.Dispose();
-        }
-
-        [Benchmark(Baseline = true)]
-        public void PackUsingPointers()
-        {
-            Vector4* sp = (Vector4*)this.source.Pin();
-            byte* dp = (byte*)this.destination.Pin();
-            int count = this.Count;
-            int size = sizeof(Rgba32);
-
-            for (int i = 0; i < count; i++)
-            {
-                Vector4 v = Unsafe.Read<Vector4>(sp);
-                Rgba32 c = default(Rgba32);
-                c.PackFromVector4(v);
-                Unsafe.Write(dp, c);
-
-                sp++;
-                dp += size;
-            }
-        }
-
-        [Benchmark]
-        public void PackUsingReferences()
-        {
-            ref Vector4 sp = ref this.source.DangerousGetPinnableReference();
-            ref Rgba32 dp = ref this.destination.DangerousGetPinnableReference();
-            int count = this.Count;
-
-            for (int i = 0; i < count; i++)
-            {
-                dp.PackFromVector4(sp);
-
-                sp = Unsafe.Add(ref sp, 1);
-                dp = Unsafe.Add(ref dp, 1);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Benchmarks/General/IterateArray.cs b/tests/ImageSharp.Benchmarks/General/IterateArray.cs
deleted file mode 100644
index e06d71f4a..000000000
--- a/tests/ImageSharp.Benchmarks/General/IterateArray.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-namespace SixLabors.ImageSharp.Benchmarks.General
-{
-    using System.Numerics;
-    using System.Runtime.CompilerServices;
-
-    using BenchmarkDotNet.Attributes;
-
-    using SixLabors.ImageSharp.Memory;
-
-    public class IterateArray
-    {
-        // Usual pinned stuff
-        private Buffer<Vector4> buffer;
-
-        // An array that's not pinned by intent!
-        private Vector4[] array;
-        
-        [Params(64, 1024)]
-        public int Length { get; set; }
-
-        [GlobalSetup]
-        public void Setup()
-        {
-            this.buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(this.Length);
-            this.buffer.Pin();
-            this.array = new Vector4[this.Length];
-        }
-
-        [Benchmark(Baseline = true)]
-        public Vector4 IterateIndexed()
-        {
-            Vector4 sum = new Vector4();
-            Vector4[] a = this.array;
-
-            for (int i = 0; i < a.Length; i++)
-            {
-                sum += a[i];
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        public unsafe Vector4 IterateUsingPointers()
-        {
-            Vector4 sum = new Vector4();
-
-            Vector4* ptr = (Vector4*) this.buffer.Pin();
-            Vector4* end = ptr + this.Length;
-
-            for (; ptr < end; ptr++)
-            {
-                sum += *ptr;
-            }
-
-            return sum;
-        }
-
-        [Benchmark]
-        public Vector4 IterateUsingReferences()
-        {
-            Vector4 sum = new Vector4();
-
-            ref Vector4 start = ref this.array[0];
-
-            for (int i = 0; i < this.Length; i++)
-            {
-                sum += Unsafe.Add(ref start, i);
-            }
-
-            return sum;
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
index ffac1eafa..b5d4aaebe 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
@@ -289,7 +289,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 }
 
                 // no need to dispose when buffer is not array owner
-                buffers[i] = new Buffer2D<float>(new Buffer<float>(values, values.Length), values.Length, 1);
+                buffers[i] = new Buffer2D<float>(new FakeBuffer<float>(values), values.Length, 1);
             }
             return new JpegColorConverter.ComponentValues(buffers, 0);
         }
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs
index 46d832883..4508c6863 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs
@@ -106,7 +106,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 this.Output.WriteLine($"Component{i}: {diff}");
                 averageDifference += diff.average;
                 totalDifference += diff.total;
-                tolerance += libJpegComponent.SpectralBlocks.Buffer.Length;
+                tolerance += libJpegComponent.SpectralBlocks.Buffer.Span.Length;
             }
             averageDifference /= componentCount;
 
diff --git a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
index 50c3ff005..6afce94fd 100644
--- a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
+++ b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
@@ -16,11 +16,11 @@ namespace SixLabors.ImageSharp.Tests.Memory
         // ReSharper disable once ClassNeverInstantiated.Local
         private class Assert : Xunit.Assert
         {
-            public static void SpanPointsTo<T>(Span<T> span, Buffer<T> buffer, int bufferOffset = 0)
+            public static void SpanPointsTo<T>(Span<T> span, IBuffer<T> buffer, int bufferOffset = 0)
                 where T : struct
             {
                 ref T actual = ref span.DangerousGetPinnableReference();
-                ref T expected = ref Unsafe.Add(ref buffer[0], bufferOffset);
+                ref T expected = ref Unsafe.Add(ref buffer.DangerousGetPinnableReference(), bufferOffset);
 
                 Assert.True(Unsafe.AreSame(ref expected, ref actual), "span does not point to the expected position");
             }
@@ -35,7 +35,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             {
                 Assert.Equal(width, buffer.Width);
                 Assert.Equal(height, buffer.Height);
-                Assert.Equal(width * height, buffer.Buffer.Length);
+                Assert.Equal(width * height, buffer.Buffer.Length());
             }
         }
 
@@ -47,7 +47,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 using (Buffer2D<int> buffer = Configuration.Default.MemoryManager.Allocate2D<int>(42, 42, true))
                 {
                     Span<int> span = buffer.Span;
-                    for (int j = 0; j < buffer.Buffer.Length; j++)
+                    for (int j = 0; j < span.Length; j++)
                     {
                         Assert.Equal(0, span[j]);
                         span[j] = 666;
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
index 8787fba55..2ea06d724 100644
--- a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
@@ -333,25 +333,23 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             where TSource : struct
             where TDest : struct
         {
-            public Buffer<TSource> SourceBuffer { get; }
+            public TSource[] SourceBuffer { get; }
             public Buffer<TDest> ActualDestBuffer { get; }
-            public Buffer<TDest> ExpectedDestBuffer { get; }
+            public TDest[] ExpectedDestBuffer { get; }
 
             public Span<TSource> Source => this.SourceBuffer;
             public Span<TDest> ActualDest => this.ActualDestBuffer;
 
             public TestBuffers(TSource[] source, TDest[] expectedDest)
             {
-                this.SourceBuffer = new Buffer<TSource>(source);
-                this.ExpectedDestBuffer = new Buffer<TDest>(expectedDest);
+                this.SourceBuffer = source;
+                this.ExpectedDestBuffer = expectedDest;
                 this.ActualDestBuffer = Configuration.Default.MemoryManager.Allocate<TDest>(expectedDest.Length);
             }
 
             public void Dispose()
             {
-                this.SourceBuffer.Dispose();
                 this.ActualDestBuffer.Dispose();
-                this.ExpectedDestBuffer.Dispose();
             }
 
             private const float Tolerance = 0.0001f;
@@ -363,7 +361,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
                 if (typeof(TDest) == typeof(Vector4))
                 {
                     
-                    Span<Vector4> expected = this.ExpectedDestBuffer.Span.NonPortableCast<TDest, Vector4>();
+                    Span<Vector4> expected = this.ExpectedDestBuffer.AsSpan().NonPortableCast<TDest, Vector4>();
                     Span<Vector4> actual = this.ActualDestBuffer.Span.NonPortableCast<TDest, Vector4>();
 
                     for (int i = 0; i < count; i++)
@@ -375,7 +373,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
                 }
                 else
                 {
-                    Span<TDest> expected = this.ExpectedDestBuffer.Span;
+                    Span<TDest> expected = this.ExpectedDestBuffer.AsSpan();
                     Span<TDest> actual = this.ActualDestBuffer.Span;
                     for (int i = 0; i < count; i++)
                     {
@@ -388,7 +386,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
         internal static void TestOperation<TSource, TDest>(
             TSource[] source,
             TDest[] expected,
-            Action<Buffer<TSource>, Buffer<TDest>> action)
+            Action<TSource[], Buffer<TDest>> action)
             where TSource : struct
             where TDest : struct
         {
diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
index d14a0165a..b8907e81e 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
@@ -96,18 +96,20 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
 
             var image = new Image<TPixel>(w, h);
 
-            using (var workBuffer = Configuration.Default.MemoryManager.Allocate<Argb32>(w))
+            using (IBuffer<Argb32> workBuffer = Configuration.Default.MemoryManager.Allocate<Argb32>(w))
             {
-                var destPtr = (Argb32*)workBuffer.Pin();
-                for (int y = 0; y < h; y++)
+                fixed (Argb32* destPtr = &workBuffer.DangerousGetPinnableReference())
                 {
-                    Span<TPixel> row = image.Frames.RootFrame.GetPixelRowSpan(y);
+                    for (int y = 0; y < h; y++)
+                    {
+                        Span<TPixel> row = image.Frames.RootFrame.GetPixelRowSpan(y);
 
-                    byte* sourcePtr = sourcePtrBase + data.Stride * y;
+                        byte* sourcePtr = sourcePtrBase + data.Stride * y;
 
-                    Buffer.MemoryCopy(sourcePtr, destPtr, destRowByteCount, sourceRowByteCount);
+                        Buffer.MemoryCopy(sourcePtr, destPtr, destRowByteCount, sourceRowByteCount);
 
-                    FromArgb32(workBuffer, row);
+                        FromArgb32(workBuffer.Span, row);
+                    }
                 }
             }
 
@@ -138,18 +140,20 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
 
             var image = new Image<TPixel>(w, h);
 
-            using (var workBuffer = Configuration.Default.MemoryManager.Allocate<Rgb24>(w))
+            using (IBuffer<Rgb24> workBuffer = Configuration.Default.MemoryManager.Allocate<Rgb24>(w))
             {
-                var destPtr = (Rgb24*)workBuffer.Pin();
-                for (int y = 0; y < h; y++)
+                fixed (Rgb24* destPtr = &workBuffer.DangerousGetPinnableReference())
                 {
-                    Span<TPixel> row = image.Frames.RootFrame.GetPixelRowSpan(y);
+                    for (int y = 0; y < h; y++)
+                    {
+                        Span<TPixel> row = image.Frames.RootFrame.GetPixelRowSpan(y);
 
-                    byte* sourcePtr = sourcePtrBase + data.Stride * y;
+                        byte* sourcePtr = sourcePtrBase + data.Stride * y;
 
-                    Buffer.MemoryCopy(sourcePtr, destPtr, destRowByteCount, sourceRowByteCount);
+                        Buffer.MemoryCopy(sourcePtr, destPtr, destRowByteCount, sourceRowByteCount);
 
-                    FromRgb24(workBuffer, row);
+                        FromRgb24(workBuffer.Span, row);
+                    }
                 }
             }
 
@@ -170,17 +174,19 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             long destRowByteCount = data.Stride;
             long sourceRowByteCount = w * sizeof(Argb32);
 
-            using (var workBuffer = Configuration.Default.MemoryManager.Allocate<Argb32>(w))
+            using (IBuffer<Argb32> workBuffer = image.GetConfiguration().MemoryManager.Allocate<Argb32>(w))
             {
-                var sourcePtr = (Argb32*)workBuffer.Pin();
-
-                for (int y = 0; y < h; y++)
+                fixed (Argb32* sourcePtr = &workBuffer.DangerousGetPinnableReference())
                 {
-                    Span<TPixel> row = image.Frames.RootFrame.GetPixelRowSpan(y);
-                    ToArgb32(row, workBuffer);
-                    byte* destPtr = destPtrBase + data.Stride * y;
 
-                    Buffer.MemoryCopy(sourcePtr, destPtr, destRowByteCount, sourceRowByteCount);
+                    for (int y = 0; y < h; y++)
+                    {
+                        Span<TPixel> row = image.Frames.RootFrame.GetPixelRowSpan(y);
+                        ToArgb32(row, workBuffer.Span);
+                        byte* destPtr = destPtrBase + data.Stride * y;
+
+                        Buffer.MemoryCopy(sourcePtr, destPtr, destRowByteCount, sourceRowByteCount);
+                    }
                 }
             }
 
diff --git a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
index 54e55f7e5..b830acdef 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
@@ -151,7 +151,7 @@ namespace SixLabors.ImageSharp.Tests
             bool appendPixelTypeToFileName = true)
             where TPixel : struct, IPixel<TPixel>
         {
-            using (Image<TPixel> firstFrameOnlyImage = new Image<TPixel>(image.Width, image.Height))
+            using (var firstFrameOnlyImage = new Image<TPixel>(image.Width, image.Height))
             using (Image<TPixel> referenceImage = GetReferenceOutputImage<TPixel>(
                 provider,
                 testOutputDetails,
@@ -378,9 +378,11 @@ namespace SixLabors.ImageSharp.Tests
 
             Span<Rgba32> pixels = image.Frames.RootFrame.GetPixelSpan();
 
-            for (int i = 0; i < buffer.Buffer.Length; i++)
+            Span<float> bufferSpan = buffer.Span;
+
+            for (int i = 0; i < bufferSpan.Length; i++)
             {
-                float value = buffer.Buffer[i] * scale;
+                float value = bufferSpan[i] * scale;
                 var v = new Vector4(value, value, value, 1f);
                 pixels[i].PackFromVector4(v);
             }

From 7881fdd341ad1da9e7a10812b690593e820507d6 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 20 Feb 2018 02:07:27 +0100
Subject: [PATCH 31/70] Hide Buffer<T> indexer + !! WuQuantizer review in
 comments !!

---
 .../Brushes/ImageBrush{TPixel}.cs             |  13 +-
 .../Brushes/PatternBrush{TPixel}.cs           |  13 +-
 .../Brushes/Processors/BrushApplicator.cs     |  13 +-
 .../Brushes/RecolorBrush{TPixel}.cs           |  13 +-
 .../Brushes/SolidBrush{TPixel}.cs             |  15 +-
 .../Processors/DrawImageProcessor.cs          |   9 +-
 .../Processors/FillProcessor.cs               |  24 +--
 .../Processors/FillRegionProcessor.cs         |   4 +-
 src/ImageSharp/Formats/Gif/LzwDecoder.cs      |  26 +--
 src/ImageSharp/Formats/Gif/LzwEncoder.cs      |  39 ++--
 .../Common/Decoder/JpegImagePostProcessor.cs  |   4 +-
 .../GolangPort/Components/Decoder/Bytes.cs    |  22 ++-
 .../PdfJsPort/Components/PdfJsHuffmanTable.cs |  10 +-
 .../Components/PdfJsJpegPixelArea.cs          |   8 +-
 .../PdfJsPort/Components/PdfJsScanDecoder.cs  |  14 +-
 .../Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs    |   4 +-
 .../{FakeBuffer.cs => BasicArrayBuffer.cs}    |  10 +-
 src/ImageSharp/Memory/Buffer{T}.cs            |  69 +------
 src/ImageSharp/Memory/MemoryManager.cs        |   4 +-
 .../Effects/BackgroundColorProcessor.cs       |  14 +-
 .../Processors/Overlays/GlowProcessor.cs      |  16 +-
 .../Processors/Overlays/VignetteProcessor.cs  |  18 +-
 .../Processors/Transforms/ResizeProcessor.cs  |   8 +-
 .../Quantizers/QuantizerBase{TPixel}.cs       |   1 +
 .../Quantizers/WuQuantizer{TPixel}.cs         | 173 +++++++++++-------
 .../Color/Bulk/PackFromVector4.cs             |   4 +-
 .../Color/Bulk/PackFromXyzw.cs                |   4 +-
 .../Color/Bulk/ToVector4.cs                   |   4 +-
 .../ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs |   4 +-
 .../Color/Bulk/ToXyzw.cs                      |   4 +-
 .../PixelBlenders/PorterDuffBulkVsPixel.cs    |  42 ++---
 tests/ImageSharp.Benchmarks/Samplers/Glow.cs  |   5 +-
 .../Formats/Jpg/JpegColorConverterTests.cs    |   2 +-
 .../PixelFormats/PixelOperationsTests.cs      |  31 ++--
 .../ReferenceCodecs/SystemDrawingBridge.cs    |  21 ++-
 35 files changed, 334 insertions(+), 331 deletions(-)
 rename src/ImageSharp/Memory/{FakeBuffer.cs => BasicArrayBuffer.cs} (82%)

diff --git a/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
index ff69d65ee..5866d9fea 100644
--- a/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
@@ -122,24 +122,27 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             internal override void Apply(Span<float> scanline, int x, int y)
             {
                 // Create a span for colors
-                using (var amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
-                using (var overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
+                using (Buffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+                using (Buffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
                 {
+                    Span<float> amountSpan = amountBuffer.Span;
+                    Span<TPixel> overlaySpan = overlay.Span;
+
                     int sourceY = (y - this.offsetY) % this.yLength;
                     int offsetX = x - this.offsetX;
                     Span<TPixel> sourceRow = this.source.GetPixelRowSpan(sourceY);
 
                     for (int i = 0; i < scanline.Length; i++)
                     {
-                        amountBuffer[i] = scanline[i] * this.Options.BlendPercentage;
+                        amountSpan[i] = scanline[i] * this.Options.BlendPercentage;
 
                         int sourceX = (i + offsetX) % this.xLength;
                         TPixel pixel = sourceRow[sourceX];
-                        overlay[i] = pixel;
+                        overlaySpan[i] = pixel;
                     }
 
                     Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
-                    this.Blender.Blend(destinationRow, destinationRow, overlay, amountBuffer);
+                    this.Blender.Blend(destinationRow, destinationRow, overlaySpan, amountSpan);
                 }
             }
         }
diff --git a/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
index 2a2597987..ac8ffa794 100644
--- a/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
@@ -152,19 +152,22 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             internal override void Apply(Span<float> scanline, int x, int y)
             {
                 int patternY = y % this.pattern.Height;
-                using (var amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
-                using (var overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
+                using (Buffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+                using (Buffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
                 {
+                    Span<float> amountSpan = amountBuffer.Span;
+                    Span<TPixel> overlaySpan = overlay.Span;
+
                     for (int i = 0; i < scanline.Length; i++)
                     {
-                        amountBuffer[i] = (scanline[i] * this.Options.BlendPercentage).Clamp(0, 1);
+                        amountSpan[i] = (scanline[i] * this.Options.BlendPercentage).Clamp(0, 1);
 
                         int patternX = (x + i) % this.pattern.Width;
-                        overlay[i] = this.pattern[patternY, patternX];
+                        overlaySpan[i] = this.pattern[patternY, patternX];
                     }
 
                     Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
-                    this.Blender.Blend(destinationRow, destinationRow, overlay, amountBuffer);
+                    this.Blender.Blend(destinationRow, destinationRow, overlaySpan, amountSpan);
                 }
             }
         }
diff --git a/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs b/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
index 08bbb571a..dadd546e9 100644
--- a/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
+++ b/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
@@ -65,21 +65,24 @@ namespace SixLabors.ImageSharp.Drawing.Brushes.Processors
         /// <remarks>scanlineBuffer will be > scanlineWidth but provide and offset in case we want to share a larger buffer across runs.</remarks>
         internal virtual void Apply(Span<float> scanline, int x, int y)
         {
-            using (var amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
-            using (var overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
+            using (Buffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+            using (Buffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
             {
+                Span<float> amountSpan = amountBuffer.Span;
+                Span<TPixel> overlaySpan = overlay.Span;
+
                 for (int i = 0; i < scanline.Length; i++)
                 {
                     if (this.Options.BlendPercentage < 1)
                     {
-                        amountBuffer[i] = scanline[i] * this.Options.BlendPercentage;
+                        amountSpan[i] = scanline[i] * this.Options.BlendPercentage;
                     }
 
-                    overlay[i] = this[x + i, y];
+                    overlaySpan[i] = this[x + i, y];
                 }
 
                 Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
-                this.Blender.Blend(destinationRow, destinationRow, overlay, amountBuffer);
+                this.Blender.Blend(destinationRow, destinationRow, overlaySpan, amountSpan);
             }
         }
     }
diff --git a/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
index d48045711..d1fda7ebe 100644
--- a/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
@@ -144,22 +144,25 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             /// <inheritdoc />
             internal override void Apply(Span<float> scanline, int x, int y)
             {
-                using (var amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
-                using (var overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
+                using (Buffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+                using (Buffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
                 {
+                    Span<float> amountSpan = amountBuffer.Span;
+                    Span<TPixel> overlaySpan = overlay.Span;
+
                     for (int i = 0; i < scanline.Length; i++)
                     {
-                        amountBuffer[i] = scanline[i] * this.Options.BlendPercentage;
+                        amountSpan[i] = scanline[i] * this.Options.BlendPercentage;
 
                         int offsetX = x + i;
 
                         // no doubt this one can be optermised further but I can't imagine its
                         // actually being used and can probably be removed/interalised for now
-                        overlay[i] = this[offsetX, y];
+                        overlaySpan[i] = this[offsetX, y];
                     }
 
                     Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
-                    this.Blender.Blend(destinationRow, destinationRow, overlay, amountBuffer);
+                    this.Blender.Blend(destinationRow, destinationRow, overlaySpan, amountSpan);
                 }
             }
         }
diff --git a/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
index 2d460603b..510299f26 100644
--- a/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
@@ -62,10 +62,7 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
                 : base(source, options)
             {
                 this.Colors = source.MemoryManager.Allocate<TPixel>(source.Width);
-                for (int i = 0; i < this.Colors.Length; i++)
-                {
-                    this.Colors[i] = color;
-                }
+                this.Colors.Span.Fill(color);
             }
 
             /// <summary>
@@ -81,7 +78,7 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             /// <returns>
             /// The color
             /// </returns>
-            internal override TPixel this[int x, int y] => this.Colors[x];
+            internal override TPixel this[int x, int y] => this.Colors.Span[x];
 
             /// <inheritdoc />
             public override void Dispose()
@@ -96,14 +93,16 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
                 {
                     Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
 
-                    using (var amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+                    using (Buffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
                     {
+                        Span<float> amountSpan = amountBuffer.Span;
+
                         for (int i = 0; i < scanline.Length; i++)
                         {
-                            amountBuffer[i] = scanline[i] * this.Options.BlendPercentage;
+                            amountSpan[i] = scanline[i] * this.Options.BlendPercentage;
                         }
 
-                        this.Blender.Blend(destinationRow, destinationRow, this.Colors, amountBuffer);
+                        this.Blender.Blend(destinationRow, destinationRow, this.Colors.Span, amountSpan);
                     }
                 }
                 catch (Exception)
diff --git a/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
index 201adfecc..eb3949b00 100644
--- a/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
@@ -84,12 +84,9 @@ namespace SixLabors.ImageSharp.Drawing.Processors
                 maxY = Math.Min(this.Location.Y + this.Size.Height, maxY);
 
                 int width = maxX - minX;
-                using (var amount = this.Image.GetConfiguration().MemoryManager.Allocate<float>(width))
+                using (Buffer<float> amount = this.Image.GetConfiguration().MemoryManager.Allocate<float>(width))
                 {
-                    for (int i = 0; i < width; i++)
-                    {
-                        amount[i] = this.Alpha;
-                    }
+                    amount.Span.Fill(this.Alpha);
 
                     Parallel.For(
                         minY,
@@ -99,7 +96,7 @@ namespace SixLabors.ImageSharp.Drawing.Processors
                             {
                                 Span<TPixel> background = source.GetPixelRowSpan(y).Slice(minX, width);
                                 Span<TPixel> foreground = targetImage.GetPixelRowSpan(y - this.Location.Y).Slice(targetX, width);
-                                this.blender.Blend(background, background, foreground, amount);
+                                this.blender.Blend(background, background, foreground, amount.Span);
                             });
                 }
             }
diff --git a/src/ImageSharp.Drawing/Processors/FillProcessor.cs b/src/ImageSharp.Drawing/Processors/FillProcessor.cs
index 0174a6388..75ea1f203 100644
--- a/src/ImageSharp.Drawing/Processors/FillProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/FillProcessor.cs
@@ -66,25 +66,25 @@ namespace SixLabors.ImageSharp.Drawing.Processors
 
             int width = maxX - minX;
 
-            using (var amount = source.MemoryManager.Allocate<float>(width))
-            using (BrushApplicator<TPixel> applicator = this.brush.CreateApplicator(source, sourceRectangle, this.options))
+            using (Buffer<float> amount = source.MemoryManager.Allocate<float>(width))
+            using (BrushApplicator<TPixel> applicator = this.brush.CreateApplicator(
+                source,
+                sourceRectangle,
+                this.options))
             {
-                    for (int i = 0; i < width; i++)
-                    {
-                        amount[i] = this.options.BlendPercentage;
-                    }
+                amount.Span.Fill(this.options.BlendPercentage);
 
-                    Parallel.For(
+                Parallel.For(
                     minY,
                     maxY,
                     configuration.ParallelOptions,
                     y =>
-                    {
-                        int offsetY = y - startY;
-                        int offsetX = minX - startX;
+                        {
+                            int offsetY = y - startY;
+                            int offsetX = minX - startX;
 
-                        applicator.Apply(amount, offsetX, offsetY);
-                    });
+                            applicator.Apply(amount.Span, offsetX, offsetY);
+                        });
             }
         }
     }
diff --git a/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
index fc3f289ab..ae5ee2d9f 100644
--- a/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
@@ -99,8 +99,8 @@ namespace SixLabors.ImageSharp.Drawing.Processors
             using (BrushApplicator<TPixel> applicator = this.Brush.CreateApplicator(source, rect, this.Options))
             {
                 int scanlineWidth = maxX - minX;
-                using (FakeBuffer<float> buffer = source.MemoryManager.AllocateFake<float>(maxIntersections))
-                using (FakeBuffer<float> scanline = source.MemoryManager.AllocateFake<float>(scanlineWidth))
+                using (BasicArrayBuffer<float> buffer = source.MemoryManager.AllocateFake<float>(maxIntersections))
+                using (BasicArrayBuffer<float> scanline = source.MemoryManager.AllocateFake<float>(scanlineWidth))
                 {
                     bool scanlineDirty = true;
                     for (int y = minY; y < maxY; y++)
diff --git a/src/ImageSharp/Formats/Gif/LzwDecoder.cs b/src/ImageSharp/Formats/Gif/LzwDecoder.cs
index b28857e57..27ca275db 100644
--- a/src/ImageSharp/Formats/Gif/LzwDecoder.cs
+++ b/src/ImageSharp/Formats/Gif/LzwDecoder.cs
@@ -115,10 +115,14 @@ namespace SixLabors.ImageSharp.Formats.Gif
             int data = 0;
             int first = 0;
 
+            Span<int> prefixSpan = this.prefix.Span;
+            Span<int> suffixSpan = this.suffix.Span;
+            Span<int> pixelStackSpan = this.pixelStack.Span;
+
             for (code = 0; code < clearCode; code++)
             {
-                this.prefix[code] = 0;
-                this.suffix[code] = (byte)code;
+                prefixSpan[code] = 0;
+                suffixSpan[code] = (byte)code;
             }
 
             byte[] buffer = new byte[255];
@@ -172,7 +176,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
 
                     if (oldCode == NullCode)
                     {
-                        this.pixelStack[top++] = this.suffix[code];
+                        pixelStackSpan[top++] = suffixSpan[code];
                         oldCode = code;
                         first = code;
                         continue;
@@ -181,27 +185,27 @@ namespace SixLabors.ImageSharp.Formats.Gif
                     int inCode = code;
                     if (code == availableCode)
                     {
-                        this.pixelStack[top++] = (byte)first;
+                        pixelStackSpan[top++] = (byte)first;
 
                         code = oldCode;
                     }
 
                     while (code > clearCode)
                     {
-                        this.pixelStack[top++] = this.suffix[code];
-                        code = this.prefix[code];
+                        pixelStackSpan[top++] = suffixSpan[code];
+                        code = prefixSpan[code];
                     }
 
-                    first = this.suffix[code];
+                    first = suffixSpan[code];
 
-                    this.pixelStack[top++] = this.suffix[code];
+                    pixelStackSpan[top++] = suffixSpan[code];
 
                     // Fix for Gifs that have "deferred clear code" as per here :
                     // https://bugzilla.mozilla.org/show_bug.cgi?id=55918
                     if (availableCode < MaxStackSize)
                     {
-                        this.prefix[availableCode] = oldCode;
-                        this.suffix[availableCode] = first;
+                        prefixSpan[availableCode] = oldCode;
+                        suffixSpan[availableCode] = first;
                         availableCode++;
                         if (availableCode == codeMask + 1 && availableCode < MaxStackSize)
                         {
@@ -217,7 +221,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
                 top--;
 
                 // Clear missing pixels
-                pixels[xyz++] = (byte)this.pixelStack[top];
+                pixels[xyz++] = (byte)pixelStackSpan[top];
             }
         }
 
diff --git a/src/ImageSharp/Formats/Gif/LzwEncoder.cs b/src/ImageSharp/Formats/Gif/LzwEncoder.cs
index 2ecd229b5..115ecf6fb 100644
--- a/src/ImageSharp/Formats/Gif/LzwEncoder.cs
+++ b/src/ImageSharp/Formats/Gif/LzwEncoder.cs
@@ -259,7 +259,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <param name="stream">The output stream.</param>
         private void ClearBlock(Stream stream)
         {
-            this.ResetCodeTable(this.hsize);
+            this.ResetCodeTable();
             this.freeEntry = this.clearCode + 2;
             this.clearFlag = true;
 
@@ -269,13 +269,15 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <summary>
         /// Reset the code table.
         /// </summary>
-        /// <param name="size">The hash size.</param>
-        private void ResetCodeTable(int size)
+        private void ResetCodeTable()
         {
-            for (int i = 0; i < size; ++i)
-            {
-                this.hashTable[i] = -1;
-            }
+            this.hashTable.Span.Fill(-1);
+
+            // Original code:
+            // for (int i = 0; i < size; ++i)
+            // {
+            //     this.hashTable[i] = -1;
+            // }
         }
 
         /// <summary>
@@ -317,23 +319,26 @@ namespace SixLabors.ImageSharp.Formats.Gif
 
             hsizeReg = this.hsize;
 
-            this.ResetCodeTable(hsizeReg); // clear hash table
+            this.ResetCodeTable(); // clear hash table
 
             this.Output(this.clearCode, stream);
 
+            Span<int> hashTableSpan = this.hashTable.Span;
+            Span<int> codeTableSpan = this.codeTable.Span;
+
             while ((c = this.NextPixel()) != Eof)
             {
                 fcode = (c << this.maxbits) + ent;
                 int i = (c << hshift) ^ ent /* = 0 */;
 
-                if (this.hashTable[i] == fcode)
+                if (hashTableSpan[i] == fcode)
                 {
-                    ent = this.codeTable[i];
+                    ent = codeTableSpan[i];
                     continue;
                 }
 
                 // Non-empty slot
-                if (this.hashTable[i] >= 0)
+                if (hashTableSpan[i] >= 0)
                 {
                     int disp = hsizeReg - i;
                     if (i == 0)
@@ -348,15 +353,15 @@ namespace SixLabors.ImageSharp.Formats.Gif
                             i += hsizeReg;
                         }
 
-                        if (this.hashTable[i] == fcode)
+                        if (hashTableSpan[i] == fcode)
                         {
-                            ent = this.codeTable[i];
+                            ent = codeTableSpan[i];
                             break;
                         }
                     }
-                    while (this.hashTable[i] >= 0);
+                    while (hashTableSpan[i] >= 0);
 
-                    if (this.hashTable[i] == fcode)
+                    if (hashTableSpan[i] == fcode)
                     {
                         continue;
                     }
@@ -366,8 +371,8 @@ namespace SixLabors.ImageSharp.Formats.Gif
                 ent = c;
                 if (this.freeEntry < this.maxmaxcode)
                 {
-                    this.codeTable[i] = this.freeEntry++; // code -> hashtable
-                    this.hashTable[i] = fcode;
+                    codeTableSpan[i] = this.freeEntry++; // code -> hashtable
+                    hashTableSpan[i] = fcode;
                 }
                 else
                 {
diff --git a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
index 1b83f62eb..3258fd32c 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
@@ -150,11 +150,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
                 int y = yy - this.PixelRowCounter;
 
                 var values = new ColorConverters.JpegColorConverter.ComponentValues(buffers, y);
-                this.colorConverter.ConvertToRGBA(values, this.rgbaBuffer);
+                this.colorConverter.ConvertToRGBA(values, this.rgbaBuffer.Span);
 
                 Span<TPixel> destRow = destination.GetPixelRowSpan(yy);
 
-                PixelOperations<TPixel>.Instance.PackFromVector4(this.rgbaBuffer, destRow, destination.Width);
+                PixelOperations<TPixel>.Instance.PackFromVector4(this.rgbaBuffer.Span, destRow, destination.Width);
             }
         }
     }
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
index 56a85bc9d..7a22b043b 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
@@ -14,6 +14,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
     /// Bytes is a byte buffer, similar to a stream, except that it
     /// has to be able to unread more than 1 byte, due to byte stuffing.
     /// Byte stuffing is specified in section F.1.2.3.
+    /// TODO: Optimize buffer management inside this class!
     /// </summary>
     internal struct Bytes : IDisposable
     {
@@ -26,7 +27,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// Gets or sets the buffer.
         /// buffer[i:j] are the buffered bytes read from the underlying
         /// stream that haven't yet been passed further on.
-        /// TODO: Do we really need buffer here? Might be an optimiziation opportunity.
         /// </summary>
         public IManagedByteBuffer Buffer;
 
@@ -88,7 +88,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
             // Take the fast path if bytes.buf contains at least two bytes.
             if (this.I + 2 <= this.J)
             {
-                x = this.BufferAsInt[this.I];
+                Span<int> bufferSpan = this.BufferAsInt.Span;
+                x = bufferSpan[this.I];
                 this.I++;
                 this.UnreadableBytes = 1;
                 if (x != OrigJpegConstants.Markers.XFFInt)
@@ -96,7 +97,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                     return OrigDecoderErrorCode.NoError;
                 }
 
-                if (this.BufferAsInt[this.I] != 0x00)
+                if (bufferSpan[this.I] != 0x00)
                 {
                     return OrigDecoderErrorCode.MissingFF00;
                 }
@@ -196,7 +197,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                 }
             }
 
-            result = this.BufferAsInt[this.I];
+            result = this.BufferAsInt.Span[this.I];
             this.I++;
             this.UnreadableBytes = 0;
             return errorCode;
@@ -230,20 +231,20 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                 DecoderThrowHelper.ThrowImageFormatException.FillCalledWhenUnreadBytesExist();
             }
 
-            Span<byte> bufferSpan = this.Buffer.Span;
+            Span<byte> byteSpan = this.Buffer.Span;
 
             // Move the last 2 bytes to the start of the buffer, in case we need
             // to call UnreadByteStuffedByte.
             if (this.J > 2)
             {
-                bufferSpan[0] = bufferSpan[this.J - 2];
-                bufferSpan[1] = bufferSpan[this.J - 1];
+                byteSpan[0] = byteSpan[this.J - 2];
+                byteSpan[1] = byteSpan[this.J - 1];
                 this.I = 2;
                 this.J = 2;
             }
 
             // Fill in the rest of the buffer.
-            int n = inputStream.Read(this.Buffer.Array, this.J, bufferSpan.Length - this.J);
+            int n = inputStream.Read(this.Buffer.Array, this.J, byteSpan.Length - this.J);
             if (n == 0)
             {
                 return OrigDecoderErrorCode.UnexpectedEndOfStream;
@@ -251,9 +252,10 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 
             this.J += n;
 
-            for (int i = 0; i < bufferSpan.Length; i++)
+            Span<int> intSpan = this.BufferAsInt.Span;
+            for (int i = 0; i < byteSpan.Length; i++)
             {
-                this.BufferAsInt[i] = bufferSpan[i];
+                intSpan[i] = byteSpan[i];
             }
 
             return OrigDecoderErrorCode.NoError;
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
index 95631a7e6..b8694c538 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
@@ -12,9 +12,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
     /// </summary>
     internal struct PdfJsHuffmanTable : IDisposable
     {
-        private FakeBuffer<short> lookahead;
-        private FakeBuffer<short> valOffset;
-        private FakeBuffer<long> maxcode;
+        private BasicArrayBuffer<short> lookahead;
+        private BasicArrayBuffer<short> valOffset;
+        private BasicArrayBuffer<long> maxcode;
         private IManagedByteBuffer huffval;
 
         /// <summary>
@@ -30,8 +30,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
             this.valOffset = memoryManager.AllocateFake<short>(18);
             this.maxcode = memoryManager.AllocateFake<long>(18);
 
-            using (FakeBuffer<short> huffsize = memoryManager.AllocateFake<short>(257))
-            using (FakeBuffer<short> huffcode = memoryManager.AllocateFake<short>(257))
+            using (BasicArrayBuffer<short> huffsize = memoryManager.AllocateFake<short>(257))
+            using (BasicArrayBuffer<short> huffcode = memoryManager.AllocateFake<short>(257))
             {
                 GenerateSizeTable(lengths, huffsize);
                 GenerateCodeTable(huffsize, huffcode);
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
index ac26d892c..a6f878017 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
@@ -74,18 +74,18 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
             var scale = new Vector2(this.imageWidth / (float)width, this.imageHeight / (float)height);
 
             this.componentData = this.memoryManager.Allocate<byte>(width * height * numberOfComponents);
-            Span<byte> componentDataSpan = this.componentData;
+            Span<byte> componentDataSpan = this.componentData.Span;
             const uint Mask3Lsb = 0xFFFFFFF8; // Used to clear the 3 LSBs
 
-            using (var xScaleBlockOffset = this.memoryManager.Allocate<int>(width))
+            using (IBuffer<int> xScaleBlockOffset = this.memoryManager.Allocate<int>(width))
             {
-                Span<int> xScaleBlockOffsetSpan = xScaleBlockOffset;
+                Span<int> xScaleBlockOffsetSpan = xScaleBlockOffset.Span;
                 for (int i = 0; i < numberOfComponents; i++)
                 {
                     ref PdfJsComponent component = ref components.Components[i];
                     Vector2 componentScale = component.Scale * scale;
                     int offset = i;
-                    Span<short> output = component.Output;
+                    Span<short> output = component.Output.Span;
                     int blocksPerScanline = (component.BlocksPerLine + 1) << 3;
 
                     // Precalculate the xScaleBlockOffset
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsScanDecoder.cs
index e2e5d985e..9e245ea2c 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsScanDecoder.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsScanDecoder.cs
@@ -707,6 +707,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private void DecodeBaseline(PdfJsFrameComponent component, int offset, ref PdfJsHuffmanTable dcHuffmanTable, ref PdfJsHuffmanTable acHuffmanTable, Stream stream)
         {
+            Span<short> blockDataSpan = component.BlockData.Span;
+
             int t = this.DecodeHuffman(ref dcHuffmanTable, stream);
             if (this.endOfStreamReached || this.unexpectedMarkerReached)
             {
@@ -714,7 +716,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
             }
 
             int diff = t == 0 ? 0 : this.ReceiveAndExtend(t, stream);
-            component.BlockData[offset] = (short)(component.Pred += diff);
+            blockDataSpan[offset] = (short)(component.Pred += diff);
 
             int k = 1;
             while (k < 64)
@@ -748,7 +750,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
 
                 byte z = PdfJsQuantizationTables.DctZigZag[k];
                 short re = (short)this.ReceiveAndExtend(s, stream);
-                component.BlockData[offset + z] = re;
+                blockDataSpan[offset + z] = re;
                 k++;
             }
         }
@@ -756,6 +758,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private void DecodeDCFirst(PdfJsFrameComponent component, int offset, ref PdfJsHuffmanTable dcHuffmanTable, Stream stream)
         {
+            Span<short> blockDataSpan = component.BlockData.Span;
+
             int t = this.DecodeHuffman(ref dcHuffmanTable, stream);
             if (this.endOfStreamReached || this.unexpectedMarkerReached)
             {
@@ -763,19 +767,21 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
             }
 
             int diff = t == 0 ? 0 : this.ReceiveAndExtend(t, stream) << this.successiveState;
-            component.BlockData[offset] = (short)(component.Pred += diff);
+            blockDataSpan[offset] = (short)(component.Pred += diff);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private void DecodeDCSuccessive(PdfJsFrameComponent component, int offset, Stream stream)
         {
+            Span<short> blockDataSpan = component.BlockData.Span;
+
             int bit = this.ReadBit(stream);
             if (this.endOfStreamReached || this.unexpectedMarkerReached)
             {
                 return;
             }
 
-            component.BlockData[offset] |= (short)(bit << this.successiveState);
+            blockDataSpan[offset] |= (short)(bit << this.successiveState);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
index f05a8a136..6bcde2f48 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
@@ -790,14 +790,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
             using (Buffer<short> multiplicationBuffer = this.configuration.MemoryManager.Allocate<short>(64, true))
             {
                 Span<short> quantizationTable = this.quantizationTables.Tables.GetRowSpan(frameComponent.QuantizationTableIndex);
-                Span<short> computationBufferSpan = computationBuffer;
+                Span<short> computationBufferSpan = computationBuffer.Span;
 
                 // For AA&N IDCT method, multiplier are equal to quantization
                 // coefficients scaled by scalefactor[row]*scalefactor[col], where
                 //   scalefactor[0] = 1
                 //   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
                 // For integer operation, the multiplier table is to be scaled by 12.
-                Span<short> multiplierSpan = multiplicationBuffer;
+                Span<short> multiplierSpan = multiplicationBuffer.Span;
 
                 // for (int i = 0; i < 64; i++)
                 // {
diff --git a/src/ImageSharp/Memory/FakeBuffer.cs b/src/ImageSharp/Memory/BasicArrayBuffer.cs
similarity index 82%
rename from src/ImageSharp/Memory/FakeBuffer.cs
rename to src/ImageSharp/Memory/BasicArrayBuffer.cs
index e4bc4e463..d9eb5a19a 100644
--- a/src/ImageSharp/Memory/FakeBuffer.cs
+++ b/src/ImageSharp/Memory/BasicArrayBuffer.cs
@@ -4,12 +4,12 @@ using System.Runtime.CompilerServices;
 namespace SixLabors.ImageSharp.Memory
 {
     /// <summary>
-    /// Temporal workaround providing a "Buffer" based on a generic array without the 'Unsafe.As()' hackery.
+    /// Exposes an array through the <see cref="IBuffer{T}"/> interface.
     /// </summary>
-    internal class FakeBuffer<T> : IBuffer<T>
+    internal class BasicArrayBuffer<T> : IBuffer<T>
         where T : struct
     {
-        public FakeBuffer(T[] array)
+        public BasicArrayBuffer(T[] array)
         {
             this.Array = array;
         }
@@ -42,7 +42,7 @@ namespace SixLabors.ImageSharp.Memory
         /// </summary>
         /// <param name="buffer">The <see cref="Buffer{T}"/> to convert.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator ReadOnlySpan<T>(FakeBuffer<T> buffer)
+        public static implicit operator ReadOnlySpan<T>(BasicArrayBuffer<T> buffer)
         {
             return new ReadOnlySpan<T>(buffer.Array, 0, buffer.Length);
         }
@@ -52,7 +52,7 @@ namespace SixLabors.ImageSharp.Memory
         /// </summary>
         /// <param name="buffer">The <see cref="Buffer{T}"/> to convert.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator Span<T>(FakeBuffer<T> buffer)
+        public static implicit operator Span<T>(BasicArrayBuffer<T> buffer)
         {
             return new Span<T>(buffer.Array, 0, buffer.Length);
         }
diff --git a/src/ImageSharp/Memory/Buffer{T}.cs b/src/ImageSharp/Memory/Buffer{T}.cs
index 55eb44820..309cca1f4 100644
--- a/src/ImageSharp/Memory/Buffer{T}.cs
+++ b/src/ImageSharp/Memory/Buffer{T}.cs
@@ -38,11 +38,6 @@ namespace SixLabors.ImageSharp.Memory
             this.memoryManager = memoryManager;
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Buffer{T}"/> instance is disposed, or has lost ownership of <see cref="array"/>.
-        /// </summary>
-        public bool IsDisposedOrLostArrayOwnership { get; private set; }
-
         /// <summary>
         /// Gets the count of "relevant" elements. It's usually smaller than 'Array.Length' when <see cref="array"/> is pooled.
         /// </summary>
@@ -51,44 +46,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <summary>
         /// Gets a <see cref="Span{T}"/> to the backing buffer.
         /// </summary>
-        public Span<T> Span => this;
-
-        /// <summary>
-        /// Returns a reference to specified element of the buffer.
-        /// </summary>
-        /// <param name="index">The index</param>
-        /// <returns>The reference to the specified element</returns>
-        public ref T this[int index]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                DebugGuard.MustBeLessThan(index, this.Length, nameof(index));
-
-                Span<T> span = this.Span;
-                return ref span[index];
-            }
-        }
-
-        /// <summary>
-        /// Converts <see cref="Buffer{T}"/> to an <see cref="ReadOnlySpan{T}"/>.
-        /// </summary>
-        /// <param name="buffer">The <see cref="Buffer{T}"/> to convert.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator ReadOnlySpan<T>(Buffer<T> buffer)
-        {
-            return new ReadOnlySpan<T>(buffer.array, 0, buffer.Length);
-        }
-
-        /// <summary>
-        /// Converts <see cref="Buffer{T}"/> to an <see cref="Span{T}"/>.
-        /// </summary>
-        /// <param name="buffer">The <see cref="Buffer{T}"/> to convert.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator Span<T>(Buffer<T> buffer)
-        {
-            return new Span<T>(buffer.array, 0, buffer.Length);
-        }
+        public Span<T> Span => new Span<T>(this.array, 0, this.Length);
 
         /// <summary>
         /// Disposes the <see cref="Buffer{T}"/> instance by unpinning the array, and returning the pooled buffer when necessary.
@@ -96,13 +54,11 @@ namespace SixLabors.ImageSharp.Memory
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Dispose()
         {
-            if (this.IsDisposedOrLostArrayOwnership)
+            if (this.array == null)
             {
                 return;
             }
 
-            this.IsDisposedOrLostArrayOwnership = true;
-
             this.memoryManager?.Release(this);
 
             this.memoryManager = null;
@@ -112,27 +68,6 @@ namespace SixLabors.ImageSharp.Memory
             GC.SuppressFinalize(this);
         }
 
-        /// <summary>
-        /// Unpins <see cref="array"/> and makes the object "quasi-disposed" so the array is no longer owned by this object.
-        /// If <see cref="array"/> is rented, it's the callers responsibility to return it to it's pool.
-        /// </summary>
-        /// <returns>The unpinned <see cref="array"/></returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public T[] TakeArrayOwnership()
-        {
-            if (this.IsDisposedOrLostArrayOwnership)
-            {
-                throw new InvalidOperationException(
-                    "TakeArrayOwnership() is invalid: either Buffer<T> is disposed or TakeArrayOwnership() has been called multiple times!");
-            }
-
-            this.IsDisposedOrLostArrayOwnership = true;
-            T[] a = this.array;
-            this.array = null;
-            this.memoryManager = null;
-            return a;
-        }
-
         /// <summary>
         /// TODO: Refactor this
         /// </summary>
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index 58f245819..540c045de 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -37,10 +37,10 @@ namespace SixLabors.ImageSharp.Memory
         /// Temporal workaround. A method providing a "Buffer" based on a generic array without the 'Unsafe.As()' hackery.
         /// Should be replaced with 'Allocate()' as soon as SixLabors.Shapes has Span-based API-s!
         /// </summary>
-        internal FakeBuffer<T> AllocateFake<T>(int length, bool dummy = false)
+        internal BasicArrayBuffer<T> AllocateFake<T>(int length, bool dummy = false)
             where T : struct
         {
-            return new FakeBuffer<T>(new T[length]);
+            return new BasicArrayBuffer<T>(new T[length]);
         }
     }
 }
diff --git a/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
index 296ae1bb3..a42a2056c 100644
--- a/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
@@ -71,13 +71,17 @@ namespace SixLabors.ImageSharp.Processing.Processors
 
             int width = maxX - minX;
 
-            using (var colors = this.memoryManager.Allocate<TPixel>(width))
-            using (var amount = this.memoryManager.Allocate<float>(width))
+            using (Buffer<TPixel> colors = this.memoryManager.Allocate<TPixel>(width))
+            using (Buffer<float> amount = this.memoryManager.Allocate<float>(width))
             {
+                // Be careful! Do not capture colorSpan & amountSpan in the lambda below!
+                Span<TPixel> colorSpan = colors.Span;
+                Span<float> amountSpan = amount.Span;
+
                 for (int i = 0; i < width; i++)
                 {
-                    colors[i] = this.Value;
-                    amount[i] = this.options.BlendPercentage;
+                    colorSpan[i] = this.Value;
+                    amountSpan[i] = this.options.BlendPercentage;
                 }
 
                 PixelBlender<TPixel> blender = PixelOperations<TPixel>.Instance.GetPixelBlender(this.options.BlenderMode);
@@ -90,7 +94,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                         Span<TPixel> destination = source.GetPixelRowSpan(y - startY).Slice(minX - startX, width);
 
                         // This switched color & destination in the 2nd and 3rd places because we are applying the target colour under the current one
-                        blender.Blend(destination, colors, destination, amount);
+                        blender.Blend(destination, colors.Span, destination, amount.Span);
                     });
             }
         }
diff --git a/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
index 6114c6438..85c592cea 100644
--- a/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
@@ -65,7 +65,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             TPixel glowColor = this.GlowColor;
             Vector2 centre = Rectangle.Center(sourceRectangle);
 
-            var finalRadius = this.Radius.Calculate(source.Size());
+            float finalRadius = this.Radius.Calculate(source.Size());
 
             float maxDistance = finalRadius > 0 ? MathF.Min(finalRadius, sourceRectangle.Width * .5F) : sourceRectangle.Width * .5F;
 
@@ -87,11 +87,14 @@ namespace SixLabors.ImageSharp.Processing.Processors
             }
 
             int width = maxX - minX;
-            using (var rowColors = this.memoryManager.Allocate<TPixel>(width))
+            using (IBuffer<TPixel> rowColors = this.memoryManager.Allocate<TPixel>(width))
             {
+                // Be careful! Do not capture rowColorsSpan in the lambda below!
+                Span<TPixel> rowColorsSpan = rowColors.Span;
+
                 for (int i = 0; i < width; i++)
                 {
-                    rowColors[i] = glowColor;
+                    rowColorsSpan[i] = glowColor;
                 }
 
                 Parallel.For(
@@ -100,19 +103,20 @@ namespace SixLabors.ImageSharp.Processing.Processors
                     configuration.ParallelOptions,
                     y =>
                     {
-                        using (var amounts = this.memoryManager.Allocate<float>(width))
+                        using (IBuffer<float> amounts = this.memoryManager.Allocate<float>(width))
                         {
+                            Span<float> amountsSpan = amounts.Span;
                             int offsetY = y - startY;
                             int offsetX = minX - startX;
                             for (int i = 0; i < width; i++)
                             {
                                 float distance = Vector2.Distance(centre, new Vector2(i + offsetX, offsetY));
-                                amounts[i] = (this.options.BlendPercentage * (1 - (.95F * (distance / maxDistance)))).Clamp(0, 1);
+                                amountsSpan[i] = (this.options.BlendPercentage * (1 - (.95F * (distance / maxDistance)))).Clamp(0, 1);
                             }
 
                             Span<TPixel> destination = source.GetPixelRowSpan(offsetY).Slice(offsetX, width);
 
-                            this.blender.Blend(destination, destination, rowColors, amounts);
+                            this.blender.Blend(destination, destination, rowColors.Span, amountsSpan);
                         }
                     });
             }
diff --git a/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
index 9877f4cc9..d0943b27b 100644
--- a/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
@@ -86,8 +86,8 @@ namespace SixLabors.ImageSharp.Processing.Processors
             TPixel vignetteColor = this.VignetteColor;
             Vector2 centre = Rectangle.Center(sourceRectangle);
 
-            var finalradiusX = this.RadiusX.Calculate(source.Size());
-            var finalradiusY = this.RadiusY.Calculate(source.Size());
+            float finalradiusX = this.RadiusX.Calculate(source.Size());
+            float finalradiusY = this.RadiusY.Calculate(source.Size());
             float rX = finalradiusX > 0 ? MathF.Min(finalradiusX, sourceRectangle.Width * .5F) : sourceRectangle.Width * .5F;
             float rY = finalradiusY > 0 ? MathF.Min(finalradiusY, sourceRectangle.Height * .5F) : sourceRectangle.Height * .5F;
             float maxDistance = MathF.Sqrt((rX * rX) + (rY * rY));
@@ -110,11 +110,14 @@ namespace SixLabors.ImageSharp.Processing.Processors
             }
 
             int width = maxX - minX;
-            using (var rowColors = this.memoryManager.Allocate<TPixel>(width))
+            using (IBuffer<TPixel> rowColors = this.memoryManager.Allocate<TPixel>(width))
             {
+                // Be careful! Do not capture rowColorsSpan in the lambda below!
+                Span<TPixel> rowColorsSpan = rowColors.Span;
+
                 for (int i = 0; i < width; i++)
                 {
-                    rowColors[i] = vignetteColor;
+                    rowColorsSpan[i] = vignetteColor;
                 }
 
                 Parallel.For(
@@ -123,19 +126,20 @@ namespace SixLabors.ImageSharp.Processing.Processors
                     configuration.ParallelOptions,
                     y =>
                         {
-                            using (var amounts = this.memoryManager.Allocate<float>(width))
+                            using (IBuffer<float> amounts = this.memoryManager.Allocate<float>(width))
                             {
+                                Span<float> amountsSpan = amounts.Span;
                                 int offsetY = y - startY;
                                 int offsetX = minX - startX;
                                 for (int i = 0; i < width; i++)
                                 {
                                     float distance = Vector2.Distance(centre, new Vector2(i + offsetX, offsetY));
-                                    amounts[i] = (this.options.BlendPercentage * (.9F * (distance / maxDistance))).Clamp(0, 1);
+                                    amountsSpan[i] = (this.options.BlendPercentage * (.9F * (distance / maxDistance))).Clamp(0, 1);
                                 }
 
                                 Span<TPixel> destination = source.GetPixelRowSpan(offsetY).Slice(offsetX, width);
 
-                                this.blender.Blend(destination, destination, rowColors, amounts);
+                                this.blender.Blend(destination, destination, rowColors.Span, amountsSpan);
                             }
                         });
             }
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
index 1fa388da4..1e7642250 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
@@ -135,18 +135,18 @@ namespace SixLabors.ImageSharp.Processing.Processors
                     y =>
                         {
                             // TODO: Without Parallel.For() this buffer object could be reused:
-                            using (var tempRowBuffer = this.MemoryManager.Allocate<Vector4>(source.Width))
+                            using (IBuffer<Vector4> tempRowBuffer = this.MemoryManager.Allocate<Vector4>(source.Width))
                             {
                                 Span<Vector4> firstPassRow = firstPassPixels.GetRowSpan(y);
                                 Span<TPixel> sourceRow = source.GetPixelRowSpan(y);
-                                PixelOperations<TPixel>.Instance.ToVector4(sourceRow, tempRowBuffer, sourceRow.Length);
+                                PixelOperations<TPixel>.Instance.ToVector4(sourceRow, tempRowBuffer.Span, sourceRow.Length);
 
                                 if (this.Compand)
                                 {
                                     for (int x = minX; x < maxX; x++)
                                     {
                                         WeightsWindow window = this.HorizontalWeights.Weights[x - startX];
-                                        firstPassRow[x] = window.ComputeExpandedWeightedRowSum(tempRowBuffer, sourceX);
+                                        firstPassRow[x] = window.ComputeExpandedWeightedRowSum(tempRowBuffer.Span, sourceX);
                                     }
                                 }
                                 else
@@ -154,7 +154,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                                     for (int x = minX; x < maxX; x++)
                                     {
                                         WeightsWindow window = this.HorizontalWeights.Weights[x - startX];
-                                        firstPassRow[x] = window.ComputeWeightedRowSum(tempRowBuffer, sourceX);
+                                        firstPassRow[x] = window.ComputeWeightedRowSum(tempRowBuffer.Span, sourceX);
                                     }
                                 }
                             }
diff --git a/src/ImageSharp/Quantizers/QuantizerBase{TPixel}.cs b/src/ImageSharp/Quantizers/QuantizerBase{TPixel}.cs
index 31e424060..0b41edf98 100644
--- a/src/ImageSharp/Quantizers/QuantizerBase{TPixel}.cs
+++ b/src/ImageSharp/Quantizers/QuantizerBase{TPixel}.cs
@@ -115,6 +115,7 @@ namespace SixLabors.ImageSharp.Quantizers.Base
 
         /// <summary>
         /// Override this to process the pixel in the first pass of the algorithm
+        /// TODO: We really should do this on a per-row basis! Shouldn't we internalize this method?
         /// </summary>
         /// <param name="pixel">The pixel to quantize</param>
         /// <remarks>
diff --git a/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
index b5d31014b..d9f188bf3 100644
--- a/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
@@ -36,6 +36,14 @@ namespace SixLabors.ImageSharp.Quantizers
     public class WuQuantizer<TPixel> : QuantizerBase<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
+        // TODO: The WuQuantizer<TPixel> code is rising several questions:
+        // - Do we really need to ALWAYS allocate the whole table of size TableLength? (~ 2471625 * sizeof(long) * 5 bytes )
+        // - Isn't an AOS ("array of structures") layout more efficient & more readable than SOA ("structure of arrays") for this particular use case?
+        //   (T, R, G, B, A, M2) could be grouped together!
+        // - There are per-pixel virtual calls in InitialQuantizePixel, why not do it on a per-row basis?
+        // - It's a frequently used class, we need tests! (So we can optimize safely.) There are tests in the original!!! We should just adopt them!
+        //   https://github.com/JeremyAnsel/JeremyAnsel.ColorQuant/blob/master/JeremyAnsel.ColorQuant/JeremyAnsel.ColorQuant.Tests/WuColorQuantizerTests.cs
+
         /// <summary>
         /// The index bits.
         /// </summary>
@@ -69,37 +77,37 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <summary>
         /// Moment of <c>P(c)</c>.
         /// </summary>
-        private Buffer<long> vwt;
+        private IBuffer<long> vwt;
 
         /// <summary>
         /// Moment of <c>r*P(c)</c>.
         /// </summary>
-        private Buffer<long> vmr;
+        private IBuffer<long> vmr;
 
         /// <summary>
         /// Moment of <c>g*P(c)</c>.
         /// </summary>
-        private Buffer<long> vmg;
+        private IBuffer<long> vmg;
 
         /// <summary>
         /// Moment of <c>b*P(c)</c>.
         /// </summary>
-        private Buffer<long> vmb;
+        private IBuffer<long> vmb;
 
         /// <summary>
         /// Moment of <c>a*P(c)</c>.
         /// </summary>
-        private Buffer<long> vma;
+        private IBuffer<long> vma;
 
         /// <summary>
         /// Moment of <c>c^2*P(c)</c>.
         /// </summary>
-        private Buffer<float> m2;
+        private IBuffer<float> m2;
 
         /// <summary>
         /// Color space tag.
         /// </summary>
-        private Buffer<byte> tag;
+        private IBuffer<byte> tag;
 
         /// <summary>
         /// Maximum allowed color depth
@@ -153,23 +161,16 @@ namespace SixLabors.ImageSharp.Quantizers
             }
             finally
             {
-                this.DisposeBuffer(ref this.vwt);
-                this.DisposeBuffer(ref this.vmr);
-                this.DisposeBuffer(ref this.vmg);
-                this.DisposeBuffer(ref this.vmb);
-                this.DisposeBuffer(ref this.vma);
-                this.DisposeBuffer(ref this.m2);
-                this.DisposeBuffer(ref this.tag);
+                this.vwt.Dispose();
+                this.vmr.Dispose();
+                this.vmg.Dispose();
+                this.vmb.Dispose();
+                this.vma.Dispose();
+                this.m2.Dispose();
+                this.tag.Dispose();
             }
         }
 
-        private void DisposeBuffer<T>(ref Buffer<T> buffer)
-            where T : struct
-        {
-            buffer?.Dispose();
-            buffer = null;
-        }
-
         /// <inheritdoc/>
         protected override TPixel[] GetPalette()
         {
@@ -213,14 +214,21 @@ namespace SixLabors.ImageSharp.Quantizers
 
             int index = GetPaletteIndex(r + 1, g + 1, b + 1, a + 1);
 
-            this.vwt[index]++;
-            this.vmr[index] += rgba.R;
-            this.vmg[index] += rgba.G;
-            this.vmb[index] += rgba.B;
-            this.vma[index] += rgba.A;
+            Span<long> vwtSpan = this.vwt.Span;
+            Span<long> vmrSpan = this.vmr.Span;
+            Span<long> vmgSpan = this.vmg.Span;
+            Span<long> vmbSpan = this.vmb.Span;
+            Span<long> vmaSpan = this.vma.Span;
+            Span<float> m2Span = this.m2.Span;
+
+            vwtSpan[index]++;
+            vmrSpan[index] += rgba.R;
+            vmgSpan[index] += rgba.G;
+            vmbSpan[index] += rgba.B;
+            vmaSpan[index] += rgba.A;
 
             var vector = new Vector4(rgba.R, rgba.G, rgba.B, rgba.A);
-            this.m2[index] += Vector4.Dot(vector, vector);
+            m2Span[index] += Vector4.Dot(vector, vector);
         }
 
         /// <inheritdoc/>
@@ -458,6 +466,13 @@ namespace SixLabors.ImageSharp.Quantizers
         /// </summary>
         private void Get3DMoments(MemoryManager memoryManager)
         {
+            Span<long> vwtSpan = this.vwt.Span;
+            Span<long> vmrSpan = this.vmr.Span;
+            Span<long> vmgSpan = this.vmg.Span;
+            Span<long> vmbSpan = this.vmb.Span;
+            Span<long> vmaSpan = this.vma.Span;
+            Span<float> m2Span = this.m2.Span;
+
             using (Buffer<long> volume = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
             using (Buffer<long> volumeR = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
             using (Buffer<long> volumeG = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
@@ -472,6 +487,20 @@ namespace SixLabors.ImageSharp.Quantizers
             using (Buffer<long> areaA = memoryManager.Allocate<long>(IndexAlphaCount))
             using (Buffer<float> area2 = memoryManager.Allocate<float>(IndexAlphaCount))
             {
+                Span<long> volumeSpan = volume.Span;
+                Span<long> volumeRSpan = volumeR.Span;
+                Span<long> volumeGSpan = volumeG.Span;
+                Span<long> volumeBSpan = volumeB.Span;
+                Span<long> volumeASpan = volumeA.Span;
+                Span<float> volume2Span = volume2.Span;
+
+                Span<long> areaSpan = area.Span;
+                Span<long> areaRSpan = areaR.Span;
+                Span<long> areaGSpan = areaG.Span;
+                Span<long> areaBSpan = areaB.Span;
+                Span<long> areaASpan = areaA.Span;
+                Span<float> area2Span = area2.Span;
+
                 for (int r = 1; r < IndexCount; r++)
                 {
                     volume.Clear();
@@ -503,37 +532,37 @@ namespace SixLabors.ImageSharp.Quantizers
                             {
                                 int ind1 = GetPaletteIndex(r, g, b, a);
 
-                                line += this.vwt[ind1];
-                                lineR += this.vmr[ind1];
-                                lineG += this.vmg[ind1];
-                                lineB += this.vmb[ind1];
-                                lineA += this.vma[ind1];
-                                line2 += this.m2[ind1];
+                                line += vwtSpan[ind1];
+                                lineR += vmrSpan[ind1];
+                                lineG += vmgSpan[ind1];
+                                lineB += vmbSpan[ind1];
+                                lineA += vmaSpan[ind1];
+                                line2 += m2Span[ind1];
 
-                                area[a] += line;
-                                areaR[a] += lineR;
-                                areaG[a] += lineG;
-                                areaB[a] += lineB;
-                                areaA[a] += lineA;
-                                area2[a] += line2;
+                                areaSpan[a] += line;
+                                areaRSpan[a] += lineR;
+                                areaGSpan[a] += lineG;
+                                areaBSpan[a] += lineB;
+                                areaASpan[a] += lineA;
+                                area2Span[a] += line2;
 
                                 int inv = (b * IndexAlphaCount) + a;
 
-                                volume[inv] += area[a];
-                                volumeR[inv] += areaR[a];
-                                volumeG[inv] += areaG[a];
-                                volumeB[inv] += areaB[a];
-                                volumeA[inv] += areaA[a];
-                                volume2[inv] += area2[a];
+                                volumeSpan[inv] += areaSpan[a];
+                                volumeRSpan[inv] += areaRSpan[a];
+                                volumeGSpan[inv] += areaGSpan[a];
+                                volumeBSpan[inv] += areaBSpan[a];
+                                volumeASpan[inv] += areaASpan[a];
+                                volume2Span[inv] += area2Span[a];
 
                                 int ind2 = ind1 - GetPaletteIndex(1, 0, 0, 0);
 
-                                this.vwt[ind1] = this.vwt[ind2] + volume[inv];
-                                this.vmr[ind1] = this.vmr[ind2] + volumeR[inv];
-                                this.vmg[ind1] = this.vmg[ind2] + volumeG[inv];
-                                this.vmb[ind1] = this.vmb[ind2] + volumeB[inv];
-                                this.vma[ind1] = this.vma[ind2] + volumeA[inv];
-                                this.m2[ind1] = this.m2[ind2] + volume2[inv];
+                                vwtSpan[ind1] = vwtSpan[ind2] + volumeSpan[inv];
+                                vmrSpan[ind1] = vmrSpan[ind2] + volumeRSpan[inv];
+                                vmgSpan[ind1] = vmgSpan[ind2] + volumeGSpan[inv];
+                                vmbSpan[ind1] = vmbSpan[ind2] + volumeBSpan[inv];
+                                vmaSpan[ind1] = vmaSpan[ind2] + volumeASpan[inv];
+                                m2Span[ind1] = m2Span[ind2] + volume2Span[inv];
                             }
                         }
                     }
@@ -553,23 +582,25 @@ namespace SixLabors.ImageSharp.Quantizers
             float db = Volume(ref cube, this.vmb.Span);
             float da = Volume(ref cube, this.vma.Span);
 
+            Span<float> m2Span = this.m2.Span;
+
             float xx =
-                this.m2[GetPaletteIndex(cube.R1, cube.G1, cube.B1, cube.A1)]
-                - this.m2[GetPaletteIndex(cube.R1, cube.G1, cube.B1, cube.A0)]
-                - this.m2[GetPaletteIndex(cube.R1, cube.G1, cube.B0, cube.A1)]
-                + this.m2[GetPaletteIndex(cube.R1, cube.G1, cube.B0, cube.A0)]
-                - this.m2[GetPaletteIndex(cube.R1, cube.G0, cube.B1, cube.A1)]
-                + this.m2[GetPaletteIndex(cube.R1, cube.G0, cube.B1, cube.A0)]
-                + this.m2[GetPaletteIndex(cube.R1, cube.G0, cube.B0, cube.A1)]
-                - this.m2[GetPaletteIndex(cube.R1, cube.G0, cube.B0, cube.A0)]
-                - this.m2[GetPaletteIndex(cube.R0, cube.G1, cube.B1, cube.A1)]
-                + this.m2[GetPaletteIndex(cube.R0, cube.G1, cube.B1, cube.A0)]
-                + this.m2[GetPaletteIndex(cube.R0, cube.G1, cube.B0, cube.A1)]
-                - this.m2[GetPaletteIndex(cube.R0, cube.G1, cube.B0, cube.A0)]
-                + this.m2[GetPaletteIndex(cube.R0, cube.G0, cube.B1, cube.A1)]
-                - this.m2[GetPaletteIndex(cube.R0, cube.G0, cube.B1, cube.A0)]
-                - this.m2[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A1)]
-                + this.m2[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A0)];
+                m2Span[GetPaletteIndex(cube.R1, cube.G1, cube.B1, cube.A1)]
+                - m2Span[GetPaletteIndex(cube.R1, cube.G1, cube.B1, cube.A0)]
+                - m2Span[GetPaletteIndex(cube.R1, cube.G1, cube.B0, cube.A1)]
+                + m2Span[GetPaletteIndex(cube.R1, cube.G1, cube.B0, cube.A0)]
+                - m2Span[GetPaletteIndex(cube.R1, cube.G0, cube.B1, cube.A1)]
+                + m2Span[GetPaletteIndex(cube.R1, cube.G0, cube.B1, cube.A0)]
+                + m2Span[GetPaletteIndex(cube.R1, cube.G0, cube.B0, cube.A1)]
+                - m2Span[GetPaletteIndex(cube.R1, cube.G0, cube.B0, cube.A0)]
+                - m2Span[GetPaletteIndex(cube.R0, cube.G1, cube.B1, cube.A1)]
+                + m2Span[GetPaletteIndex(cube.R0, cube.G1, cube.B1, cube.A0)]
+                + m2Span[GetPaletteIndex(cube.R0, cube.G1, cube.B0, cube.A1)]
+                - m2Span[GetPaletteIndex(cube.R0, cube.G1, cube.B0, cube.A0)]
+                + m2Span[GetPaletteIndex(cube.R0, cube.G0, cube.B1, cube.A1)]
+                - m2Span[GetPaletteIndex(cube.R0, cube.G0, cube.B1, cube.A0)]
+                - m2Span[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A1)]
+                + m2Span[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A0)];
 
             var vector = new Vector4(dr, dg, db, da);
             return xx - (Vector4.Dot(vector, vector) / Volume(ref cube, this.vwt.Span));
@@ -742,6 +773,8 @@ namespace SixLabors.ImageSharp.Quantizers
         /// <param name="label">A label.</param>
         private void Mark(ref Box cube, byte label)
         {
+            Span<byte> tagSpan = this.tag.Span;
+
             for (int r = cube.R0 + 1; r <= cube.R1; r++)
             {
                 for (int g = cube.G0 + 1; g <= cube.G1; g++)
@@ -750,7 +783,7 @@ namespace SixLabors.ImageSharp.Quantizers
                     {
                         for (int a = cube.A0 + 1; a <= cube.A1; a++)
                         {
-                            this.tag[GetPaletteIndex(r, g, b, a)] = label;
+                            tagSpan[GetPaletteIndex(r, g, b, a)] = label;
                         }
                     }
                 }
@@ -833,7 +866,9 @@ namespace SixLabors.ImageSharp.Quantizers
             int b = rgba.B >> (8 - IndexBits);
             int a = rgba.A >> (8 - IndexAlphaBits);
 
-            return this.tag[GetPaletteIndex(r + 1, g + 1, b + 1, a + 1)];
+            Span<byte> tagSpan = this.tag.Span;
+
+            return tagSpan[GetPaletteIndex(r + 1, g + 1, b + 1, a + 1)];
         }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
index 53a55e06e..1b49c48ec 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
@@ -49,13 +49,13 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [Benchmark]
         public void CommonBulk()
         {
-            new PixelOperations<TPixel>().PackFromVector4(this.source, this.destination, this.Count);
+            new PixelOperations<TPixel>().PackFromVector4(this.source.Span, this.destination.Span, this.Count);
         }
 
         [Benchmark]
         public void OptimizedBulk()
         {
-            PixelOperations<TPixel>.Instance.PackFromVector4(this.source, this.destination, this.Count);
+            PixelOperations<TPixel>.Instance.PackFromVector4(this.source.Span, this.destination.Span, this.Count);
         }
     }
 
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
index fb2f03d74..33dbcd24c 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
@@ -50,13 +50,13 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [Benchmark]
         public void CommonBulk()
         {
-            new PixelOperations<TPixel>().PackFromRgba32Bytes(this.source, this.destination, this.Count);
+            new PixelOperations<TPixel>().PackFromRgba32Bytes(this.source.Span, this.destination.Span, this.Count);
         }
 
         [Benchmark]
         public void OptimizedBulk()
         {
-           PixelOperations<TPixel>.Instance.PackFromRgba32Bytes(this.source, this.destination, this.Count);
+           PixelOperations<TPixel>.Instance.PackFromRgba32Bytes(this.source.Span, this.destination.Span, this.Count);
         }
     }
 
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
index cddf0f9a8..8a7fc52af 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
@@ -49,13 +49,13 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [Benchmark]
         public void CommonBulk()
         {
-            new PixelOperations<TPixel>().ToVector4(this.source, this.destination, this.Count);
+            new PixelOperations<TPixel>().ToVector4(this.source.Span, this.destination.Span, this.Count);
         }
 
         [Benchmark]
         public void OptimizedBulk()
         {
-            PixelOperations<TPixel>.Instance.ToVector4(this.source, this.destination, this.Count);
+            PixelOperations<TPixel>.Instance.ToVector4(this.source.Span, this.destination.Span, this.Count);
         }
     }
 
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
index 6593a28ae..45ccaa829 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
@@ -55,13 +55,13 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [Benchmark]
         public void CommonBulk()
         {
-            new PixelOperations<TPixel>().ToRgb24Bytes(this.source, this.destination, this.Count);
+            new PixelOperations<TPixel>().ToRgb24Bytes(this.source.Span, this.destination.Span, this.Count);
         }
 
         [Benchmark]
         public void OptimizedBulk()
         {
-            PixelOperations<TPixel>.Instance.ToRgb24Bytes(this.source, this.destination, this.Count);
+            PixelOperations<TPixel>.Instance.ToRgb24Bytes(this.source.Span, this.destination.Span, this.Count);
         }
     }
 
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
index 58b80d550..9912e987c 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
@@ -58,13 +58,13 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
         [Benchmark]
         public void CommonBulk()
         {
-            new PixelOperations<TPixel>().ToRgba32Bytes(this.source, this.destination, this.Count);
+            new PixelOperations<TPixel>().ToRgba32Bytes(this.source.Span, this.destination.Span, this.Count);
         }
 
         [Benchmark]
         public void OptimizedBulk()
         {
-            PixelOperations<TPixel>.Instance.ToRgba32Bytes(this.source, this.destination, this.Count);
+            PixelOperations<TPixel>.Instance.ToRgba32Bytes(this.source.Span, this.destination.Span, this.Count);
         }
     }
 
diff --git a/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs b/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
index 4524d757c..07734c6f5 100644
--- a/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
+++ b/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
@@ -59,21 +59,20 @@ namespace SixLabors.ImageSharp.Benchmarks
         {
             using (Image<Rgba32> image = new Image<Rgba32>(800, 800))
             {
-                Buffer<float> amounts = Configuration.Default.MemoryManager.Allocate<float>(image.Width);
-
-                for (int x = 0; x < image.Width; x++)
-                {
-                    amounts[x] = 1;
-                }
-                using (PixelAccessor<Rgba32> pixels = image.Lock())
+                using (Buffer<float> amounts = Configuration.Default.MemoryManager.Allocate<float>(image.Width))
                 {
-                    for (int y = 0; y < image.Height; y++)
+                    amounts.Span.Fill(1);
+                    
+                    using (PixelAccessor<Rgba32> pixels = image.Lock())
                     {
-                        Span<Rgba32> span = pixels.GetRowSpan(y);
-                        BulkVectorConvert(span, span, span, amounts);
+                        for (int y = 0; y < image.Height; y++)
+                        {
+                            Span<Rgba32> span = pixels.GetRowSpan(y);
+                            this.BulkVectorConvert(span, span, span, amounts.Span);
+                        }
                     }
+                    return new CoreSize(image.Width, image.Height);
                 }
-                return new CoreSize(image.Width, image.Height);
             }
         }
 
@@ -82,21 +81,20 @@ namespace SixLabors.ImageSharp.Benchmarks
         {
             using (Image<Rgba32> image = new Image<Rgba32>(800, 800))
             {
-                Buffer<float> amounts = Configuration.Default.MemoryManager.Allocate<float>(image.Width);
-
-                for (int x = 0; x < image.Width; x++)
+                using (Buffer<float> amounts = Configuration.Default.MemoryManager.Allocate<float>(image.Width))
                 {
-                    amounts[x] = 1;
-                }
-                using (PixelAccessor<Rgba32> pixels = image.Lock())
-                {
-                    for (int y = 0; y < image.Height; y++)
+                    amounts.Span.Fill(1);
+                    using (PixelAccessor<Rgba32> pixels = image.Lock())
                     {
-                        Span<Rgba32> span = pixels.GetRowSpan(y);
-                        BulkPixelConvert(span, span, span, amounts);
+                        for (int y = 0; y < image.Height; y++)
+                        {
+                            Span<Rgba32> span = pixels.GetRowSpan(y);
+                            this.BulkPixelConvert(span, span, span, amounts.Span);
+                        }
                     }
+
+                    return new CoreSize(image.Width, image.Height);
                 }
-                return new CoreSize(image.Width, image.Height);
             }
         }
     }
diff --git a/tests/ImageSharp.Benchmarks/Samplers/Glow.cs b/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
index 2743924f2..b36b4841f 100644
--- a/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
+++ b/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
@@ -106,10 +106,7 @@ namespace SixLabors.ImageSharp.Benchmarks
                 using (Buffer<TPixel> rowColors = Configuration.Default.MemoryManager.Allocate<TPixel>(width))
                 using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
-                    for (int i = 0; i < width; i++)
-                    {
-                        rowColors[i] = glowColor;
-                    }
+                    rowColors.Span.Fill(glowColor);
 
                     Parallel.For(
                         minY,
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
index b5d4aaebe..bf6b1f4ab 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
@@ -289,7 +289,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 }
 
                 // no need to dispose when buffer is not array owner
-                buffers[i] = new Buffer2D<float>(new FakeBuffer<float>(values), values.Length, 1);
+                buffers[i] = new Buffer2D<float>(new BasicArrayBuffer<float>(values), values.Length, 1);
             }
             return new JpegColorConverter.ComponentValues(buffers, 0);
         }
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
index 2ea06d724..6e01bf182 100644
--- a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
@@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
                 TestOperation(
                     source,
                     expected,
-                    (s, d) => ImageSharp.Rgba32.PixelOperations.ToVector4SimdAligned(s, d, 64)
+                    (s, d) => ImageSharp.Rgba32.PixelOperations.ToVector4SimdAligned(s, d.Span, 64)
                 );
             }
 
@@ -57,7 +57,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
                         times,
                         () =>
                             {
-                                PixelOperations<ImageSharp.Rgba32>.Instance.ToVector4(source, dest, count);
+                                PixelOperations<ImageSharp.Rgba32>.Instance.ToVector4(source.Span, dest.Span, count);
                             });
                 }
             }
@@ -116,7 +116,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             TestOperation(
                 source,
                 expected,
-                (s, d) => Operations.PackFromVector4(s, d, count)
+                (s, d) => Operations.PackFromVector4(s, d.Span, count)
             );
         }
 
@@ -141,7 +141,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             TestOperation(
                 source,
                 expected,
-                (s, d) => Operations.ToVector4(s, d, count)
+                (s, d) => Operations.ToVector4(s, d.Span, count)
             );
         }
 
@@ -163,7 +163,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             TestOperation(
                 source,
                 expected,
-                (s, d) => Operations.PackFromRgb24Bytes(s, d, count)
+                (s, d) => Operations.PackFromRgb24Bytes(s, d.Span, count)
             );
         }
 
@@ -187,7 +187,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             TestOperation(
                 source,
                 expected,
-                (s, d) => Operations.ToRgb24Bytes(s, d, count)
+                (s, d) => Operations.ToRgb24Bytes(s, d.Span, count)
             );
         }
 
@@ -208,7 +208,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             TestOperation(
                 source,
                 expected,
-                (s, d) => Operations.PackFromRgba32Bytes(s, d, count)
+                (s, d) => Operations.PackFromRgba32Bytes(s, d.Span, count)
             );
         }
 
@@ -233,7 +233,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             TestOperation(
                 source,
                 expected,
-                (s, d) => Operations.ToRgba32Bytes(s, d, count)
+                (s, d) => Operations.ToRgba32Bytes(s, d.Span, count)
             );
         }
 
@@ -254,7 +254,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             TestOperation(
                 source,
                 expected,
-                (s, d) => Operations.PackFromBgr24Bytes(s, d, count)
+                (s, d) => Operations.PackFromBgr24Bytes(s, d.Span, count)
             );
         }
 
@@ -278,7 +278,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             TestOperation(
                 source,
                 expected,
-                (s, d) => Operations.ToBgr24Bytes(s, d, count)
+                (s, d) => Operations.ToBgr24Bytes(s, d.Span, count)
             );
         }
 
@@ -299,7 +299,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             TestOperation(
                 source,
                 expected,
-                (s, d) => Operations.PackFromBgra32Bytes(s, d, count)
+                (s, d) => Operations.PackFromBgra32Bytes(s, d.Span, count)
             );
         }
 
@@ -324,7 +324,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             TestOperation(
                 source,
                 expected,
-                (s, d) => Operations.ToBgra32Bytes(s, d, count)
+                (s, d) => Operations.ToBgra32Bytes(s, d.Span, count)
             );
         }
 
@@ -336,10 +336,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             public TSource[] SourceBuffer { get; }
             public Buffer<TDest> ActualDestBuffer { get; }
             public TDest[] ExpectedDestBuffer { get; }
-
-            public Span<TSource> Source => this.SourceBuffer;
-            public Span<TDest> ActualDest => this.ActualDestBuffer;
-
+            
             public TestBuffers(TSource[] source, TDest[] expectedDest)
             {
                 this.SourceBuffer = source;
@@ -386,7 +383,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
         internal static void TestOperation<TSource, TDest>(
             TSource[] source,
             TDest[] expected,
-            Action<TSource[], Buffer<TDest>> action)
+            Action<TSource[], IBuffer<TDest>> action)
             where TSource : struct
             where TDest : struct
         {
diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
index b8907e81e..9dbfeaca9 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
@@ -19,13 +19,14 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             int length = source.Length;
             Guard.MustBeSizedAtLeast(dest, length, nameof(dest));
 
-            using (var rgbaBuffer = Configuration.Default.MemoryManager.Allocate<Rgba32>(length))
+            using (Buffer<Rgba32> rgbaBuffer = Configuration.Default.MemoryManager.Allocate<Rgba32>(length))
             {
-                PixelOperations<TPixel>.Instance.ToRgba32(source, rgbaBuffer, length);
+                Span<Rgba32> rgbaSpan = rgbaBuffer.Span;
+                PixelOperations<TPixel>.Instance.ToRgba32(source, rgbaSpan, length);
 
                 for (int i = 0; i < length; i++)
                 {
-                    ref Rgba32 s = ref rgbaBuffer[i];
+                    ref Rgba32 s = ref rgbaSpan[i];
                     ref Argb32 d = ref dest[i];
 
                     d.PackFromRgba32(s);
@@ -39,13 +40,14 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             int length = source.Length;
             Guard.MustBeSizedAtLeast(dest, length, nameof(dest));
 
-            using (var rgbaBuffer = Configuration.Default.MemoryManager.Allocate<Rgba32>(length))
+            using (Buffer<Rgba32> rgbaBuffer = Configuration.Default.MemoryManager.Allocate<Rgba32>(length))
             {
-                PixelOperations<Argb32>.Instance.ToRgba32(source, rgbaBuffer, length);
+                Span<Rgba32> rgbaSpan = rgbaBuffer.Span;
+                PixelOperations<Argb32>.Instance.ToRgba32(source, rgbaSpan, length);
 
                 for (int i = 0; i < length; i++)
                 {
-                    ref Rgba32 s = ref rgbaBuffer[i];
+                    ref Rgba32 s = ref rgbaSpan[i];
                     ref TPixel d = ref dest[i];
 
                     d.PackFromRgba32(s);
@@ -59,13 +61,14 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             int length = source.Length;
             Guard.MustBeSizedAtLeast(dest, length, nameof(dest));
 
-            using (var rgbaBuffer = Configuration.Default.MemoryManager.Allocate<Rgb24>(length))
+            using (Buffer<Rgb24> rgbBuffer = Configuration.Default.MemoryManager.Allocate<Rgb24>(length))
             {
-                PixelOperations<Rgb24>.Instance.ToRgb24(source, rgbaBuffer, length);
+                Span<Rgb24> rgbSpan = rgbBuffer.Span;
+                PixelOperations<Rgb24>.Instance.ToRgb24(source, rgbSpan, length);
 
                 for (int i = 0; i < length; i++)
                 {
-                    ref Rgb24 s = ref rgbaBuffer[i];
+                    ref Rgb24 s = ref rgbSpan[i];
                     ref TPixel d = ref dest[i];
                     var rgba = default(Rgba32);
                     s.ToRgba32(ref rgba);

From 5e8b8bbffec7cfc5ea3b70b122c480d51a3a4335 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 20 Feb 2018 02:33:31 +0100
Subject: [PATCH 32/70] 2 drawing regression test cases for safety

---
 .../Drawing/SolidBezierTests.cs               | 63 +++++++------------
 tests/Images/External                         |  2 +-
 2 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs b/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
index 07e75acf4..8bc4645ff 100644
--- a/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
@@ -9,40 +9,39 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Drawing
 {
-    public class SolidBezierTests : FileTestBase
+    [GroupOutput("Drawing")]
+    public class SolidBezierTests
     {
-        [Fact]
-        public void ImageShouldBeOverlayedByFilledPolygon()
+        [Theory]
+        [WithBlankImages(500, 500, PixelTypes.Rgba32)]
+        public void FilledBezier<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
-            string path = TestEnvironment.CreateOutputDirectory("Drawing", "FilledBezier");
-            SixLabors.Primitives.PointF[] simplePath = new SixLabors.Primitives.PointF[] {
+            Primitives.PointF[] simplePath = {
                         new Vector2(10, 400),
                         new Vector2(30, 10),
                         new Vector2(240, 30),
                         new Vector2(300, 400)
             };
-            using (Image<Rgba32> image = new Image<Rgba32>(500, 500))
-            {
-                image.Mutate(x => x
-                    .BackgroundColor(Rgba32.Blue)
-                    .Fill(Rgba32.HotPink, new Polygon(new CubicBezierLineSegment(simplePath))));
-                image.Save($"{path}/Simple.png");
-
-                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
-                {
-                    Assert.Equal(Rgba32.HotPink, sourcePixels[150, 300]);
 
-                    //curve points should not be never be set
-                    Assert.Equal(Rgba32.Blue, sourcePixels[240, 30]);
+            TPixel blue = NamedColors<TPixel>.Blue;
+            TPixel hotPink = NamedColors<TPixel>.HotPink;
 
-                    // inside shape should not be empty
-                    Assert.Equal(Rgba32.HotPink, sourcePixels[200, 250]);
-                }
+            using (Image<TPixel> image = provider.GetImage())
+            {
+                
+                image.Mutate(x => x
+                    .BackgroundColor(blue)
+                    .Fill(hotPink, new Polygon(new CubicBezierLineSegment(simplePath))));
+                image.DebugSave(provider);
+                image.CompareToReferenceOutput(provider);
             }
         }
 
-        [Fact]
-        public void ImageShouldBeOverlayedByFilledPolygonOpacity()
+        [Theory]
+        [WithBlankImages(500, 500, PixelTypes.Rgba32)]
+        public void OverlayByFilledPolygonOpacity<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
             string path = TestEnvironment.CreateOutputDirectory("Drawing", "FilledBezier");
             SixLabors.Primitives.PointF[] simplePath = new SixLabors.Primitives.PointF[] {
@@ -53,27 +52,13 @@ namespace SixLabors.ImageSharp.Tests.Drawing
             };
             Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150);
 
-            using (Image<Rgba32> image = new Image<Rgba32>(500, 500))
+            using (var image = provider.GetImage() as Image<Rgba32>)
             {
                 image.Mutate(x => x
                     .BackgroundColor(Rgba32.Blue)
                     .Fill(color, new Polygon(new CubicBezierLineSegment(simplePath))));
-                image.Save($"{path}/Opacity.png");
-
-                //shift background color towards forground color by the opacity amount
-                Rgba32 mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f));
-
-                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
-                {
-                    //top of curve
-                    Assert.Equal(mergedColor, sourcePixels[138, 116]);
-
-                    //curve points should not be never be set
-                    Assert.Equal(Rgba32.Blue, sourcePixels[240, 30]);
-
-                    // inside shape should not be empty
-                    Assert.Equal(mergedColor, sourcePixels[200, 250]);
-                }
+                image.DebugSave(provider);
+                image.CompareToReferenceOutput(provider);
             }
         }
     }
diff --git a/tests/Images/External b/tests/Images/External
index b3be1178d..0e1b5fd39 160000
--- a/tests/Images/External
+++ b/tests/Images/External
@@ -1 +1 @@
-Subproject commit b3be1178d4e970efc624181480094e50b0d57a90
+Subproject commit 0e1b5fd3987081c8fbee9d5cf6d74142b942df60

From caf1ad05a21c681042b7dbeb58525abd73758044 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 20 Feb 2018 03:00:25 +0100
Subject: [PATCH 33/70] MemoryManager returns IBuffer<T> now

---
 .../Brushes/ImageBrush{TPixel}.cs             |  4 +-
 .../Brushes/PatternBrush{TPixel}.cs           |  4 +-
 .../Brushes/Processors/BrushApplicator.cs     |  4 +-
 .../Brushes/RecolorBrush{TPixel}.cs           |  4 +-
 .../Brushes/SolidBrush{TPixel}.cs             |  4 +-
 .../Processors/DrawImageProcessor.cs          |  2 +-
 .../Processors/FillProcessor.cs               |  2 +-
 src/ImageSharp/Formats/Gif/LzwDecoder.cs      |  6 +--
 src/ImageSharp/Formats/Gif/LzwEncoder.cs      |  4 +-
 .../Common/Decoder/JpegImagePostProcessor.cs  |  2 +-
 .../GolangPort/Components/Decoder/Bytes.cs    |  2 +-
 .../PdfJsPort/Components/PdfJsComponent.cs    |  2 +-
 .../Components/PdfJsFrameComponent.cs         |  2 +-
 .../Components/PdfJsJpegPixelArea.cs          |  2 +-
 .../Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs    |  4 +-
 .../Memory/ArrayPoolMemoryManager.cs          | 11 ++++-
 src/ImageSharp/Memory/Buffer{T}.cs            |  4 +-
 src/ImageSharp/Memory/IGetArray.cs            | 14 +++++++
 src/ImageSharp/Memory/MemoryManager.cs        |  2 +-
 .../Memory/MemoryManagerExtensions.cs         |  6 +--
 .../Memory/SimpleManagedMemoryManager.cs      |  2 +-
 .../DefaultPixelBlenders.Generated.cs         | 42 +++++++++----------
 .../DefaultPixelBlenders.Generated.tt         |  2 +-
 .../Effects/BackgroundColorProcessor.cs       |  4 +-
 .../Quantizers/WuQuantizer{TPixel}.cs         | 26 ++++++------
 .../Color/Bulk/PackFromVector4.cs             |  4 +-
 .../Color/Bulk/PackFromXyzw.cs                |  4 +-
 .../Color/Bulk/ToVector4.cs                   |  4 +-
 .../ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs |  4 +-
 .../Color/Bulk/ToXyzw.cs                      |  4 +-
 .../PixelBlenders/PorterDuffBulkVsPixel.cs    |  6 +--
 tests/ImageSharp.Benchmarks/Samplers/Glow.cs  |  2 +-
 .../Drawing/SolidBezierTests.cs               |  4 +-
 .../PixelFormats/PixelOperationsTests.cs      |  6 +--
 .../ReferenceCodecs/SystemDrawingBridge.cs    |  6 +--
 35 files changed, 113 insertions(+), 92 deletions(-)
 create mode 100644 src/ImageSharp/Memory/IGetArray.cs

diff --git a/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
index 5866d9fea..6b3ce36fe 100644
--- a/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
@@ -122,8 +122,8 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             internal override void Apply(Span<float> scanline, int x, int y)
             {
                 // Create a span for colors
-                using (Buffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
-                using (Buffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
+                using (IBuffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+                using (IBuffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
                 {
                     Span<float> amountSpan = amountBuffer.Span;
                     Span<TPixel> overlaySpan = overlay.Span;
diff --git a/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
index ac8ffa794..449a23da9 100644
--- a/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
@@ -152,8 +152,8 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             internal override void Apply(Span<float> scanline, int x, int y)
             {
                 int patternY = y % this.pattern.Height;
-                using (Buffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
-                using (Buffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
+                using (IBuffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+                using (IBuffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
                 {
                     Span<float> amountSpan = amountBuffer.Span;
                     Span<TPixel> overlaySpan = overlay.Span;
diff --git a/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs b/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
index dadd546e9..68bc13ecb 100644
--- a/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
+++ b/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
@@ -65,8 +65,8 @@ namespace SixLabors.ImageSharp.Drawing.Brushes.Processors
         /// <remarks>scanlineBuffer will be > scanlineWidth but provide and offset in case we want to share a larger buffer across runs.</remarks>
         internal virtual void Apply(Span<float> scanline, int x, int y)
         {
-            using (Buffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
-            using (Buffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
+            using (IBuffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+            using (IBuffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
             {
                 Span<float> amountSpan = amountBuffer.Span;
                 Span<TPixel> overlaySpan = overlay.Span;
diff --git a/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
index d1fda7ebe..37cba42c9 100644
--- a/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
@@ -144,8 +144,8 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             /// <inheritdoc />
             internal override void Apply(Span<float> scanline, int x, int y)
             {
-                using (Buffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
-                using (Buffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
+                using (IBuffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+                using (IBuffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
                 {
                     Span<float> amountSpan = amountBuffer.Span;
                     Span<TPixel> overlaySpan = overlay.Span;
diff --git a/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
index 510299f26..90286cb6c 100644
--- a/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
@@ -68,7 +68,7 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             /// <summary>
             /// Gets the colors.
             /// </summary>
-            protected Buffer<TPixel> Colors { get; }
+            protected IBuffer<TPixel> Colors { get; }
 
             /// <summary>
             /// Gets the color for a single pixel.
@@ -93,7 +93,7 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
                 {
                     Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
 
-                    using (Buffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+                    using (IBuffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
                     {
                         Span<float> amountSpan = amountBuffer.Span;
 
diff --git a/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
index eb3949b00..21e13d47a 100644
--- a/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
@@ -84,7 +84,7 @@ namespace SixLabors.ImageSharp.Drawing.Processors
                 maxY = Math.Min(this.Location.Y + this.Size.Height, maxY);
 
                 int width = maxX - minX;
-                using (Buffer<float> amount = this.Image.GetConfiguration().MemoryManager.Allocate<float>(width))
+                using (IBuffer<float> amount = this.Image.GetConfiguration().MemoryManager.Allocate<float>(width))
                 {
                     amount.Span.Fill(this.Alpha);
 
diff --git a/src/ImageSharp.Drawing/Processors/FillProcessor.cs b/src/ImageSharp.Drawing/Processors/FillProcessor.cs
index 75ea1f203..3bf18a37b 100644
--- a/src/ImageSharp.Drawing/Processors/FillProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/FillProcessor.cs
@@ -66,7 +66,7 @@ namespace SixLabors.ImageSharp.Drawing.Processors
 
             int width = maxX - minX;
 
-            using (Buffer<float> amount = source.MemoryManager.Allocate<float>(width))
+            using (IBuffer<float> amount = source.MemoryManager.Allocate<float>(width))
             using (BrushApplicator<TPixel> applicator = this.brush.CreateApplicator(
                 source,
                 sourceRectangle,
diff --git a/src/ImageSharp/Formats/Gif/LzwDecoder.cs b/src/ImageSharp/Formats/Gif/LzwDecoder.cs
index 27ca275db..0c73efea4 100644
--- a/src/ImageSharp/Formats/Gif/LzwDecoder.cs
+++ b/src/ImageSharp/Formats/Gif/LzwDecoder.cs
@@ -32,17 +32,17 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <summary>
         /// The prefix buffer.
         /// </summary>
-        private readonly Buffer<int> prefix;
+        private readonly IBuffer<int> prefix;
 
         /// <summary>
         /// The suffix buffer.
         /// </summary>
-        private readonly Buffer<int> suffix;
+        private readonly IBuffer<int> suffix;
 
         /// <summary>
         /// The pixel stack buffer.
         /// </summary>
-        private readonly Buffer<int> pixelStack;
+        private readonly IBuffer<int> pixelStack;
 
         /// <summary>
         /// A value indicating whether this instance of the given entity has been disposed.
diff --git a/src/ImageSharp/Formats/Gif/LzwEncoder.cs b/src/ImageSharp/Formats/Gif/LzwEncoder.cs
index 115ecf6fb..35c414896 100644
--- a/src/ImageSharp/Formats/Gif/LzwEncoder.cs
+++ b/src/ImageSharp/Formats/Gif/LzwEncoder.cs
@@ -71,12 +71,12 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <summary>
         /// The hash table.
         /// </summary>
-        private readonly Buffer<int> hashTable;
+        private readonly IBuffer<int> hashTable;
 
         /// <summary>
         /// The code table.
         /// </summary>
-        private readonly Buffer<int> codeTable;
+        private readonly IBuffer<int> codeTable;
 
         /// <summary>
         /// Define the storage for the packet accumulator.
diff --git a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
index 3258fd32c..aa1c216a7 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
@@ -34,7 +34,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
         /// <summary>
         /// Temporal buffer to store a row of colors.
         /// </summary>
-        private readonly Buffer<Vector4> rgbaBuffer;
+        private readonly IBuffer<Vector4> rgbaBuffer;
 
         /// <summary>
         /// The <see cref="ColorConverters.JpegColorConverter"/> corresponding to the current <see cref="JpegColorSpace"/> determined by <see cref="IRawJpegData.ColorSpace"/>.
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
index 7a22b043b..c10771b46 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
@@ -33,7 +33,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// <summary>
         /// Values of <see cref="Buffer"/> converted to <see cref="int"/>-s
         /// </summary>
-        public Buffer<int> BufferAsInt;
+        public IBuffer<int> BufferAsInt;
 
         /// <summary>
         /// Start of bytes read
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsComponent.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsComponent.cs
index 3c35e311f..0742293c7 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsComponent.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsComponent.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// <summary>
         /// Gets or sets the output
         /// </summary>
-        public Buffer<short> Output;
+        public IBuffer<short> Output;
 
         /// <summary>
         /// Gets or sets the scaling factors
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs
index 18e177390..2442c3998 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs
@@ -60,7 +60,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// <summary>
         /// Gets the block data
         /// </summary>
-        public Buffer<short> BlockData { get; private set; }
+        public IBuffer<short> BlockData { get; private set; }
 
         /// <inheritdoc />
         public int Index { get; }
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
index a6f878017..f16fb9a2c 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
@@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
 
         private readonly int imageHeight;
 
-        private Buffer<byte> componentData;
+        private IBuffer<byte> componentData;
 
         private int rowStride;
 
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
index 6bcde2f48..4fa0bc281 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
@@ -786,8 +786,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
         {
             int blocksPerLine = component.BlocksPerLine;
             int blocksPerColumn = component.BlocksPerColumn;
-            using (Buffer<short> computationBuffer = this.configuration.MemoryManager.Allocate<short>(64, true))
-            using (Buffer<short> multiplicationBuffer = this.configuration.MemoryManager.Allocate<short>(64, true))
+            using (IBuffer<short> computationBuffer = this.configuration.MemoryManager.Allocate<short>(64, true))
+            using (IBuffer<short> multiplicationBuffer = this.configuration.MemoryManager.Allocate<short>(64, true))
             {
                 Span<short> quantizationTable = this.quantizationTables.Tables.GetRowSpan(frameComponent.QuantizationTableIndex);
                 Span<short> computationBufferSpan = computationBuffer.Span;
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index e14ba443f..de26b0ba5 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -38,7 +38,7 @@ namespace SixLabors.ImageSharp.Memory
         }
 
         /// <inheritdoc />
-        internal override Buffer<T> Allocate<T>(int length, bool clear)
+        internal override IBuffer<T> Allocate<T>(int length, bool clear)
         {
             int itemSizeBytes = Unsafe.SizeOf<T>();
             int bufferSizeInBytes = length * itemSizeBytes;
@@ -68,7 +68,14 @@ namespace SixLabors.ImageSharp.Memory
         /// <inheritdoc />
         internal override void Release<T>(Buffer<T> buffer)
         {
-            byte[] byteBuffer = Unsafe.As<byte[]>(buffer.GetArray());
+            T[] array = (buffer as IGetArray<T>)?.GetArray();
+            if (array == null)
+            {
+                return;
+            }
+
+            // TODO: OMG Do not do this!
+            byte[] byteBuffer = Unsafe.As<byte[]>(array);
             this.pool.Return(byteBuffer);
         }
     }
diff --git a/src/ImageSharp/Memory/Buffer{T}.cs b/src/ImageSharp/Memory/Buffer{T}.cs
index 309cca1f4..b1449f9b6 100644
--- a/src/ImageSharp/Memory/Buffer{T}.cs
+++ b/src/ImageSharp/Memory/Buffer{T}.cs
@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Memory
     /// The backing array is either pooled or comes from the outside.
     /// </summary>
     /// <typeparam name="T">The value type.</typeparam>
-    internal class Buffer<T> : IBuffer<T>
+    internal class Buffer<T> : IBuffer<T>, IGetArray<T>
         where T : struct
     {
         private MemoryManager memoryManager;
@@ -71,7 +71,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <summary>
         /// TODO: Refactor this
         /// </summary>
-        internal T[] GetArray()
+        T[] IGetArray<T>.GetArray()
         {
             return this.array;
         }
diff --git a/src/ImageSharp/Memory/IGetArray.cs b/src/ImageSharp/Memory/IGetArray.cs
new file mode 100644
index 000000000..9b46058d1
--- /dev/null
+++ b/src/ImageSharp/Memory/IGetArray.cs
@@ -0,0 +1,14 @@
+namespace SixLabors.ImageSharp.Memory
+{
+    /// <summary>
+    /// Absolutely temporal.
+    /// </summary>
+    internal interface IGetArray<T>
+        where T : struct
+    {
+        /// <summary>
+        /// Absolutely temporal.
+        /// </summary>
+        T[] GetArray();
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index 540c045de..fe6bb7823 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="length">Size of the buffer to allocate</param>
         /// <param name="clear">True to clear the backing memory of the buffer</param>
         /// <returns>A buffer of values of type <typeparamref name="T"/>.</returns>
-        internal abstract Buffer<T> Allocate<T>(int length, bool clear)
+        internal abstract IBuffer<T> Allocate<T>(int length, bool clear)
             where T : struct;
 
         internal abstract IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear);
diff --git a/src/ImageSharp/Memory/MemoryManagerExtensions.cs b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
index f15776721..21c8f7124 100644
--- a/src/ImageSharp/Memory/MemoryManagerExtensions.cs
+++ b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
@@ -14,13 +14,13 @@
         /// <param name="memoryManager">The <see cref="MemoryManager"/></param>
         /// <param name="length">Size of the buffer to allocate</param>
         /// <returns>A buffer of values of type <typeparamref name="T"/>.</returns>
-        public static Buffer<T> Allocate<T>(this MemoryManager memoryManager, int length)
+        public static IBuffer<T> Allocate<T>(this MemoryManager memoryManager, int length)
             where T : struct
         {
             return memoryManager.Allocate<T>(length, false);
         }
 
-        public static Buffer<T> AllocateClean<T>(this MemoryManager memoryManager, int length)
+        public static IBuffer<T> AllocateClean<T>(this MemoryManager memoryManager, int length)
             where T : struct
         {
             return memoryManager.Allocate<T>(length, true);
@@ -39,7 +39,7 @@
         public static Buffer2D<T> Allocate2D<T>(this MemoryManager memoryManager, int width, int height, bool clear)
             where T : struct
         {
-            Buffer<T> buffer = memoryManager.Allocate<T>(width * height, clear);
+            IBuffer<T> buffer = memoryManager.Allocate<T>(width * height, clear);
 
             return new Buffer2D<T>(buffer, width, height);
         }
diff --git a/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs b/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
index ac4098c71..804a468fd 100644
--- a/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
+++ b/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
@@ -6,7 +6,7 @@
     public class SimpleManagedMemoryManager : MemoryManager
     {
         /// <inheritdoc />
-        internal override Buffer<T> Allocate<T>(int length, bool clear)
+        internal override IBuffer<T> Allocate<T>(int length, bool clear)
         {
             return new Buffer<T>(new T[length], length, this);
         }
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
index 4ca53244a..17f75898d 100644
--- a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
+++ b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -84,7 +84,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -123,7 +123,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -162,7 +162,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -201,7 +201,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -240,7 +240,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -279,7 +279,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -318,7 +318,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -357,7 +357,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -396,7 +396,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -435,7 +435,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -474,7 +474,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -513,7 +513,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -552,7 +552,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -591,7 +591,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -630,7 +630,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -669,7 +669,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -708,7 +708,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -747,7 +747,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -786,7 +786,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -825,7 +825,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
index 5e9268dff..75c6b2d81 100644
--- a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
+++ b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
@@ -87,7 +87,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
diff --git a/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
index a42a2056c..e97495a3d 100644
--- a/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
@@ -71,8 +71,8 @@ namespace SixLabors.ImageSharp.Processing.Processors
 
             int width = maxX - minX;
 
-            using (Buffer<TPixel> colors = this.memoryManager.Allocate<TPixel>(width))
-            using (Buffer<float> amount = this.memoryManager.Allocate<float>(width))
+            using (IBuffer<TPixel> colors = this.memoryManager.Allocate<TPixel>(width))
+            using (IBuffer<float> amount = this.memoryManager.Allocate<float>(width))
             {
                 // Be careful! Do not capture colorSpan & amountSpan in the lambda below!
                 Span<TPixel> colorSpan = colors.Span;
diff --git a/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
index d9f188bf3..0aadf4973 100644
--- a/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
@@ -473,19 +473,19 @@ namespace SixLabors.ImageSharp.Quantizers
             Span<long> vmaSpan = this.vma.Span;
             Span<float> m2Span = this.m2.Span;
 
-            using (Buffer<long> volume = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (Buffer<long> volumeR = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (Buffer<long> volumeG = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (Buffer<long> volumeB = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (Buffer<long> volumeA = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (Buffer<float> volume2 = memoryManager.Allocate<float>(IndexCount * IndexAlphaCount))
-
-            using (Buffer<long> area = memoryManager.Allocate<long>(IndexAlphaCount))
-            using (Buffer<long> areaR = memoryManager.Allocate<long>(IndexAlphaCount))
-            using (Buffer<long> areaG = memoryManager.Allocate<long>(IndexAlphaCount))
-            using (Buffer<long> areaB = memoryManager.Allocate<long>(IndexAlphaCount))
-            using (Buffer<long> areaA = memoryManager.Allocate<long>(IndexAlphaCount))
-            using (Buffer<float> area2 = memoryManager.Allocate<float>(IndexAlphaCount))
+            using (IBuffer<long> volume = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (IBuffer<long> volumeR = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (IBuffer<long> volumeG = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (IBuffer<long> volumeB = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (IBuffer<long> volumeA = memoryManager.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (IBuffer<float> volume2 = memoryManager.Allocate<float>(IndexCount * IndexAlphaCount))
+
+            using (IBuffer<long> area = memoryManager.Allocate<long>(IndexAlphaCount))
+            using (IBuffer<long> areaR = memoryManager.Allocate<long>(IndexAlphaCount))
+            using (IBuffer<long> areaG = memoryManager.Allocate<long>(IndexAlphaCount))
+            using (IBuffer<long> areaB = memoryManager.Allocate<long>(IndexAlphaCount))
+            using (IBuffer<long> areaA = memoryManager.Allocate<long>(IndexAlphaCount))
+            using (IBuffer<float> area2 = memoryManager.Allocate<float>(IndexAlphaCount))
             {
                 Span<long> volumeSpan = volume.Span;
                 Span<long> volumeRSpan = volumeR.Span;
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
index 1b49c48ec..7d8519875 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
@@ -13,9 +13,9 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
     public abstract class PackFromVector4<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
-        private Buffer<Vector4> source;
+        private IBuffer<Vector4> source;
 
-        private Buffer<TPixel> destination;
+        private IBuffer<TPixel> destination;
 
         [Params(16, 128, 512)]
         public int Count { get; set; }
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
index 33dbcd24c..882d77dd1 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
@@ -11,9 +11,9 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
     public abstract class PackFromXyzw<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
-        private Buffer<TPixel> destination;
+        private IBuffer<TPixel> destination;
 
-        private Buffer<byte> source;
+        private IBuffer<byte> source;
 
         [Params(16, 128, 1024)]
         public int Count { get; set; }
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
index 8a7fc52af..653714150 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
@@ -12,9 +12,9 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
     public abstract class ToVector4<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
-        private Buffer<TPixel> source;
+        private IBuffer<TPixel> source;
 
-        private Buffer<Vector4> destination;
+        private IBuffer<Vector4> destination;
 
         [Params(64, 300, 1024)]
         public int Count { get; set; }
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
index 45ccaa829..b2def64ac 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
@@ -12,9 +12,9 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
     public abstract class ToXyz<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
-        private Buffer<TPixel> source;
+        private IBuffer<TPixel> source;
 
-        private Buffer<byte> destination;
+        private IBuffer<byte> destination;
 
         [Params(16, 128, 1024)]
         public int Count { get; set; }
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
index 9912e987c..dd9a628c2 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
@@ -14,9 +14,9 @@ namespace SixLabors.ImageSharp.Benchmarks.Color.Bulk
     public abstract class ToXyzw<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
-        private Buffer<TPixel> source;
+        private IBuffer<TPixel> source;
 
-        private Buffer<byte> destination;
+        private IBuffer<byte> destination;
 
         [Params(16, 128, 1024)]
         public int Count { get; set; }
diff --git a/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs b/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
index 07734c6f5..c088e8eed 100644
--- a/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
+++ b/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
@@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.Benchmarks
             Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
             Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-            using (Buffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
+            using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3))
             {
                 Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                 Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Benchmarks
         {
             using (Image<Rgba32> image = new Image<Rgba32>(800, 800))
             {
-                using (Buffer<float> amounts = Configuration.Default.MemoryManager.Allocate<float>(image.Width))
+                using (IBuffer<float> amounts = Configuration.Default.MemoryManager.Allocate<float>(image.Width))
                 {
                     amounts.Span.Fill(1);
                     
@@ -81,7 +81,7 @@ namespace SixLabors.ImageSharp.Benchmarks
         {
             using (Image<Rgba32> image = new Image<Rgba32>(800, 800))
             {
-                using (Buffer<float> amounts = Configuration.Default.MemoryManager.Allocate<float>(image.Width))
+                using (IBuffer<float> amounts = Configuration.Default.MemoryManager.Allocate<float>(image.Width))
                 {
                     amounts.Span.Fill(1);
                     using (PixelAccessor<Rgba32> pixels = image.Lock())
diff --git a/tests/ImageSharp.Benchmarks/Samplers/Glow.cs b/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
index b36b4841f..5f4e2d75b 100644
--- a/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
+++ b/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
@@ -103,7 +103,7 @@ namespace SixLabors.ImageSharp.Benchmarks
                 }
 
                 int width = maxX - minX;
-                using (Buffer<TPixel> rowColors = Configuration.Default.MemoryManager.Allocate<TPixel>(width))
+                using (IBuffer<TPixel> rowColors = Configuration.Default.MemoryManager.Allocate<TPixel>(width))
                 using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     rowColors.Span.Fill(glowColor);
diff --git a/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs b/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
index 8bc4645ff..70badd34c 100644
--- a/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
@@ -43,13 +43,13 @@ namespace SixLabors.ImageSharp.Tests.Drawing
         public void OverlayByFilledPolygonOpacity<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : struct, IPixel<TPixel>
         {
-            string path = TestEnvironment.CreateOutputDirectory("Drawing", "FilledBezier");
-            SixLabors.Primitives.PointF[] simplePath = new SixLabors.Primitives.PointF[] {
+            Primitives.PointF[] simplePath = {
                         new Vector2(10, 400),
                         new Vector2(30, 10),
                         new Vector2(240, 30),
                         new Vector2(300, 400)
             };
+
             Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150);
 
             using (var image = provider.GetImage() as Image<Rgba32>)
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
index 6e01bf182..c0039bb37 100644
--- a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
@@ -50,8 +50,8 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
                 int times = 200000;
                 int count = 1024;
 
-                using (Buffer<ImageSharp.Rgba32> source = Configuration.Default.MemoryManager.Allocate<ImageSharp.Rgba32>(count))
-                using (Buffer<Vector4> dest = Configuration.Default.MemoryManager.Allocate<Vector4>(count))
+                using (IBuffer<ImageSharp.Rgba32> source = Configuration.Default.MemoryManager.Allocate<ImageSharp.Rgba32>(count))
+                using (IBuffer<Vector4> dest = Configuration.Default.MemoryManager.Allocate<Vector4>(count))
                 {
                     this.Measure(
                         times,
@@ -334,7 +334,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             where TDest : struct
         {
             public TSource[] SourceBuffer { get; }
-            public Buffer<TDest> ActualDestBuffer { get; }
+            public IBuffer<TDest> ActualDestBuffer { get; }
             public TDest[] ExpectedDestBuffer { get; }
             
             public TestBuffers(TSource[] source, TDest[] expectedDest)
diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
index 9dbfeaca9..d1270dcfd 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
@@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             int length = source.Length;
             Guard.MustBeSizedAtLeast(dest, length, nameof(dest));
 
-            using (Buffer<Rgba32> rgbaBuffer = Configuration.Default.MemoryManager.Allocate<Rgba32>(length))
+            using (IBuffer<Rgba32> rgbaBuffer = Configuration.Default.MemoryManager.Allocate<Rgba32>(length))
             {
                 Span<Rgba32> rgbaSpan = rgbaBuffer.Span;
                 PixelOperations<TPixel>.Instance.ToRgba32(source, rgbaSpan, length);
@@ -40,7 +40,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             int length = source.Length;
             Guard.MustBeSizedAtLeast(dest, length, nameof(dest));
 
-            using (Buffer<Rgba32> rgbaBuffer = Configuration.Default.MemoryManager.Allocate<Rgba32>(length))
+            using (IBuffer<Rgba32> rgbaBuffer = Configuration.Default.MemoryManager.Allocate<Rgba32>(length))
             {
                 Span<Rgba32> rgbaSpan = rgbaBuffer.Span;
                 PixelOperations<Argb32>.Instance.ToRgba32(source, rgbaSpan, length);
@@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             int length = source.Length;
             Guard.MustBeSizedAtLeast(dest, length, nameof(dest));
 
-            using (Buffer<Rgb24> rgbBuffer = Configuration.Default.MemoryManager.Allocate<Rgb24>(length))
+            using (IBuffer<Rgb24> rgbBuffer = Configuration.Default.MemoryManager.Allocate<Rgb24>(length))
             {
                 Span<Rgb24> rgbSpan = rgbBuffer.Span;
                 PixelOperations<Rgb24>.Instance.ToRgb24(source, rgbSpan, length);

From 8e7aef62a772ab40aaea5a9f423e5866dd85771c Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 20 Feb 2018 03:32:21 +0100
Subject: [PATCH 34/70] MemoryManager-s should provide their own IBuffer<T>
 implementations

---
 .../Processors/FillRegionProcessor.cs         |  2 +-
 .../Common/Decoder/JpegBlockPostProcessor.cs  |  2 +-
 .../PdfJsPort/Components/PdfJsHuffmanTable.cs | 12 ++---
 src/ImageSharp/Image/PixelAccessor{TPixel}.cs |  2 +-
 .../ArrayPoolMemoryManager.Buffer{T}.cs       | 50 +++++++++++++++++++
 .../Memory/ArrayPoolMemoryManager.cs          | 21 ++------
 src/ImageSharp/Memory/BasicArrayBuffer.cs     | 22 +-------
 src/ImageSharp/Memory/BasicByteBuffer.cs      | 10 ++++
 src/ImageSharp/Memory/Buffer{T}.cs            |  4 +-
 src/ImageSharp/Memory/ManagedByteBuffer.cs    | 12 -----
 src/ImageSharp/Memory/MemoryManager.cs        | 11 +---
 .../Memory/MemoryManagerExtensions.cs         |  2 +-
 .../Memory/SimpleManagedMemoryManager.cs      |  9 +---
 13 files changed, 78 insertions(+), 81 deletions(-)
 create mode 100644 src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
 create mode 100644 src/ImageSharp/Memory/BasicByteBuffer.cs
 delete mode 100644 src/ImageSharp/Memory/ManagedByteBuffer.cs

diff --git a/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
index ae5ee2d9f..076785526 100644
--- a/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
@@ -183,7 +183,7 @@ namespace SixLabors.ImageSharp.Drawing.Processors
                                 }
                             }
 
-                            applicator.Apply(scanline, minX, y);
+                            applicator.Apply(scanline.Span, minX, y);
                         }
                     }
                 }
diff --git a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegBlockPostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegBlockPostProcessor.cs
index 574967b6b..5e8e8fa2c 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegBlockPostProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegBlockPostProcessor.cs
@@ -8,7 +8,7 @@ using SixLabors.Primitives;
 namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
 {
     /// <summary>
-    /// Encapsulates the implementation of processing "raw" <see cref="Buffer{T}"/>-s into Jpeg image channels.
+    /// Encapsulates the implementation of processing "raw" <see cref="IBuffer{T}"/>-s into Jpeg image channels.
     /// </summary>
     [StructLayout(LayoutKind.Sequential)]
     internal struct JpegBlockPostProcessor
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
index b8694c538..3c43ba244 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
@@ -30,13 +30,13 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
             this.valOffset = memoryManager.AllocateFake<short>(18);
             this.maxcode = memoryManager.AllocateFake<long>(18);
 
-            using (BasicArrayBuffer<short> huffsize = memoryManager.AllocateFake<short>(257))
-            using (BasicArrayBuffer<short> huffcode = memoryManager.AllocateFake<short>(257))
+            using (IBuffer<short> huffsize = memoryManager.Allocate<short>(257))
+            using (IBuffer<short> huffcode = memoryManager.Allocate<short>(257))
             {
-                GenerateSizeTable(lengths, huffsize);
-                GenerateCodeTable(huffsize, huffcode);
-                GenerateDecoderTables(lengths, huffcode, this.valOffset, this.maxcode);
-                GenerateLookaheadTables(lengths, values, this.lookahead);
+                GenerateSizeTable(lengths, huffsize.Span);
+                GenerateCodeTable(huffsize.Span, huffcode.Span);
+                GenerateDecoderTables(lengths, huffcode.Span, this.valOffset.Span, this.maxcode.Span);
+                GenerateLookaheadTables(lengths, values, this.lookahead.Span);
             }
 
             this.huffval = memoryManager.AllocateManagedByteBuffer(values.Length, true);
diff --git a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
index 80c0ce4e6..3a894fb9a 100644
--- a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
+++ b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
@@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp
     {
 #pragma warning disable SA1401 // Fields must be private
         /// <summary>
-        /// The <see cref="Buffer{T}"/> containing the pixel data.
+        /// The <see cref="Buffer2D{T}"/> containing the pixel data.
         /// </summary>
         internal Buffer2D<TPixel> PixelBuffer;
         private bool ownedBuffer;
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
new file mode 100644
index 000000000..5b0352010
--- /dev/null
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
@@ -0,0 +1,50 @@
+using System;
+
+namespace SixLabors.ImageSharp.Memory
+{
+    /// <summary>
+    /// Contains <see cref="Buffer{T}"/> and <see cref="ManagedByteBuffer"/>
+    /// </summary>
+    public partial class ArrayPoolMemoryManager
+    {
+        private class Buffer<T> : IBuffer<T>
+            where T : struct
+        {
+            private readonly ArrayPoolMemoryManager memoryManager;
+
+            private readonly int length;
+
+            public Buffer(byte[] data, int length, ArrayPoolMemoryManager memoryManager)
+            {
+                this.memoryManager = memoryManager;
+                this.Data = data;
+                this.length = length;
+            }
+
+            protected byte[] Data { get; private set; }
+
+            public Span<T> Span => this.Data.AsSpan().NonPortableCast<byte, T>().Slice(0, this.length);
+
+            public void Dispose()
+            {
+                if (this.Data == null)
+                {
+                    return;
+                }
+
+                this.memoryManager.pool.Return(this.Data);
+                this.Data = null;
+            }
+        }
+
+        private class ManagedByteBuffer : Buffer<byte>, IManagedByteBuffer
+        {
+            public ManagedByteBuffer(byte[] data, int length, ArrayPoolMemoryManager memoryManager)
+                : base(data, length, memoryManager)
+            {
+            }
+
+            public byte[] Array => this.Data;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index de26b0ba5..41ef84784 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Buffers;
+using System.Buffers;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -8,7 +7,7 @@ namespace SixLabors.ImageSharp.Memory
     /// <summary>
     /// Implements <see cref="MemoryManager"/> by allocating memory from <see cref="ArrayPool{T}"/>.
     /// </summary>
-    public class ArrayPoolMemoryManager : MemoryManager
+    public partial class ArrayPoolMemoryManager : MemoryManager
     {
         /// <summary>
         /// Defines the default maximum size of pooled arrays.
@@ -44,7 +43,7 @@ namespace SixLabors.ImageSharp.Memory
             int bufferSizeInBytes = length * itemSizeBytes;
 
             byte[] byteBuffer = this.pool.Rent(bufferSizeInBytes);
-            var buffer = new Buffer<T>(Unsafe.As<T[]>(byteBuffer), length, this);
+            var buffer = new Buffer<T>(byteBuffer, length, this);
             if (clear)
             {
                 buffer.Clear();
@@ -64,19 +63,5 @@ namespace SixLabors.ImageSharp.Memory
 
             return buffer;
         }
-
-        /// <inheritdoc />
-        internal override void Release<T>(Buffer<T> buffer)
-        {
-            T[] array = (buffer as IGetArray<T>)?.GetArray();
-            if (array == null)
-            {
-                return;
-            }
-
-            // TODO: OMG Do not do this!
-            byte[] byteBuffer = Unsafe.As<byte[]>(array);
-            this.pool.Return(byteBuffer);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/BasicArrayBuffer.cs b/src/ImageSharp/Memory/BasicArrayBuffer.cs
index d9eb5a19a..17bf4c843 100644
--- a/src/ImageSharp/Memory/BasicArrayBuffer.cs
+++ b/src/ImageSharp/Memory/BasicArrayBuffer.cs
@@ -36,27 +36,7 @@ namespace SixLabors.ImageSharp.Memory
                 return ref span[index];
             }
         }
-
-        /// <summary>
-        /// Converts <see cref="Buffer{T}"/> to an <see cref="ReadOnlySpan{T}"/>.
-        /// </summary>
-        /// <param name="buffer">The <see cref="Buffer{T}"/> to convert.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator ReadOnlySpan<T>(BasicArrayBuffer<T> buffer)
-        {
-            return new ReadOnlySpan<T>(buffer.Array, 0, buffer.Length);
-        }
-
-        /// <summary>
-        /// Converts <see cref="Buffer{T}"/> to an <see cref="Span{T}"/>.
-        /// </summary>
-        /// <param name="buffer">The <see cref="Buffer{T}"/> to convert.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator Span<T>(BasicArrayBuffer<T> buffer)
-        {
-            return new Span<T>(buffer.Array, 0, buffer.Length);
-        }
-
+        
         public void Dispose()
         {
         }
diff --git a/src/ImageSharp/Memory/BasicByteBuffer.cs b/src/ImageSharp/Memory/BasicByteBuffer.cs
new file mode 100644
index 000000000..96b69ad3b
--- /dev/null
+++ b/src/ImageSharp/Memory/BasicByteBuffer.cs
@@ -0,0 +1,10 @@
+namespace SixLabors.ImageSharp.Memory
+{
+    internal class BasicByteBuffer : BasicArrayBuffer<byte>, IManagedByteBuffer
+    {
+        internal BasicByteBuffer(byte[] array)
+            : base(array)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/Buffer{T}.cs b/src/ImageSharp/Memory/Buffer{T}.cs
index b1449f9b6..547e6f209 100644
--- a/src/ImageSharp/Memory/Buffer{T}.cs
+++ b/src/ImageSharp/Memory/Buffer{T}.cs
@@ -58,9 +58,7 @@ namespace SixLabors.ImageSharp.Memory
             {
                 return;
             }
-
-            this.memoryManager?.Release(this);
-
+            
             this.memoryManager = null;
             this.array = null;
             this.Length = 0;
diff --git a/src/ImageSharp/Memory/ManagedByteBuffer.cs b/src/ImageSharp/Memory/ManagedByteBuffer.cs
deleted file mode 100644
index 94d08e2aa..000000000
--- a/src/ImageSharp/Memory/ManagedByteBuffer.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace SixLabors.ImageSharp.Memory
-{
-    internal class ManagedByteBuffer : Buffer<byte>, IManagedByteBuffer
-    {
-        internal ManagedByteBuffer(byte[] array, int length, MemoryManager memoryManager)
-            : base(array, length, memoryManager)
-        {
-        }
-
-        public byte[] Array => this.array;
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index fe6bb7823..7445c66b7 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -12,7 +12,7 @@ namespace SixLabors.ImageSharp.Memory
     public abstract class MemoryManager
     {
         /// <summary>
-        /// Allocates a <see cref="Buffer{T}"/> of size <paramref name="length"/>, optionally
+        /// Allocates an <see cref="IBuffer{T}"/> of size <paramref name="length"/>, optionally
         /// clearing the buffer before it gets returned.
         /// </summary>
         /// <typeparam name="T">Type of the data stored in the buffer</typeparam>
@@ -24,15 +24,6 @@ namespace SixLabors.ImageSharp.Memory
 
         internal abstract IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear);
 
-        /// <summary>
-        /// Releases the memory allocated for <paramref name="buffer"/>. After this, the buffer
-        /// is no longer usable.
-        /// </summary>
-        /// <typeparam name="T">Type of the data stored in the buffer</typeparam>
-        /// <param name="buffer">The buffer to release</param>
-        internal abstract void Release<T>(Buffer<T> buffer)
-            where T : struct;
-
         /// <summary>
         /// Temporal workaround. A method providing a "Buffer" based on a generic array without the 'Unsafe.As()' hackery.
         /// Should be replaced with 'Allocate()' as soon as SixLabors.Shapes has Span-based API-s!
diff --git a/src/ImageSharp/Memory/MemoryManagerExtensions.cs b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
index 21c8f7124..b7fcaf4b3 100644
--- a/src/ImageSharp/Memory/MemoryManagerExtensions.cs
+++ b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
@@ -6,7 +6,7 @@
     internal static class MemoryManagerExtensions
     {
         /// <summary>
-        /// Allocates a <see cref="Buffer{T}"/> of size <paramref name="length"/>.
+        /// Allocates a <see cref="IBuffer{T}"/> of size <paramref name="length"/>.
         /// Note: Depending on the implementation, the buffer may not cleared before
         /// returning, so it may contain data from an earlier use.
         /// </summary>
diff --git a/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs b/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
index 804a468fd..701c71ad4 100644
--- a/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
+++ b/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
@@ -8,17 +8,12 @@
         /// <inheritdoc />
         internal override IBuffer<T> Allocate<T>(int length, bool clear)
         {
-            return new Buffer<T>(new T[length], length, this);
+            return new BasicArrayBuffer<T>(new T[length]);
         }
 
         internal override IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear)
         {
-            return new ManagedByteBuffer(new byte[length], length, this);
-        }
-
-        /// <inheritdoc />
-        internal override void Release<T>(Buffer<T> buffer)
-        {
+            return new BasicByteBuffer(new byte[length]);
         }
     }
 }

From 563eb6b3b98eae133df69fd2ffb8ca69823f787d Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 20 Feb 2018 03:37:51 +0100
Subject: [PATCH 35/70] goodbye top-level Buffer<T>!

---
 .../CieXyChromaticityCoordinates.cs           |  2 +-
 .../Jpeg/PdfJsPort/Components/PdfJsIDCT.cs    |  3 +-
 src/ImageSharp/Memory/BasicArrayBuffer.cs     |  2 +-
 src/ImageSharp/Memory/Buffer2DExtensions.cs   |  1 -
 src/ImageSharp/Memory/Buffer{T}.cs            | 77 -------------------
 src/ImageSharp/Memory/IGetArray.cs            | 14 ----
 6 files changed, 3 insertions(+), 96 deletions(-)
 delete mode 100644 src/ImageSharp/Memory/Buffer{T}.cs
 delete mode 100644 src/ImageSharp/Memory/IGetArray.cs

diff --git a/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs b/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs
index 92687a563..487f464d8 100644
--- a/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs
+++ b/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs
@@ -5,8 +5,8 @@ using System;
 using System.ComponentModel;
 using System.Numerics;
 using System.Runtime.CompilerServices;
-// ReSharper disable CompareOfFloatsByEqualityOperator
 
+// ReSharper disable CompareOfFloatsByEqualityOperator
 namespace SixLabors.ImageSharp.ColorSpaces
 {
     /// <summary>
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsIDCT.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsIDCT.cs
index f2e269f6c..00fa1985d 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsIDCT.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsIDCT.cs
@@ -3,11 +3,10 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
 {
-    using SixLabors.ImageSharp.Memory;
-
     /// <summary>
     /// Performs the inverse Descrete Cosine Transform on each frame component.
     /// </summary>
diff --git a/src/ImageSharp/Memory/BasicArrayBuffer.cs b/src/ImageSharp/Memory/BasicArrayBuffer.cs
index 17bf4c843..d2f8653f6 100644
--- a/src/ImageSharp/Memory/BasicArrayBuffer.cs
+++ b/src/ImageSharp/Memory/BasicArrayBuffer.cs
@@ -36,7 +36,7 @@ namespace SixLabors.ImageSharp.Memory
                 return ref span[index];
             }
         }
-        
+
         public void Dispose()
         {
         }
diff --git a/src/ImageSharp/Memory/Buffer2DExtensions.cs b/src/ImageSharp/Memory/Buffer2DExtensions.cs
index 0cbffde77..ac5ab09db 100644
--- a/src/ImageSharp/Memory/Buffer2DExtensions.cs
+++ b/src/ImageSharp/Memory/Buffer2DExtensions.cs
@@ -12,7 +12,6 @@ namespace SixLabors.ImageSharp.Memory
     /// </summary>
     internal static class Buffer2DExtensions
     {
-        
         /// <summary>
         /// Gets a <see cref="Span{T}"/> to the row 'y' beginning from the pixel at 'x'.
         /// </summary>
diff --git a/src/ImageSharp/Memory/Buffer{T}.cs b/src/ImageSharp/Memory/Buffer{T}.cs
deleted file mode 100644
index 547e6f209..000000000
--- a/src/ImageSharp/Memory/Buffer{T}.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.Memory
-{
-    /// <inheritdoc />
-    /// <summary>
-    /// Manages a buffer of value type objects as a Disposable resource.
-    /// The backing array is either pooled or comes from the outside.
-    /// </summary>
-    /// <typeparam name="T">The value type.</typeparam>
-    internal class Buffer<T> : IBuffer<T>, IGetArray<T>
-        where T : struct
-    {
-        private MemoryManager memoryManager;
-
-        // why is there such a rule? :S Protected should be fine for a field!
-#pragma warning disable SA1401 // Fields should be private
-        /// <summary>
-        /// The backing array.
-        /// </summary>
-        protected T[] array;
-#pragma warning restore SA1401 // Fields should be private
-
-        internal Buffer(T[] array, int length, MemoryManager memoryManager)
-        {
-            if (array.Length < length)
-            {
-                throw new ArgumentException("Can't initialize a PinnedBuffer with array.Length < count", nameof(array));
-            }
-
-            this.Length = length;
-            this.array = array;
-            this.memoryManager = memoryManager;
-        }
-
-        /// <summary>
-        /// Gets the count of "relevant" elements. It's usually smaller than 'Array.Length' when <see cref="array"/> is pooled.
-        /// </summary>
-        public int Length { get; private set; }
-
-        /// <summary>
-        /// Gets a <see cref="Span{T}"/> to the backing buffer.
-        /// </summary>
-        public Span<T> Span => new Span<T>(this.array, 0, this.Length);
-
-        /// <summary>
-        /// Disposes the <see cref="Buffer{T}"/> instance by unpinning the array, and returning the pooled buffer when necessary.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Dispose()
-        {
-            if (this.array == null)
-            {
-                return;
-            }
-            
-            this.memoryManager = null;
-            this.array = null;
-            this.Length = 0;
-
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// TODO: Refactor this
-        /// </summary>
-        T[] IGetArray<T>.GetArray()
-        {
-            return this.array;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/IGetArray.cs b/src/ImageSharp/Memory/IGetArray.cs
deleted file mode 100644
index 9b46058d1..000000000
--- a/src/ImageSharp/Memory/IGetArray.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace SixLabors.ImageSharp.Memory
-{
-    /// <summary>
-    /// Absolutely temporal.
-    /// </summary>
-    internal interface IGetArray<T>
-        where T : struct
-    {
-        /// <summary>
-        /// Absolutely temporal.
-        /// </summary>
-        T[] GetArray();
-    }
-}
\ No newline at end of file

From 1e78de07f9babf4180cd7385a6e96f22092008ba Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 20 Feb 2018 17:20:39 +0100
Subject: [PATCH 36/70] Buffer2DTests using a mock MemoryManager

---
 src/ImageSharp/Memory/BasicArrayBuffer.cs     | 13 +++--
 .../ImageSharp.Tests/Memory/Buffer2DTests.cs  | 50 +++++++++++++------
 2 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/ImageSharp/Memory/BasicArrayBuffer.cs b/src/ImageSharp/Memory/BasicArrayBuffer.cs
index d2f8653f6..30ca210ac 100644
--- a/src/ImageSharp/Memory/BasicArrayBuffer.cs
+++ b/src/ImageSharp/Memory/BasicArrayBuffer.cs
@@ -9,16 +9,23 @@ namespace SixLabors.ImageSharp.Memory
     internal class BasicArrayBuffer<T> : IBuffer<T>
         where T : struct
     {
-        public BasicArrayBuffer(T[] array)
+        public BasicArrayBuffer(T[] array, int length)
         {
+            DebugGuard.MustBeLessThanOrEqualTo(length, array.Length, nameof(length));
             this.Array = array;
+            this.Length = length;
+        }
+
+        public BasicArrayBuffer(T[] array)
+            : this(array, array.Length)
+        {
         }
 
         public T[] Array { get; }
 
-        public Span<T> Span => this.Array;
+        public int Length { get; }
 
-        public int Length => this.Array.Length;
+        public Span<T> Span => this.Array.AsSpan().Slice(0, this.Length);
 
         /// <summary>
         /// Returns a reference to specified element of the buffer.
diff --git a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
index 6afce94fd..a765a77b1 100644
--- a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
+++ b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
@@ -26,12 +26,38 @@ namespace SixLabors.ImageSharp.Tests.Memory
             }
         }
 
+        private MemoryManager MemoryManager { get; } = new MockMemoryManager();
+
+        private class MockMemoryManager : MemoryManager
+        {
+            internal override IBuffer<T> Allocate<T>(int length, bool clear)
+            {
+                T[] array = new T[length + 42];
+
+                if (!clear)
+                {
+                    Span<byte> data = array.AsSpan().NonPortableCast<T, byte>();
+                    for (int i = 0; i < data.Length; i++)
+                    {
+                        data[i] = 42;
+                    }
+                }
+
+                return new BasicArrayBuffer<T>(array, length);
+            }
+
+            internal override IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
         [Theory]
         [InlineData(7, 42)]
         [InlineData(1025, 17)]
         public void Construct(int width, int height)
         {
-            using (Buffer2D<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate2D<TestStructs.Foo>(width, height))
+            using (Buffer2D<TestStructs.Foo> buffer = this.MemoryManager.Allocate2D<TestStructs.Foo>(width, height))
             {
                 Assert.Equal(width, buffer.Width);
                 Assert.Equal(height, buffer.Height);
@@ -42,16 +68,12 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [Fact]
         public void CreateClean()
         {
-            for (int i = 0; i < 100; i++)
+            using (Buffer2D<int> buffer = this.MemoryManager.Allocate2D<int>(42, 42, true))
             {
-                using (Buffer2D<int> buffer = Configuration.Default.MemoryManager.Allocate2D<int>(42, 42, true))
+                Span<int> span = buffer.Span;
+                for (int j = 0; j < span.Length; j++)
                 {
-                    Span<int> span = buffer.Span;
-                    for (int j = 0; j < span.Length; j++)
-                    {
-                        Assert.Equal(0, span[j]);
-                        span[j] = 666;
-                    }
+                    Assert.Equal(0, span[j]);
                 }
             }
         }
@@ -62,7 +84,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(17, 42, 41)]
         public void GetRowSpanY(int width, int height, int y)
         {
-            using (Buffer2D<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate2D<TestStructs.Foo>(width, height))
+            using (Buffer2D<TestStructs.Foo> buffer = this.MemoryManager.Allocate2D<TestStructs.Foo>(width, height))
             {
                 Span<TestStructs.Foo> span = buffer.GetRowSpan(y);
 
@@ -78,7 +100,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(17, 42, 0, 41)]
         public void GetRowSpanXY(int width, int height, int x, int y)
         {
-            using (Buffer2D<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate2D<TestStructs.Foo>(width, height))
+            using (Buffer2D<TestStructs.Foo> buffer = this.MemoryManager.Allocate2D<TestStructs.Foo>(width, height))
             {
                 Span<TestStructs.Foo> span = buffer.GetRowSpan(x, y);
 
@@ -94,13 +116,13 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(99, 88, 98, 87)]
         public void Indexer(int width, int height, int x, int y)
         {
-            using (Buffer2D<TestStructs.Foo> buffer = Configuration.Default.MemoryManager.Allocate2D<TestStructs.Foo>(width, height))
+            using (Buffer2D<TestStructs.Foo> buffer = this.MemoryManager.Allocate2D<TestStructs.Foo>(width, height))
             {
-                Span<TestStructs.Foo> array = buffer.Buffer.Span;
+                Span<TestStructs.Foo> span = buffer.Buffer.Span;
 
                 ref TestStructs.Foo actual = ref buffer[x, y];
 
-                ref TestStructs.Foo expected = ref array[y * width + x];
+                ref TestStructs.Foo expected = ref span[y * width + x];
 
                 Assert.True(Unsafe.AreSame(ref expected, ref actual));
             }

From f5f5f6f7492a9fbf49939fabac8bdee7fdc20c3b Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 20 Feb 2018 17:42:21 +0100
Subject: [PATCH 37/70] ArrayPoolMemoryManagerTests

---
 .../Memory/ArrayPoolMemoryManagerTests.cs     | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs

diff --git a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
new file mode 100644
index 000000000..2a6a23116
--- /dev/null
+++ b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
@@ -0,0 +1,90 @@
+// ReSharper disable InconsistentNaming
+namespace SixLabors.ImageSharp.Tests.Memory
+{
+    using System.Linq;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    using SixLabors.ImageSharp.Memory;
+
+    using Xunit;
+
+    public class ArrayPoolMemoryManagerTests
+    {
+        private const int MaxPooledBufferSizeInBytes = 2048;
+        
+        private MemoryManager MemoryManager { get; } = new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes);
+        
+        /// <summary>
+        /// Rent 'n' buffers -> return all -> re-rent, verify if there is at least one in common.
+        /// </summary>
+        private bool CheckIsPooled<T>(int size)
+            where T : struct
+        {
+            IBuffer<T> buf1 = this.MemoryManager.Allocate<T>(size);
+            IBuffer<T> buf2 = this.MemoryManager.Allocate<T>(size);
+            IBuffer<T> buf3 = this.MemoryManager.Allocate<T>(size);
+
+            ref T buf1FirstPrev = ref buf1.DangerousGetPinnableReference();
+            ref T buf2FirstPrev = ref buf2.DangerousGetPinnableReference();
+            ref T buf3FirstPrev = ref buf3.DangerousGetPinnableReference();
+
+            buf1.Dispose();
+            buf2.Dispose();
+            buf3.Dispose();
+
+            buf1 = this.MemoryManager.Allocate<T>(size);
+            buf2 = this.MemoryManager.Allocate<T>(size);
+            buf3 = this.MemoryManager.Allocate<T>(size);
+
+            bool same1 = Unsafe.AreSame(ref buf1FirstPrev, ref buf1.DangerousGetPinnableReference());
+            bool same2 = Unsafe.AreSame(ref buf2FirstPrev, ref buf2.DangerousGetPinnableReference());
+            bool same3 = Unsafe.AreSame(ref buf3FirstPrev, ref buf3.DangerousGetPinnableReference());
+
+            buf1.Dispose();
+            buf2.Dispose();
+            buf3.Dispose();
+
+            return same1 || same2 || same3;
+        }
+
+        [StructLayout(LayoutKind.Explicit, Size = MaxPooledBufferSizeInBytes / 4)]
+        struct LargeStruct
+        {
+        }
+
+        [Theory]
+        [InlineData(32)]
+        [InlineData(512)]
+        [InlineData(MaxPooledBufferSizeInBytes - 1)]
+        public void SmallBuffersArePooled_OfByte(int size)
+        {
+            Assert.True(this.CheckIsPooled<byte>(size));
+        }
+
+
+        [Theory]
+        [InlineData(128 * 1024 * 1024)]
+        [InlineData(MaxPooledBufferSizeInBytes + 1)]
+        public void LargeBuffersAreNotPooled_OfByte(int size)
+        {
+            Assert.False(this.CheckIsPooled<byte>(size));
+        }
+
+        [Fact]
+        public unsafe void SmallBuffersArePooled_OfBigValueType()
+        {
+            int count = MaxPooledBufferSizeInBytes / sizeof(LargeStruct) - 1;
+
+            Assert.True(this.CheckIsPooled<LargeStruct>(count));
+        }
+
+        [Fact]
+        public unsafe void LaregeBuffersAreNotPooled_OfBigValueType()
+        {
+            int count = MaxPooledBufferSizeInBytes / sizeof(LargeStruct) + 1;
+
+            Assert.False(this.CheckIsPooled<LargeStruct>(count));
+        }
+    }
+}
\ No newline at end of file

From f25b112466788bfba437b0327338481f473423a4 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 20 Feb 2018 19:18:33 +0100
Subject: [PATCH 38/70] Covering ArrayPoolMemoryManager and it's buffer. Took
 hours, but worth it!

---
 src/ImageSharp/Memory/IBuffer{T}.cs           |   3 +
 src/ImageSharp/Memory/IManagedByteBuffer.cs   |   3 +
 src/ImageSharp/Memory/MemoryManager.cs        |   7 +-
 .../Memory/ArrayPoolMemoryManagerTests.cs     |  74 +++--
 .../Memory/BufferTestSuite.cs                 | 285 ++++++++++++++++++
 .../Memory/SimpleManagedMemoryManagerTests.cs |  15 +
 6 files changed, 351 insertions(+), 36 deletions(-)
 create mode 100644 tests/ImageSharp.Tests/Memory/BufferTestSuite.cs
 create mode 100644 tests/ImageSharp.Tests/Memory/SimpleManagedMemoryManagerTests.cs

diff --git a/src/ImageSharp/Memory/IBuffer{T}.cs b/src/ImageSharp/Memory/IBuffer{T}.cs
index a0f80063f..db6bf5b38 100644
--- a/src/ImageSharp/Memory/IBuffer{T}.cs
+++ b/src/ImageSharp/Memory/IBuffer{T}.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
 using System;
 
 namespace SixLabors.ImageSharp.Memory
diff --git a/src/ImageSharp/Memory/IManagedByteBuffer.cs b/src/ImageSharp/Memory/IManagedByteBuffer.cs
index 541957f42..d75fb9b6c 100644
--- a/src/ImageSharp/Memory/IManagedByteBuffer.cs
+++ b/src/ImageSharp/Memory/IManagedByteBuffer.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
 namespace SixLabors.ImageSharp.Memory
 {
     /// <summary>
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index 7445c66b7..7318a313e 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
 
 namespace SixLabors.ImageSharp.Memory
 {
diff --git a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
index 2a6a23116..fcd4c1b3b 100644
--- a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
+++ b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Tests.Memory
 {
@@ -16,39 +19,31 @@ namespace SixLabors.ImageSharp.Tests.Memory
         private MemoryManager MemoryManager { get; } = new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes);
         
         /// <summary>
-        /// Rent 'n' buffers -> return all -> re-rent, verify if there is at least one in common.
+        /// Rent a buffer -> return it -> re-rent -> verify if it's span points to the previous location
         /// </summary>
-        private bool CheckIsPooled<T>(int size)
+        private bool CheckIsRentingPooledBuffer<T>(int length)
             where T : struct
         {
-            IBuffer<T> buf1 = this.MemoryManager.Allocate<T>(size);
-            IBuffer<T> buf2 = this.MemoryManager.Allocate<T>(size);
-            IBuffer<T> buf3 = this.MemoryManager.Allocate<T>(size);
-
-            ref T buf1FirstPrev = ref buf1.DangerousGetPinnableReference();
-            ref T buf2FirstPrev = ref buf2.DangerousGetPinnableReference();
-            ref T buf3FirstPrev = ref buf3.DangerousGetPinnableReference();
-
-            buf1.Dispose();
-            buf2.Dispose();
-            buf3.Dispose();
-
-            buf1 = this.MemoryManager.Allocate<T>(size);
-            buf2 = this.MemoryManager.Allocate<T>(size);
-            buf3 = this.MemoryManager.Allocate<T>(size);
-
-            bool same1 = Unsafe.AreSame(ref buf1FirstPrev, ref buf1.DangerousGetPinnableReference());
-            bool same2 = Unsafe.AreSame(ref buf2FirstPrev, ref buf2.DangerousGetPinnableReference());
-            bool same3 = Unsafe.AreSame(ref buf3FirstPrev, ref buf3.DangerousGetPinnableReference());
-
-            buf1.Dispose();
-            buf2.Dispose();
-            buf3.Dispose();
+            IBuffer<T> buffer = this.MemoryManager.Allocate<T>(length);
+            ref T ptrToPrevPosition0 = ref buffer.DangerousGetPinnableReference();
+            buffer.Dispose();
+            
+            buffer = this.MemoryManager.Allocate<T>(length);
+            bool sameBuffers = Unsafe.AreSame(ref ptrToPrevPosition0, ref buffer.DangerousGetPinnableReference());
+            buffer.Dispose();
+
+            return sameBuffers;
+        }
 
-            return same1 || same2 || same3;
+        public class BufferTests : BufferTestSuite
+        {
+            public BufferTests()
+                : base(new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes))
+            {
+            }
         }
 
-        [StructLayout(LayoutKind.Explicit, Size = MaxPooledBufferSizeInBytes / 4)]
+        [StructLayout(LayoutKind.Explicit, Size = MaxPooledBufferSizeInBytes / 5)]
         struct LargeStruct
         {
         }
@@ -59,7 +54,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(MaxPooledBufferSizeInBytes - 1)]
         public void SmallBuffersArePooled_OfByte(int size)
         {
-            Assert.True(this.CheckIsPooled<byte>(size));
+            Assert.True(this.CheckIsRentingPooledBuffer<byte>(size));
         }
 
 
@@ -68,7 +63,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(MaxPooledBufferSizeInBytes + 1)]
         public void LargeBuffersAreNotPooled_OfByte(int size)
         {
-            Assert.False(this.CheckIsPooled<byte>(size));
+            Assert.False(this.CheckIsRentingPooledBuffer<byte>(size));
         }
 
         [Fact]
@@ -76,7 +71,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         {
             int count = MaxPooledBufferSizeInBytes / sizeof(LargeStruct) - 1;
 
-            Assert.True(this.CheckIsPooled<LargeStruct>(count));
+            Assert.True(this.CheckIsRentingPooledBuffer<LargeStruct>(count));
         }
 
         [Fact]
@@ -84,7 +79,24 @@ namespace SixLabors.ImageSharp.Tests.Memory
         {
             int count = MaxPooledBufferSizeInBytes / sizeof(LargeStruct) + 1;
 
-            Assert.False(this.CheckIsPooled<LargeStruct>(count));
+            Assert.False(this.CheckIsRentingPooledBuffer<LargeStruct>(count));
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void CleaningRequests_AreControlledByAllocationParameter_Clean(bool clean)
+        {
+            using (IBuffer<int> firstAlloc = this.MemoryManager.Allocate<int>(42))
+            {
+                firstAlloc.Span.Fill(666);
+            }
+
+            using (IBuffer<int> secondAlloc = this.MemoryManager.Allocate<int>(42, clean))
+            {
+                int expected = clean ? 0 : 666;
+                Assert.Equal(expected, secondAlloc.Span[0]);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs b/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs
new file mode 100644
index 000000000..50477cb5c
--- /dev/null
+++ b/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs
@@ -0,0 +1,285 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Runtime.CompilerServices;
+using SixLabors.ImageSharp.Memory;
+using Xunit;
+// ReSharper disable InconsistentNaming
+
+namespace SixLabors.ImageSharp.Tests.Memory
+{
+    
+
+    /// <summary>
+    /// Inherit this class to test an <see cref="IBuffer{T}"/> implementation (provided by <see cref="MemoryManager"/>).
+    /// </summary>
+    public abstract class BufferTestSuite
+    {
+        protected BufferTestSuite(MemoryManager memoryManager)
+        {
+            this.MemoryManager = memoryManager;
+        }
+
+        protected MemoryManager MemoryManager { get; }
+
+        public struct CustomStruct : IEquatable<CustomStruct>
+        {
+            public long A;
+
+            public byte B;
+
+            public float C;
+
+            public CustomStruct(long a, byte b, float c)
+            {
+                this.A = a;
+                this.B = b;
+                this.C = c;
+            }
+
+            public bool Equals(CustomStruct other)
+            {
+                return this.A == other.A && this.B == other.B && this.C.Equals(other.C);
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (ReferenceEquals(null, obj)) return false;
+                return obj is CustomStruct && this.Equals((CustomStruct)obj);
+            }
+
+            public override int GetHashCode()
+            {
+                unchecked
+                {
+                    int hashCode = this.A.GetHashCode();
+                    hashCode = (hashCode * 397) ^ this.B.GetHashCode();
+                    hashCode = (hashCode * 397) ^ this.C.GetHashCode();
+                    return hashCode;
+                }
+            }
+        }
+
+        public static readonly TheoryData<int> LenthValues = new TheoryData<int> { 0, 1, 7, 1023, 1024 };
+
+        [Theory]
+        [MemberData(nameof(LenthValues))]
+        public void HasCorrectLength_byte(int desiredLength)
+        {
+            this.TestHasCorrectLength<byte>(desiredLength);
+        }
+
+        [Theory]
+        [MemberData(nameof(LenthValues))]
+        public void HasCorrectLength_float(int desiredLength)
+        {
+            this.TestHasCorrectLength<float>(desiredLength);
+        }
+
+        [Theory]
+        [MemberData(nameof(LenthValues))]
+        public void HasCorrectLength_CustomStruct(int desiredLength)
+        {
+            this.TestHasCorrectLength<CustomStruct>(desiredLength);
+        }
+
+        private void TestHasCorrectLength<T>(int desiredLength)
+            where T : struct
+        {
+            using (IBuffer<T> buffer = this.MemoryManager.Allocate<T>(desiredLength))
+            {
+                Assert.Equal(desiredLength, buffer.Span.Length);
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(LenthValues))]
+        public void CanAllocateCleanBuffer_byte(int desiredLength)
+        {
+            this.TestCanAllocateCleanBuffer<byte>(desiredLength, false);
+            this.TestCanAllocateCleanBuffer<byte>(desiredLength, true);
+        }
+
+        [Theory]
+        [MemberData(nameof(LenthValues))]
+        public void CanAllocateCleanBuffer_double(int desiredLength)
+        {
+            this.TestCanAllocateCleanBuffer<double>(desiredLength);
+        }
+
+        [Theory]
+        [MemberData(nameof(LenthValues))]
+        public void CanAllocateCleanBuffer_CustomStruct(int desiredLength)
+        {
+            this.TestCanAllocateCleanBuffer<CustomStruct>(desiredLength);
+        }
+
+        private IBuffer<T> Allocate<T>(int desiredLength, bool clean, bool managedByteBuffer)
+            where T : struct
+        {
+            if (managedByteBuffer)
+            {
+                if (!(this.MemoryManager.AllocateManagedByteBuffer(desiredLength, clean) is IBuffer<T> buffer))
+                {
+                    throw new InvalidOperationException("typeof(T) != typeof(byte)");
+                }
+
+                return buffer;
+            }
+
+            return this.MemoryManager.Allocate<T>(desiredLength, clean);
+        }
+
+        private void TestCanAllocateCleanBuffer<T>(int desiredLength, bool testManagedByteBuffer = false)
+            where T : struct, IEquatable<T>
+        {
+            ReadOnlySpan<T> expected = new T[desiredLength];
+
+            for (int i = 0; i < 10; i++)
+            {
+                using (IBuffer<T> buffer = this.Allocate<T>(desiredLength, true, testManagedByteBuffer))
+                {
+                    Assert.True(buffer.Span.SequenceEqual(expected));
+                }
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(LenthValues))]
+        public void SpanPropertyIsAlwaysTheSame_int(int desiredLength)
+        {
+            this.TestSpanPropertyIsAlwaysTheSame<int>(desiredLength);
+        }
+
+        [Theory]
+        [MemberData(nameof(LenthValues))]
+        public void SpanPropertyIsAlwaysTheSame_byte(int desiredLength)
+        {
+            this.TestSpanPropertyIsAlwaysTheSame<byte>(desiredLength, false);
+            this.TestSpanPropertyIsAlwaysTheSame<byte>(desiredLength, true);
+        }
+
+        private void TestSpanPropertyIsAlwaysTheSame<T>(int desiredLength, bool testManagedByteBuffer = false)
+            where T : struct
+        {
+            using (IBuffer<T> buffer = this.Allocate<T>(desiredLength, false, testManagedByteBuffer))
+            {
+                ref T a = ref buffer.Span.DangerousGetPinnableReference();
+                ref T b = ref buffer.Span.DangerousGetPinnableReference();
+                ref T c = ref buffer.Span.DangerousGetPinnableReference();
+
+                Assert.True(Unsafe.AreSame(ref a, ref b));
+                Assert.True(Unsafe.AreSame(ref b, ref c));
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(LenthValues))]
+        public void WriteAndReadElements_float(int desiredLength)
+        {
+            this.TestWriteAndReadElements<float>(desiredLength, x => x * 1.2f);
+        }
+
+        [Theory]
+        [MemberData(nameof(LenthValues))]
+        public void WriteAndReadElements_byte(int desiredLength)
+        {
+            this.TestWriteAndReadElements<byte>(desiredLength, x => (byte)(x+1), false);
+            this.TestWriteAndReadElements<byte>(desiredLength, x => (byte)(x + 1), true);
+        }
+
+        private void TestWriteAndReadElements<T>(int desiredLength, Func<int, T> getExpectedValue, bool testManagedByteBuffer = false)
+            where T : struct
+        {
+            using (IBuffer<T> buffer = this.Allocate<T>(desiredLength, false, testManagedByteBuffer))
+            {
+                T[] expectedVals = new T[buffer.Length()];
+
+                for (int i = 0; i < buffer.Length(); i++)
+                {
+                    Span<T> span = buffer.Span;
+                    expectedVals[i] = getExpectedValue(i);
+                    span[i] = expectedVals[i];
+                }
+
+                for (int i = 0; i < buffer.Length(); i++)
+                {
+                    Span<T> span = buffer.Span;
+                    Assert.Equal(expectedVals[i], span[i]);
+                }
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(LenthValues))]
+        public void IndexingSpan_WhenOutOfRange_Throws_byte(int desiredLength)
+        {
+            this.TestIndexOutOfRangeShouldThrow<byte>(desiredLength, false);
+            this.TestIndexOutOfRangeShouldThrow<byte>(desiredLength, true);
+        }
+
+        [Theory]
+        [MemberData(nameof(LenthValues))]
+        public void IndexingSpan_WhenOutOfRange_Throws_long(int desiredLength)
+        {
+            this.TestIndexOutOfRangeShouldThrow<long>(desiredLength);
+        }
+
+        [Theory]
+        [MemberData(nameof(LenthValues))]
+        public void IndexingSpan_WhenOutOfRange_Throws_CustomStruct(int desiredLength)
+        {
+            this.TestIndexOutOfRangeShouldThrow<CustomStruct>(desiredLength);
+        }
+
+        private T TestIndexOutOfRangeShouldThrow<T>(int desiredLength, bool testManagedByteBuffer = false)
+            where T : struct, IEquatable<T>
+        {
+            var dummy = default(T);
+
+            using (IBuffer<T> buffer = this.Allocate<T>(desiredLength, false, testManagedByteBuffer))
+            {
+                Assert.ThrowsAny<Exception>(
+                    () =>
+                        {
+                            Span<T> span = buffer.Span;
+                            dummy = span[desiredLength];
+                        });
+
+                Assert.ThrowsAny<Exception>(
+                    () =>
+                        {
+                            Span<T> span = buffer.Span;
+                            dummy = span[desiredLength + 1];
+                        });
+
+                Assert.ThrowsAny<Exception>(
+                    () =>
+                        {
+                            Span<T> span = buffer.Span;
+                            dummy = span[desiredLength + 42];
+                        });
+            }
+
+            return dummy;
+        }
+
+        [Theory]
+        [InlineData(1)]
+        [InlineData(7)]
+        [InlineData(1024)]
+        [InlineData(6666)]
+        public void ManagedByteBuffer_ArrayIsCorrect(int desiredLength)
+        {
+            using (IManagedByteBuffer buffer = this.MemoryManager.AllocateManagedByteBuffer(desiredLength))
+            {
+                ref byte array0 = ref buffer.Array[0];
+                ref byte span0 = ref buffer.DangerousGetPinnableReference();
+
+                Assert.True(Unsafe.AreSame(ref span0, ref array0));
+                Assert.True(buffer.Array.Length >= buffer.Span.Length);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Memory/SimpleManagedMemoryManagerTests.cs b/tests/ImageSharp.Tests/Memory/SimpleManagedMemoryManagerTests.cs
new file mode 100644
index 000000000..eb7414582
--- /dev/null
+++ b/tests/ImageSharp.Tests/Memory/SimpleManagedMemoryManagerTests.cs
@@ -0,0 +1,15 @@
+namespace SixLabors.ImageSharp.Tests.Memory
+{
+    using SixLabors.ImageSharp.Memory;
+
+    public class SimpleManagedMemoryManagerTests
+    {
+        public class BufferTests : BufferTestSuite
+        {
+            public BufferTests()
+                : base(new SimpleManagedMemoryManager())
+            {
+            }
+        }
+    }
+}
\ No newline at end of file

From 73a20cb6de60929693e016d229554202ee87826a Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 20 Feb 2018 21:37:18 +0100
Subject: [PATCH 39/70] ArrayPoolMemoryManager uses a different ArrayPool for
 large buffers + implemented ReleaseRetainedResources()

---
 .../ArrayPoolMemoryManager.Buffer{T}.cs       | 20 ++--
 .../Memory/ArrayPoolMemoryManager.cs          | 91 ++++++++++++++++---
 src/ImageSharp/Memory/BufferExtensions.cs     |  3 +
 src/ImageSharp/Memory/MemoryManager.cs        |  8 ++
 .../Memory/ArrayPoolMemoryManagerTests.cs     | 69 +++++++++++++-
 5 files changed, 169 insertions(+), 22 deletions(-)

diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
index 5b0352010..78e275e8c 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
@@ -1,4 +1,8 @@
-using System;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Buffers;
 
 namespace SixLabors.ImageSharp.Memory
 {
@@ -10,15 +14,15 @@ namespace SixLabors.ImageSharp.Memory
         private class Buffer<T> : IBuffer<T>
             where T : struct
         {
-            private readonly ArrayPoolMemoryManager memoryManager;
-
             private readonly int length;
 
-            public Buffer(byte[] data, int length, ArrayPoolMemoryManager memoryManager)
+            private readonly ArrayPool<byte> sourcePool;
+
+            public Buffer(byte[] data, int length, ArrayPool<byte> sourcePool)
             {
-                this.memoryManager = memoryManager;
                 this.Data = data;
                 this.length = length;
+                this.sourcePool = sourcePool;
             }
 
             protected byte[] Data { get; private set; }
@@ -32,15 +36,15 @@ namespace SixLabors.ImageSharp.Memory
                     return;
                 }
 
-                this.memoryManager.pool.Return(this.Data);
+                this.sourcePool.Return(this.Data);
                 this.Data = null;
             }
         }
 
         private class ManagedByteBuffer : Buffer<byte>, IManagedByteBuffer
         {
-            public ManagedByteBuffer(byte[] data, int length, ArrayPoolMemoryManager memoryManager)
-                : base(data, length, memoryManager)
+            public ManagedByteBuffer(byte[] data, int length, ArrayPool<byte> sourcePool)
+                : base(data, length, sourcePool)
             {
             }
 
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index 41ef84784..4f80b15ec 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -1,27 +1,46 @@
-using System.Buffers;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Buffers;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Memory
 {
+    using Guard = SixLabors.Guard;
+
     /// <summary>
     /// Implements <see cref="MemoryManager"/> by allocating memory from <see cref="ArrayPool{T}"/>.
     /// </summary>
     public partial class ArrayPoolMemoryManager : MemoryManager
     {
         /// <summary>
-        /// Defines the default maximum size of pooled arrays.
-        /// Currently set to a value equivalent to 16 MegaPixels of an <see cref="Rgba32"/> image.
+        /// The default value for: maximum size of pooled arrays in bytes.
+        /// Currently set to 32MB, which is equivalent to 8 megapixels of raw <see cref="Rgba32"/> data.
+        /// </summary>
+        internal const int DefaultMaxPooledBufferSizeInBytes = 32 * 1024 * 1024;
+
+        /// <summary>
+        /// The value for: The threshold to pool arrays in <see cref="largeArrayPool"/> which has less buckets for memory safety.
         /// </summary>
-        public const int DefaultMaxSizeInBytes = 4096 * 4096 * 4;
+        private const int DefaultLargeBufferThresholdInBytes = 8 * 1024 * 1024;
 
-        private readonly ArrayPool<byte> pool;
+        /// <summary>
+        /// The <see cref="ArrayPool{T}"/> for huge buffers, which is not kept clean.
+        /// </summary>
+        private ArrayPool<byte> largeArrayPool;
+
+        /// <summary>
+        /// The <see cref="ArrayPool{T}"/> for small-to-medium buffers which is not kept clean.
+        /// </summary>
+        private ArrayPool<byte> normalArrayPool;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayPoolMemoryManager"/> class.
         /// </summary>
         public ArrayPoolMemoryManager()
-            : this(DefaultMaxSizeInBytes)
+            : this(DefaultMaxPooledBufferSizeInBytes, DefaultLargeBufferThresholdInBytes)
         {
         }
 
@@ -30,10 +49,40 @@ namespace SixLabors.ImageSharp.Memory
         /// </summary>
         /// <param name="maxPoolSizeInBytes">The maximum size of pooled arrays. Arrays over the thershold are gonna be always allocated.</param>
         public ArrayPoolMemoryManager(int maxPoolSizeInBytes)
+            : this(maxPoolSizeInBytes, GetLargeBufferThresholdInBytes(maxPoolSizeInBytes))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArrayPoolMemoryManager"/> class.
+        /// </summary>
+        /// <param name="maxPoolSizeInBytes">The maximum size of pooled arrays. Arrays over the thershold are gonna be always allocated.</param>
+        /// <param name="largeBufferThresholdInBytes">The threshold to pool arrays in <see cref="largeArrayPool"/> which has less buckets for memory safety.</param>
+        public ArrayPoolMemoryManager(int maxPoolSizeInBytes, int largeBufferThresholdInBytes)
         {
             Guard.MustBeGreaterThan(maxPoolSizeInBytes, 0, nameof(maxPoolSizeInBytes));
+            Guard.MustBeLessThanOrEqualTo(largeBufferThresholdInBytes, maxPoolSizeInBytes, nameof(largeBufferThresholdInBytes));
+
+            this.MaxPoolSizeInBytes = maxPoolSizeInBytes;
+            this.LargeBufferThresholdInBytes = largeBufferThresholdInBytes;
 
-            this.pool = ArrayPool<byte>.Create(maxPoolSizeInBytes, 50);
+            this.InitArrayPools();
+        }
+
+        /// <summary>
+        /// Gets the maximum size of pooled arrays in bytes.
+        /// </summary>
+        public int MaxPoolSizeInBytes { get; }
+
+        /// <summary>
+        /// Gets the threshold to pool arrays in <see cref="largeArrayPool"/> which has less buckets for memory safety.
+        /// </summary>
+        public int LargeBufferThresholdInBytes { get; }
+
+        /// <inheritdoc />
+        public override void ReleaseRetainedResources()
+        {
+            this.InitArrayPools();
         }
 
         /// <inheritdoc />
@@ -42,8 +91,10 @@ namespace SixLabors.ImageSharp.Memory
             int itemSizeBytes = Unsafe.SizeOf<T>();
             int bufferSizeInBytes = length * itemSizeBytes;
 
-            byte[] byteBuffer = this.pool.Rent(bufferSizeInBytes);
-            var buffer = new Buffer<T>(byteBuffer, length, this);
+            ArrayPool<byte> pool = this.GetArrayPool(bufferSizeInBytes);
+            byte[] byteArray = pool.Rent(bufferSizeInBytes);
+
+            var buffer = new Buffer<T>(byteArray, length, pool);
             if (clear)
             {
                 buffer.Clear();
@@ -54,8 +105,10 @@ namespace SixLabors.ImageSharp.Memory
 
         internal override IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear)
         {
-            byte[] array = this.pool.Rent(length);
-            var buffer = new ManagedByteBuffer(array, length, this);
+            ArrayPool<byte> pool = this.GetArrayPool(length);
+            byte[] byteArray = pool.Rent(length);
+
+            var buffer = new ManagedByteBuffer(byteArray, length, pool);
             if (clear)
             {
                 buffer.Clear();
@@ -63,5 +116,21 @@ namespace SixLabors.ImageSharp.Memory
 
             return buffer;
         }
+
+        private static int GetLargeBufferThresholdInBytes(int maxPoolSizeInBytes)
+        {
+            return maxPoolSizeInBytes / 4;
+        }
+
+        private ArrayPool<byte> GetArrayPool(int bufferSizeInBytes)
+        {
+            return bufferSizeInBytes <= this.LargeBufferThresholdInBytes ? this.normalArrayPool : this.largeArrayPool;
+        }
+
+        private void InitArrayPools()
+        {
+            this.largeArrayPool = ArrayPool<byte>.Create(this.MaxPoolSizeInBytes, 8);
+            this.normalArrayPool = ArrayPool<byte>.Create(this.LargeBufferThresholdInBytes, 24);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/BufferExtensions.cs b/src/ImageSharp/Memory/BufferExtensions.cs
index 8975d3b45..b863dfc9a 100644
--- a/src/ImageSharp/Memory/BufferExtensions.cs
+++ b/src/ImageSharp/Memory/BufferExtensions.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
 using System;
 using System.Runtime.CompilerServices;
 
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index 7318a313e..8e2df8cec 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -30,5 +30,13 @@ namespace SixLabors.ImageSharp.Memory
         {
             return new BasicArrayBuffer<T>(new T[length]);
         }
+
+        /// <summary>
+        /// Releases all retained resources not being in use.
+        /// Eg: by resetting array pools and letting GC to free the arrays.
+        /// </summary>
+        public virtual void ReleaseRetainedResources()
+        {
+        }
     }
 }
diff --git a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
index fcd4c1b3b..0bd243fda 100644
--- a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
+++ b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
@@ -4,6 +4,7 @@
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Tests.Memory
 {
+    using System;
     using System.Linq;
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
@@ -15,8 +16,10 @@ namespace SixLabors.ImageSharp.Tests.Memory
     public class ArrayPoolMemoryManagerTests
     {
         private const int MaxPooledBufferSizeInBytes = 2048;
-        
-        private MemoryManager MemoryManager { get; } = new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes);
+
+        private const int LargeBufferThresholdInBytes = MaxPooledBufferSizeInBytes / 2;
+
+        private MemoryManager MemoryManager { get; } = new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes, LargeBufferThresholdInBytes);
         
         /// <summary>
         /// Rent a buffer -> return it -> re-rent -> verify if it's span points to the previous location
@@ -38,11 +41,36 @@ namespace SixLabors.ImageSharp.Tests.Memory
         public class BufferTests : BufferTestSuite
         {
             public BufferTests()
-                : base(new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes))
+                : base(new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes, LargeBufferThresholdInBytes))
             {
             }
         }
 
+        public class Constructor
+        {
+            [Fact]
+            public void WhenBothParametersPassedByUser()
+            {
+                var mgr = new ArrayPoolMemoryManager(1111, 666);
+                Assert.Equal(1111, mgr.MaxPoolSizeInBytes);
+                Assert.Equal(666, mgr.LargeBufferThresholdInBytes);
+            }
+
+            [Fact]
+            public void WhenPassedOnly_MaxPooledBufferSizeInBytes_SmallerThresholdIsAutoCalculated()
+            {
+                var mgr = new ArrayPoolMemoryManager(5000);
+                Assert.Equal(5000, mgr.MaxPoolSizeInBytes);
+                Assert.True(mgr.LargeBufferThresholdInBytes < mgr.MaxPoolSizeInBytes);
+            }
+
+            [Fact]
+            public void When_LargeBufferThresholdInBytes_IsGreaterThan_MaxPooledBufferSizeInBytes_Throws()
+            {
+                Assert.ThrowsAny<Exception>(() => { new ArrayPoolMemoryManager(100, 200); });
+            }
+        }
+
         [StructLayout(LayoutKind.Explicit, Size = MaxPooledBufferSizeInBytes / 5)]
         struct LargeStruct
         {
@@ -98,5 +126,40 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 Assert.Equal(expected, secondAlloc.Span[0]);
             }
         }
+
+        [Fact]
+        public void ReleaseRetainedResources_ReplacesInnerArrayPool()
+        {
+            IBuffer<int> buffer = this.MemoryManager.Allocate<int>(32);
+            ref int ptrToPrev0 = ref buffer.Span.DangerousGetPinnableReference();
+            buffer.Dispose();
+
+            this.MemoryManager.ReleaseRetainedResources();
+            buffer = this.MemoryManager.Allocate<int>(32);
+
+            Assert.False(Unsafe.AreSame(ref ptrToPrev0, ref buffer.DangerousGetPinnableReference()));
+        }
+
+        [Fact]
+        public void ReleaseRetainedResources_DisposingPreviouslyAllocatedBuffer_IsAllowed()
+        {
+            IBuffer<int> buffer = this.MemoryManager.Allocate<int>(32);
+            this.MemoryManager.ReleaseRetainedResources();
+            buffer.Dispose();
+        }
+
+        [Fact]
+        public void AllocationOverLargeArrayThreshold_UsesDifferentPool()
+        {
+            int arrayLengthThreshold = LargeBufferThresholdInBytes / sizeof(int);
+
+            IBuffer<int> small = this.MemoryManager.Allocate<int>(arrayLengthThreshold - 1);
+            ref int ptr2Small = ref small.DangerousGetPinnableReference();
+            small.Dispose();
+
+            IBuffer<int> large = this.MemoryManager.Allocate<int>(arrayLengthThreshold + 1);
+            
+            Assert.False(Unsafe.AreSame(ref ptr2Small, ref large.DangerousGetPinnableReference()));
+        }
     }
 }
\ No newline at end of file

From 16d5f36e724533b8707a513841739e41b25723f0 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 20 Feb 2018 21:58:26 +0100
Subject: [PATCH 40/70] allowing bucket sizes to be passed to
 ArrayPoolMemoryManager

---
 .../Memory/ArrayPoolMemoryManager.cs          | 46 ++++++++++++-------
 .../Memory/ArrayPoolMemoryManagerTests.cs     | 16 +++----
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index 4f80b15ec..7c2240a57 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -1,15 +1,11 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
 using System.Buffers;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Memory
 {
-    using Guard = SixLabors.Guard;
-
     /// <summary>
     /// Implements <see cref="MemoryManager"/> by allocating memory from <see cref="ArrayPool{T}"/>.
     /// </summary>
@@ -27,14 +23,18 @@ namespace SixLabors.ImageSharp.Memory
         private const int DefaultLargeBufferThresholdInBytes = 8 * 1024 * 1024;
 
         /// <summary>
-        /// The <see cref="ArrayPool{T}"/> for huge buffers, which is not kept clean.
+        /// The <see cref="ArrayPool{T}"/> for small-to-medium buffers which is not kept clean.
         /// </summary>
-        private ArrayPool<byte> largeArrayPool;
+        private ArrayPool<byte> normalArrayPool;
 
         /// <summary>
-        /// The <see cref="ArrayPool{T}"/> for small-to-medium buffers which is not kept clean.
+        /// The <see cref="ArrayPool{T}"/> for huge buffers, which is not kept clean.
         /// </summary>
-        private ArrayPool<byte> normalArrayPool;
+        private ArrayPool<byte> largeArrayPool;
+
+        private readonly int maxArraysPerBucketNormalPool;
+
+        private readonly int maxArraysPerBucketLargePool;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayPoolMemoryManager"/> class.
@@ -57,14 +57,28 @@ namespace SixLabors.ImageSharp.Memory
         /// Initializes a new instance of the <see cref="ArrayPoolMemoryManager"/> class.
         /// </summary>
         /// <param name="maxPoolSizeInBytes">The maximum size of pooled arrays. Arrays over the thershold are gonna be always allocated.</param>
-        /// <param name="largeBufferThresholdInBytes">The threshold to pool arrays in <see cref="largeArrayPool"/> which has less buckets for memory safety.</param>
-        public ArrayPoolMemoryManager(int maxPoolSizeInBytes, int largeBufferThresholdInBytes)
+        /// <param name="poolSelectorThresholdInBytes">Arrays over this threshold will be pooled in <see cref="largeArrayPool"/> which has less buckets for memory safety.</param>
+        public ArrayPoolMemoryManager(int maxPoolSizeInBytes, int poolSelectorThresholdInBytes)
+            : this(maxPoolSizeInBytes, poolSelectorThresholdInBytes, 8, 24)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArrayPoolMemoryManager"/> class.
+        /// </summary>
+        /// <param name="maxPoolSizeInBytes">The maximum size of pooled arrays. Arrays over the thershold are gonna be always allocated.</param>
+        /// <param name="poolSelectorThresholdInBytes">The threshold to pool arrays in <see cref="largeArrayPool"/> which has less buckets for memory safety.</param>
+        /// <param name="maxArraysPerBucketLargePool">Max arrays per bucket for the large array pool</param>
+        /// <param name="maxArraysPerBucketNormalPool">Max arrays per bucket for the normal array pool</param>
+        public ArrayPoolMemoryManager(int maxPoolSizeInBytes, int poolSelectorThresholdInBytes, int maxArraysPerBucketLargePool, int maxArraysPerBucketNormalPool)
         {
             Guard.MustBeGreaterThan(maxPoolSizeInBytes, 0, nameof(maxPoolSizeInBytes));
-            Guard.MustBeLessThanOrEqualTo(largeBufferThresholdInBytes, maxPoolSizeInBytes, nameof(largeBufferThresholdInBytes));
+            Guard.MustBeLessThanOrEqualTo(poolSelectorThresholdInBytes, maxPoolSizeInBytes, nameof(poolSelectorThresholdInBytes));
 
             this.MaxPoolSizeInBytes = maxPoolSizeInBytes;
-            this.LargeBufferThresholdInBytes = largeBufferThresholdInBytes;
+            this.PoolSelectorThresholdInBytes = poolSelectorThresholdInBytes;
+            this.maxArraysPerBucketLargePool = maxArraysPerBucketLargePool;
+            this.maxArraysPerBucketNormalPool = maxArraysPerBucketNormalPool;
 
             this.InitArrayPools();
         }
@@ -77,7 +91,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <summary>
         /// Gets the threshold to pool arrays in <see cref="largeArrayPool"/> which has less buckets for memory safety.
         /// </summary>
-        public int LargeBufferThresholdInBytes { get; }
+        public int PoolSelectorThresholdInBytes { get; }
 
         /// <inheritdoc />
         public override void ReleaseRetainedResources()
@@ -124,13 +138,13 @@ namespace SixLabors.ImageSharp.Memory
 
         private ArrayPool<byte> GetArrayPool(int bufferSizeInBytes)
         {
-            return bufferSizeInBytes <= this.LargeBufferThresholdInBytes ? this.normalArrayPool : this.largeArrayPool;
+            return bufferSizeInBytes <= this.PoolSelectorThresholdInBytes ? this.normalArrayPool : this.largeArrayPool;
         }
 
         private void InitArrayPools()
         {
-            this.largeArrayPool = ArrayPool<byte>.Create(this.MaxPoolSizeInBytes, 8);
-            this.normalArrayPool = ArrayPool<byte>.Create(this.LargeBufferThresholdInBytes, 24);
+            this.largeArrayPool = ArrayPool<byte>.Create(this.MaxPoolSizeInBytes, this.maxArraysPerBucketLargePool);
+            this.normalArrayPool = ArrayPool<byte>.Create(this.PoolSelectorThresholdInBytes, this.maxArraysPerBucketNormalPool);
         }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
index 0bd243fda..581e0b78d 100644
--- a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
+++ b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
@@ -17,9 +17,9 @@ namespace SixLabors.ImageSharp.Tests.Memory
     {
         private const int MaxPooledBufferSizeInBytes = 2048;
 
-        private const int LargeBufferThresholdInBytes = MaxPooledBufferSizeInBytes / 2;
+        private const int PoolSelectorThresholdInBytes = MaxPooledBufferSizeInBytes / 2;
 
-        private MemoryManager MemoryManager { get; } = new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes, LargeBufferThresholdInBytes);
+        private MemoryManager MemoryManager { get; } = new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes, PoolSelectorThresholdInBytes);
         
         /// <summary>
         /// Rent a buffer -> return it -> re-rent -> verify if it's span points to the previous location
@@ -41,7 +41,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         public class BufferTests : BufferTestSuite
         {
             public BufferTests()
-                : base(new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes, LargeBufferThresholdInBytes))
+                : base(new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes, PoolSelectorThresholdInBytes))
             {
             }
         }
@@ -53,19 +53,19 @@ namespace SixLabors.ImageSharp.Tests.Memory
             {
                 var mgr = new ArrayPoolMemoryManager(1111, 666);
                 Assert.Equal(1111, mgr.MaxPoolSizeInBytes);
-                Assert.Equal(666, mgr.LargeBufferThresholdInBytes);
+                Assert.Equal(666, mgr.PoolSelectorThresholdInBytes);
             }
 
             [Fact]
-            public void WhenPassedOnly_MaxPooledBufferSizeInBytes_SmallerThresholdIsAutoCalculated()
+            public void WhenPassedOnly_MaxPooledBufferSizeInBytes_SmallerThresholdValueIsAutoCalculated()
             {
                 var mgr = new ArrayPoolMemoryManager(5000);
                 Assert.Equal(5000, mgr.MaxPoolSizeInBytes);
-                Assert.True(mgr.LargeBufferThresholdInBytes < mgr.MaxPoolSizeInBytes);
+                Assert.True(mgr.PoolSelectorThresholdInBytes < mgr.MaxPoolSizeInBytes);
             }
 
             [Fact]
-            public void When_LargeBufferThresholdInBytes_IsGreaterThan_MaxPooledBufferSizeInBytes_Throws()
+            public void When_PoolSelectorThresholdInBytes_IsGreaterThan_MaxPooledBufferSizeInBytes_ExceptionIsThrown()
             {
                 Assert.ThrowsAny<Exception>(() => { new ArrayPoolMemoryManager(100, 200); });
             }
@@ -151,7 +151,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [Fact]
         public void AllocationOverLargeArrayThreshold_UsesDifferentPool()
         {
-            int arrayLengthThreshold = LargeBufferThresholdInBytes / sizeof(int);
+            int arrayLengthThreshold = PoolSelectorThresholdInBytes / sizeof(int);
 
             IBuffer<int> small = this.MemoryManager.Allocate<int>(arrayLengthThreshold - 1);
             ref int ptr2Small = ref small.DangerousGetPinnableReference();

From 67b1a25728182c74d5bf937f235852f609d02bc1 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Wed, 21 Feb 2018 00:32:09 +0100
Subject: [PATCH 41/70] ArrayPoolMemoryManager factory methods

---
 src/ImageSharp/Configuration.cs               |  2 +-
 ...yPoolMemoryManager.CommonFactoryMethods.cs | 46 +++++++++++++++++++
 .../Memory/ArrayPoolMemoryManager.cs          | 13 +-----
 .../Memory/ArrayPoolMemoryManagerTests.cs     | 28 ++++++++++-
 4 files changed, 75 insertions(+), 14 deletions(-)
 create mode 100644 src/ImageSharp/Memory/ArrayPoolMemoryManager.CommonFactoryMethods.cs

diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs
index bd6c11235..2fe3c26e2 100644
--- a/src/ImageSharp/Configuration.cs
+++ b/src/ImageSharp/Configuration.cs
@@ -86,7 +86,7 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// Gets or sets the <see cref="MemoryManager"/> that is currently in use.
         /// </summary>
-        public MemoryManager MemoryManager { get; set; } = new ArrayPoolMemoryManager();
+        public MemoryManager MemoryManager { get; set; } = ArrayPoolMemoryManager.CreateWithNormalPooling();
 
         /// <summary>
         /// Gets the maximum header size of all the formats.
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.CommonFactoryMethods.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.CommonFactoryMethods.cs
new file mode 100644
index 000000000..918c5d41a
--- /dev/null
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.CommonFactoryMethods.cs
@@ -0,0 +1,46 @@
+namespace SixLabors.ImageSharp.Memory
+{
+    /// <summary>
+    /// Contains common factory methods and configuration constants.
+    /// </summary>
+    public partial class ArrayPoolMemoryManager
+    {
+        /// <summary>
+        /// The default value for: maximum size of pooled arrays in bytes.
+        /// Currently set to 32MB, which is equivalent to 8 megapixels of raw <see cref="Rgba32"/> data.
+        /// </summary>
+        internal const int DefaultMaxPooledBufferSizeInBytes = 32 * 1024 * 1024;
+
+        /// <summary>
+        /// The value for: The threshold to pool arrays in <see cref="largeArrayPool"/> which has less buckets for memory safety.
+        /// </summary>
+        private const int DefaultBufferSelectorThresholdInBytes = 8 * 1024 * 1024;
+
+        /// <summary>
+        /// This is the default. Should be good for most use cases.
+        /// </summary>
+        /// <returns>The memory manager</returns>
+        public static ArrayPoolMemoryManager CreateWithNormalPooling()
+        {
+            return new ArrayPoolMemoryManager(DefaultMaxPooledBufferSizeInBytes, DefaultBufferSelectorThresholdInBytes, 8, 24);
+        }
+
+        /// <summary>
+        /// For environments with limited memory capabilities. Only small images are pooled, which can result in reduced througput.
+        /// </summary>
+        /// <returns>The memory manager</returns>
+        public static ArrayPoolMemoryManager CreateWithModeratePooling()
+        {
+            return new ArrayPoolMemoryManager(1024 * 1024, 1024 * 16, 16, 24);
+        }
+
+        /// <summary>
+        /// RAM is not an issue for me, gimme maximum througput!
+        /// </summary>
+        /// <returns>The memory manager</returns>
+        public static ArrayPoolMemoryManager CreateWithAggressivePooling()
+        {
+            return new ArrayPoolMemoryManager(128 * 1024 * 1024, 32 * 1024 * 1024, 16, 32);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index 7c2240a57..36bc3a870 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -11,17 +11,6 @@ namespace SixLabors.ImageSharp.Memory
     /// </summary>
     public partial class ArrayPoolMemoryManager : MemoryManager
     {
-        /// <summary>
-        /// The default value for: maximum size of pooled arrays in bytes.
-        /// Currently set to 32MB, which is equivalent to 8 megapixels of raw <see cref="Rgba32"/> data.
-        /// </summary>
-        internal const int DefaultMaxPooledBufferSizeInBytes = 32 * 1024 * 1024;
-
-        /// <summary>
-        /// The value for: The threshold to pool arrays in <see cref="largeArrayPool"/> which has less buckets for memory safety.
-        /// </summary>
-        private const int DefaultLargeBufferThresholdInBytes = 8 * 1024 * 1024;
-
         /// <summary>
         /// The <see cref="ArrayPool{T}"/> for small-to-medium buffers which is not kept clean.
         /// </summary>
@@ -40,7 +29,7 @@ namespace SixLabors.ImageSharp.Memory
         /// Initializes a new instance of the <see cref="ArrayPoolMemoryManager"/> class.
         /// </summary>
         public ArrayPoolMemoryManager()
-            : this(DefaultMaxPooledBufferSizeInBytes, DefaultLargeBufferThresholdInBytes)
+            : this(DefaultMaxPooledBufferSizeInBytes, DefaultBufferSelectorThresholdInBytes)
         {
         }
 
diff --git a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
index 581e0b78d..f99ee4dde 100644
--- a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
+++ b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
@@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
 
         private const int PoolSelectorThresholdInBytes = MaxPooledBufferSizeInBytes / 2;
 
-        private MemoryManager MemoryManager { get; } = new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes, PoolSelectorThresholdInBytes);
+        private MemoryManager MemoryManager { get; set; } = new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes, PoolSelectorThresholdInBytes);
         
         /// <summary>
         /// Rent a buffer -> return it -> re-rent -> verify if it's span points to the previous location
@@ -161,5 +161,31 @@ namespace SixLabors.ImageSharp.Tests.Memory
             
             Assert.False(Unsafe.AreSame(ref ptr2Small, ref large.DangerousGetPinnableReference()));
         }
+
+        [Fact]
+        public void CreateWithAggressivePooling()
+        {
+            this.MemoryManager = ArrayPoolMemoryManager.CreateWithAggressivePooling();
+
+            Assert.True(this.CheckIsRentingPooledBuffer<Rgba32>(4096 * 4096));
+        }
+
+        [Fact]
+        public void CreateWithNormalPooling()
+        {
+            this.MemoryManager = ArrayPoolMemoryManager.CreateWithNormalPooling();
+
+            Assert.False(this.CheckIsRentingPooledBuffer<Rgba32>(2 * 4096 * 4096));
+            Assert.True(this.CheckIsRentingPooledBuffer<Rgba32>(2048 * 2048));
+        }
+
+        [Fact]
+        public void CreateWithModeratePooling()
+        {
+            this.MemoryManager = ArrayPoolMemoryManager.CreateWithModeratePooling();
+
+            Assert.False(this.CheckIsRentingPooledBuffer<Rgba32>(2048 * 2048));
+            Assert.True(this.CheckIsRentingPooledBuffer<Rgba32>(1024 * 16));
+        }
     }
 }
\ No newline at end of file

From bcb9c0057a1d2b06bb707d4135261fed7268c490 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Wed, 21 Feb 2018 01:06:59 +0100
Subject: [PATCH 42/70] passing MemoryManager to pixel blenders

---
 .../Brushes/ImageBrush{TPixel}.cs             |   2 +-
 .../Brushes/PatternBrush{TPixel}.cs           |   8 +-
 .../Brushes/Processors/BrushApplicator.cs     |   8 +-
 .../Brushes/RecolorBrush{TPixel}.cs           |   8 +-
 .../Brushes/SolidBrush{TPixel}.cs             |   7 +-
 .../Processors/DrawImageProcessor.cs          |   7 +-
 src/ImageSharp/ApplyProcessors.cs             |   1 -
 .../DefaultInternalImageProcessorContext.cs   |   2 +-
 .../IImageProcessingContext{TPixel}.cs        |  13 +-
 .../DefaultPixelBlenders.Generated.cs         | 126 +++++++++---------
 .../DefaultPixelBlenders.Generated.tt         |   6 +-
 .../PixelFormats/PixelBlender{TPixel}.cs      |   4 +-
 .../Processing/ColorMatrix/Lomograph.cs       |   4 +-
 .../Processing/ColorMatrix/Polaroid.cs        |   4 +-
 .../Processing/Effects/BackgroundColor.cs     |   4 +-
 src/ImageSharp/Processing/Overlays/Glow.cs    |   4 +-
 .../Processing/Overlays/Vignette.cs           |   4 +-
 .../Effects/BackgroundColorProcessor.cs       |   2 +-
 .../Processors/Overlays/GlowProcessor.cs      |   2 +-
 .../Processors/Overlays/VignetteProcessor.cs  |   2 +-
 .../Processing/Transforms/Resize.cs           |   4 +-
 src/ImageSharp/Quantizers/Quantize.cs         |   2 +-
 .../FakeImageOperationsProvider.cs            |   2 +-
 .../PorterDuffFunctionsTests_TPixel.cs        |  22 +--
 24 files changed, 132 insertions(+), 116 deletions(-)

diff --git a/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
index 6b3ce36fe..320c94c96 100644
--- a/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
@@ -142,7 +142,7 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
                     }
 
                     Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
-                    this.Blender.Blend(destinationRow, destinationRow, overlaySpan, amountSpan);
+                    this.Blender.Blend(this.source.MemoryManager, destinationRow, destinationRow, overlaySpan, amountSpan);
                 }
             }
         }
diff --git a/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
index 449a23da9..cc22b2639 100644
--- a/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
@@ -152,8 +152,10 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             internal override void Apply(Span<float> scanline, int x, int y)
             {
                 int patternY = y % this.pattern.Height;
-                using (IBuffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
-                using (IBuffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
+                MemoryManager memoryManager = this.Target.MemoryManager;
+
+                using (IBuffer<float> amountBuffer = memoryManager.Allocate<float>(scanline.Length))
+                using (IBuffer<TPixel> overlay = memoryManager.Allocate<TPixel>(scanline.Length))
                 {
                     Span<float> amountSpan = amountBuffer.Span;
                     Span<TPixel> overlaySpan = overlay.Span;
@@ -167,7 +169,7 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
                     }
 
                     Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
-                    this.Blender.Blend(destinationRow, destinationRow, overlaySpan, amountSpan);
+                    this.Blender.Blend(memoryManager, destinationRow, destinationRow, overlaySpan, amountSpan);
                 }
             }
         }
diff --git a/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs b/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
index 68bc13ecb..d8ea43558 100644
--- a/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
+++ b/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
@@ -65,8 +65,10 @@ namespace SixLabors.ImageSharp.Drawing.Brushes.Processors
         /// <remarks>scanlineBuffer will be > scanlineWidth but provide and offset in case we want to share a larger buffer across runs.</remarks>
         internal virtual void Apply(Span<float> scanline, int x, int y)
         {
-            using (IBuffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
-            using (IBuffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
+            MemoryManager memoryManager = this.Target.MemoryManager;
+
+            using (IBuffer<float> amountBuffer = memoryManager.Allocate<float>(scanline.Length))
+            using (IBuffer<TPixel> overlay = memoryManager.Allocate<TPixel>(scanline.Length))
             {
                 Span<float> amountSpan = amountBuffer.Span;
                 Span<TPixel> overlaySpan = overlay.Span;
@@ -82,7 +84,7 @@ namespace SixLabors.ImageSharp.Drawing.Brushes.Processors
                 }
 
                 Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
-                this.Blender.Blend(destinationRow, destinationRow, overlaySpan, amountSpan);
+                this.Blender.Blend(memoryManager, destinationRow, destinationRow, overlaySpan, amountSpan);
             }
         }
     }
diff --git a/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
index 37cba42c9..39afd965c 100644
--- a/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
@@ -144,8 +144,10 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             /// <inheritdoc />
             internal override void Apply(Span<float> scanline, int x, int y)
             {
-                using (IBuffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
-                using (IBuffer<TPixel> overlay = this.Target.MemoryManager.Allocate<TPixel>(scanline.Length))
+                MemoryManager memoryManager = this.Target.MemoryManager;
+
+                using (IBuffer<float> amountBuffer = memoryManager.Allocate<float>(scanline.Length))
+                using (IBuffer<TPixel> overlay = memoryManager.Allocate<TPixel>(scanline.Length))
                 {
                     Span<float> amountSpan = amountBuffer.Span;
                     Span<TPixel> overlaySpan = overlay.Span;
@@ -162,7 +164,7 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
                     }
 
                     Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
-                    this.Blender.Blend(destinationRow, destinationRow, overlaySpan, amountSpan);
+                    this.Blender.Blend(memoryManager, destinationRow, destinationRow, overlaySpan, amountSpan);
                 }
             }
         }
diff --git a/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
index 90286cb6c..692889556 100644
--- a/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
@@ -93,7 +93,9 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
                 {
                     Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
 
-                    using (IBuffer<float> amountBuffer = this.Target.MemoryManager.Allocate<float>(scanline.Length))
+                    MemoryManager memoryManager = this.Target.MemoryManager;
+
+                    using (IBuffer<float> amountBuffer = memoryManager.Allocate<float>(scanline.Length))
                     {
                         Span<float> amountSpan = amountBuffer.Span;
 
@@ -102,11 +104,12 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
                             amountSpan[i] = scanline[i] * this.Options.BlendPercentage;
                         }
 
-                        this.Blender.Blend(destinationRow, destinationRow, this.Colors.Span, amountSpan);
+                        this.Blender.Blend(memoryManager, destinationRow, destinationRow, this.Colors.Span, amountSpan);
                     }
                 }
                 catch (Exception)
                 {
+                    // TODO: Why are we catching exceptions here silently ???
                     throw;
                 }
             }
diff --git a/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
index 21e13d47a..54fb38ee9 100644
--- a/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
@@ -84,7 +84,10 @@ namespace SixLabors.ImageSharp.Drawing.Processors
                 maxY = Math.Min(this.Location.Y + this.Size.Height, maxY);
 
                 int width = maxX - minX;
-                using (IBuffer<float> amount = this.Image.GetConfiguration().MemoryManager.Allocate<float>(width))
+
+                MemoryManager memoryManager = this.Image.GetConfiguration().MemoryManager;
+
+                using (IBuffer<float> amount = memoryManager.Allocate<float>(width))
                 {
                     amount.Span.Fill(this.Alpha);
 
@@ -96,7 +99,7 @@ namespace SixLabors.ImageSharp.Drawing.Processors
                             {
                                 Span<TPixel> background = source.GetPixelRowSpan(y).Slice(minX, width);
                                 Span<TPixel> foreground = targetImage.GetPixelRowSpan(y - this.Location.Y).Slice(targetX, width);
-                                this.blender.Blend(background, background, foreground, amount.Span);
+                                this.blender.Blend(memoryManager, background, background, foreground, amount.Span);
                             });
                 }
             }
diff --git a/src/ImageSharp/ApplyProcessors.cs b/src/ImageSharp/ApplyProcessors.cs
index 58a952c40..c4954ef0d 100644
--- a/src/ImageSharp/ApplyProcessors.cs
+++ b/src/ImageSharp/ApplyProcessors.cs
@@ -4,7 +4,6 @@
 using System;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
 
 namespace SixLabors.ImageSharp
 {
diff --git a/src/ImageSharp/DefaultInternalImageProcessorContext.cs b/src/ImageSharp/DefaultInternalImageProcessorContext.cs
index ac56d0277..d58f6236f 100644
--- a/src/ImageSharp/DefaultInternalImageProcessorContext.cs
+++ b/src/ImageSharp/DefaultInternalImageProcessorContext.cs
@@ -75,6 +75,6 @@ namespace SixLabors.ImageSharp
             return this.ApplyProcessor(processor, this.source.Bounds());
         }
 
-        public MemoryManager GetMemoryManager() => this.source.GetConfiguration().MemoryManager;
+        public MemoryManager MemoryManager => this.source.GetConfiguration().MemoryManager;
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/IImageProcessingContext{TPixel}.cs b/src/ImageSharp/IImageProcessingContext{TPixel}.cs
index 68b0a030a..b73337905 100644
--- a/src/ImageSharp/IImageProcessingContext{TPixel}.cs
+++ b/src/ImageSharp/IImageProcessingContext{TPixel}.cs
@@ -15,6 +15,12 @@ namespace SixLabors.ImageSharp
     public interface IImageProcessingContext<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
+        /// <summary>
+        /// Gets a reference to the <see cref="MemoryManager" /> used to allocate buffers
+        /// for this context.
+        /// </summary>
+        MemoryManager MemoryManager { get; }
+
         /// <summary>
         /// Adds the processor to the current set of image operations to be applied.
         /// </summary>
@@ -29,13 +35,6 @@ namespace SixLabors.ImageSharp
         /// <param name="processor">The processor to apply</param>
         /// <returns>The current operations class to allow chaining of operations.</returns>
         IImageProcessingContext<TPixel> ApplyProcessor(IImageProcessor<TPixel> processor);
-
-        /// <summary>
-        /// Returns a reference to the <see cref="MemoryManager" /> used to allocate buffers
-        /// for this context.
-        /// </summary>
-        /// <returns>A <see cref="MemoryManager"/> to use for buffer allocations.</returns>
-        MemoryManager GetMemoryManager();
     }
 
     /// <summary>
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
index 17f75898d..d3c6cf16c 100644
--- a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
+++ b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
@@ -26,7 +26,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
 
             internal class Normal : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -39,13 +38,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -63,9 +62,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class Multiply : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -78,13 +77,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -102,9 +101,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class Add : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -117,13 +116,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -141,9 +140,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class Substract : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -156,13 +155,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -180,9 +179,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class Screen : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -195,13 +194,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -219,9 +218,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class Darken : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -234,13 +233,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -258,9 +257,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class Lighten : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -273,13 +272,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -297,9 +296,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class Overlay : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -312,13 +311,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -336,9 +335,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class HardLight : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -351,13 +350,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -375,9 +374,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class Src : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -390,13 +389,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -414,9 +413,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class Atop : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -429,13 +428,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -453,9 +452,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class Over : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -468,13 +467,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -492,9 +491,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class In : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -507,13 +506,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -531,9 +530,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class Out : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -546,13 +545,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -570,9 +569,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class Dest : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -585,13 +584,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -609,9 +608,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class DestAtop : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -624,13 +623,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -648,9 +647,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class DestOver : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -663,13 +662,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -687,9 +686,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class DestIn : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -702,13 +701,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -726,9 +725,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class DestOut : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -741,13 +740,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -765,9 +764,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class Clear : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -780,13 +779,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -804,9 +803,9 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
             internal class Xor : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -819,13 +818,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -843,5 +842,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
index 75c6b2d81..eebee676f 100644
--- a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
+++ b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
@@ -68,7 +68,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
 #>
             internal class <#=blender#> : PixelBlender<TPixel>
             {
-                
                 /// <summary>
                 /// Gets the static instance of this blender.
                 /// </summary>
@@ -81,13 +80,13 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
 
                 /// <inheritdoc />
-                public override void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
+                public override void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount)
                 {
                     Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length));
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = Configuration.Default.MemoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -105,6 +104,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     }
                 }
             }
+
 <#
 
     }
diff --git a/src/ImageSharp/PixelFormats/PixelBlender{TPixel}.cs b/src/ImageSharp/PixelFormats/PixelBlender{TPixel}.cs
index 54cb09c28..666fb3891 100644
--- a/src/ImageSharp/PixelFormats/PixelBlender{TPixel}.cs
+++ b/src/ImageSharp/PixelFormats/PixelBlender{TPixel}.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.PixelFormats
 {
@@ -27,6 +28,7 @@ namespace SixLabors.ImageSharp.PixelFormats
         /// <summary>
         /// Blend 2 pixels together.
         /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/></param>
         /// <param name="destination">The destination span.</param>
         /// <param name="background">The background span.</param>
         /// <param name="source">The source span.</param>
@@ -34,6 +36,6 @@ namespace SixLabors.ImageSharp.PixelFormats
         /// A value between 0 and 1 indicating the weight of the second source vector.
         /// At amount = 0, "from" is returned, at amount = 1, "to" is returned.
         /// </param>
-        public abstract void Blend(Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount);
+        public abstract void Blend(MemoryManager memoryManager, Span<TPixel> destination, Span<TPixel> background, Span<TPixel> source, Span<float> amount);
     }
 }
diff --git a/src/ImageSharp/Processing/ColorMatrix/Lomograph.cs b/src/ImageSharp/Processing/ColorMatrix/Lomograph.cs
index 96231e168..ca79841c7 100644
--- a/src/ImageSharp/Processing/ColorMatrix/Lomograph.cs
+++ b/src/ImageSharp/Processing/ColorMatrix/Lomograph.cs
@@ -51,7 +51,7 @@ namespace SixLabors.ImageSharp
         public static IImageProcessingContext<TPixel> Lomograph<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new LomographProcessor<TPixel>(source.GetMemoryManager(), options));
+            source.ApplyProcessor(new LomographProcessor<TPixel>(source.MemoryManager, options));
             return source;
         }
 
@@ -68,7 +68,7 @@ namespace SixLabors.ImageSharp
         public static IImageProcessingContext<TPixel> Lomograph<TPixel>(this IImageProcessingContext<TPixel> source, Rectangle rectangle, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new LomographProcessor<TPixel>(source.GetMemoryManager(), options), rectangle);
+            source.ApplyProcessor(new LomographProcessor<TPixel>(source.MemoryManager, options), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/ColorMatrix/Polaroid.cs b/src/ImageSharp/Processing/ColorMatrix/Polaroid.cs
index 7cc0e2419..d12cc7612 100644
--- a/src/ImageSharp/Processing/ColorMatrix/Polaroid.cs
+++ b/src/ImageSharp/Processing/ColorMatrix/Polaroid.cs
@@ -51,7 +51,7 @@ namespace SixLabors.ImageSharp
         public static IImageProcessingContext<TPixel> Polaroid<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new PolaroidProcessor<TPixel>(source.GetMemoryManager(), options));
+            source.ApplyProcessor(new PolaroidProcessor<TPixel>(source.MemoryManager, options));
             return source;
         }
 
@@ -68,7 +68,7 @@ namespace SixLabors.ImageSharp
         public static IImageProcessingContext<TPixel> Polaroid<TPixel>(this IImageProcessingContext<TPixel> source, Rectangle rectangle, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new PolaroidProcessor<TPixel>(source.GetMemoryManager(), options), rectangle);
+            source.ApplyProcessor(new PolaroidProcessor<TPixel>(source.MemoryManager, options), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/Effects/BackgroundColor.cs b/src/ImageSharp/Processing/Effects/BackgroundColor.cs
index 18caa67cc..22aad9ca6 100644
--- a/src/ImageSharp/Processing/Effects/BackgroundColor.cs
+++ b/src/ImageSharp/Processing/Effects/BackgroundColor.cs
@@ -23,7 +23,7 @@ namespace SixLabors.ImageSharp
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext<TPixel> BackgroundColor<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
-        => source.ApplyProcessor(new BackgroundColorProcessor<TPixel>(source.GetMemoryManager(), color, options));
+        => source.ApplyProcessor(new BackgroundColorProcessor<TPixel>(source.MemoryManager, color, options));
 
         /// <summary>
         /// Replaces the background color of image with the given one.
@@ -38,7 +38,7 @@ namespace SixLabors.ImageSharp
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext<TPixel> BackgroundColor<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, Rectangle rectangle, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
-        => source.ApplyProcessor(new BackgroundColorProcessor<TPixel>(source.GetMemoryManager(), color, options), rectangle);
+        => source.ApplyProcessor(new BackgroundColorProcessor<TPixel>(source.MemoryManager, color, options), rectangle);
 
         /// <summary>
         /// Replaces the background color of image with the given one.
diff --git a/src/ImageSharp/Processing/Overlays/Glow.cs b/src/ImageSharp/Processing/Overlays/Glow.cs
index a8994b18a..0c3552b4d 100644
--- a/src/ImageSharp/Processing/Overlays/Glow.cs
+++ b/src/ImageSharp/Processing/Overlays/Glow.cs
@@ -157,7 +157,7 @@ namespace SixLabors.ImageSharp
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         private static IImageProcessingContext<TPixel> Glow<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, ValueSize radius, Rectangle rectangle, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
-        => source.ApplyProcessor(new GlowProcessor<TPixel>(source.GetMemoryManager(), color, radius, options), rectangle);
+        => source.ApplyProcessor(new GlowProcessor<TPixel>(source.MemoryManager, color, radius, options), rectangle);
 
         /// <summary>
         /// Applies a radial glow effect to an image.
@@ -170,6 +170,6 @@ namespace SixLabors.ImageSharp
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         private static IImageProcessingContext<TPixel> Glow<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, ValueSize radius, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
-        => source.ApplyProcessor(new GlowProcessor<TPixel>(source.GetMemoryManager(), color, radius, options));
+        => source.ApplyProcessor(new GlowProcessor<TPixel>(source.MemoryManager, color, radius, options));
     }
 }
diff --git a/src/ImageSharp/Processing/Overlays/Vignette.cs b/src/ImageSharp/Processing/Overlays/Vignette.cs
index 3a691ed00..4b9f2f866 100644
--- a/src/ImageSharp/Processing/Overlays/Vignette.cs
+++ b/src/ImageSharp/Processing/Overlays/Vignette.cs
@@ -151,10 +151,10 @@ namespace SixLabors.ImageSharp
 
         private static IImageProcessingContext<TPixel> VignetteInternal<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, ValueSize radiusX, ValueSize radiusY, Rectangle rectangle, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
-            => source.ApplyProcessor(new VignetteProcessor<TPixel>(source.GetMemoryManager(), color, radiusX, radiusY, options), rectangle);
+            => source.ApplyProcessor(new VignetteProcessor<TPixel>(source.MemoryManager, color, radiusX, radiusY, options), rectangle);
 
         private static IImageProcessingContext<TPixel> VignetteInternal<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, ValueSize radiusX, ValueSize radiusY, GraphicsOptions options)
             where TPixel : struct, IPixel<TPixel>
-            => source.ApplyProcessor(new VignetteProcessor<TPixel>(source.GetMemoryManager(), color, radiusX, radiusY, options));
+            => source.ApplyProcessor(new VignetteProcessor<TPixel>(source.MemoryManager, color, radiusX, radiusY, options));
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
index e97495a3d..720b87691 100644
--- a/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
@@ -94,7 +94,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                         Span<TPixel> destination = source.GetPixelRowSpan(y - startY).Slice(minX - startX, width);
 
                         // This switched color & destination in the 2nd and 3rd places because we are applying the target colour under the current one
-                        blender.Blend(destination, colors.Span, destination, amount.Span);
+                        blender.Blend(this.memoryManager, destination, colors.Span, destination, amount.Span);
                     });
             }
         }
diff --git a/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
index 85c592cea..9ab301718 100644
--- a/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
@@ -116,7 +116,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
 
                             Span<TPixel> destination = source.GetPixelRowSpan(offsetY).Slice(offsetX, width);
 
-                            this.blender.Blend(destination, destination, rowColors.Span, amountsSpan);
+                            this.blender.Blend(this.memoryManager, destination, destination, rowColors.Span, amountsSpan);
                         }
                     });
             }
diff --git a/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
index d0943b27b..d47211f0c 100644
--- a/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
@@ -139,7 +139,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
 
                                 Span<TPixel> destination = source.GetPixelRowSpan(offsetY).Slice(offsetX, width);
 
-                                this.blender.Blend(destination, destination, rowColors.Span, amountsSpan);
+                                this.blender.Blend(this.memoryManager, destination, destination, rowColors.Span, amountsSpan);
                             }
                         });
             }
diff --git a/src/ImageSharp/Processing/Transforms/Resize.cs b/src/ImageSharp/Processing/Transforms/Resize.cs
index a3a62fa49..18def03e6 100644
--- a/src/ImageSharp/Processing/Transforms/Resize.cs
+++ b/src/ImageSharp/Processing/Transforms/Resize.cs
@@ -193,7 +193,7 @@ namespace SixLabors.ImageSharp
                 Guard.MustBeGreaterThan(width, 0, nameof(width));
                 Guard.MustBeGreaterThan(height, 0, nameof(height));
 
-                img.Mutate(x => x.ApplyProcessor(new ResizeProcessor<TPixel>(source.GetMemoryManager(), sampler, width, height, targetRectangle) { Compand = compand }, sourceRectangle));
+                img.Mutate(x => x.ApplyProcessor(new ResizeProcessor<TPixel>(source.MemoryManager, sampler, width, height, targetRectangle) { Compand = compand }, sourceRectangle));
             });
         }
 
@@ -233,7 +233,7 @@ namespace SixLabors.ImageSharp
                 Guard.MustBeGreaterThan(width, 0, nameof(width));
                 Guard.MustBeGreaterThan(height, 0, nameof(height));
 
-                img.Mutate(x => x.ApplyProcessor(new ResizeProcessor<TPixel>(source.GetMemoryManager(), sampler, width, height, targetRectangle) { Compand = compand }));
+                img.Mutate(x => x.ApplyProcessor(new ResizeProcessor<TPixel>(source.MemoryManager, sampler, width, height, targetRectangle) { Compand = compand }));
             });
         }
     }
diff --git a/src/ImageSharp/Quantizers/Quantize.cs b/src/ImageSharp/Quantizers/Quantize.cs
index 0e3d806da..4052d4685 100644
--- a/src/ImageSharp/Quantizers/Quantize.cs
+++ b/src/ImageSharp/Quantizers/Quantize.cs
@@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp
                 QuantizedImage<TPixel> quantized = quantizer.Quantize(img.Frames.RootFrame, maxColors);
                 int palleteCount = quantized.Palette.Length - 1;
 
-                using (var pixels = new PixelAccessor<TPixel>(source.GetMemoryManager(), quantized.Width, quantized.Height))
+                using (var pixels = new PixelAccessor<TPixel>(source.MemoryManager, quantized.Width, quantized.Height))
                 {
                     Parallel.For(
                         0,
diff --git a/tests/ImageSharp.Tests/FakeImageOperationsProvider.cs b/tests/ImageSharp.Tests/FakeImageOperationsProvider.cs
index a1c199b16..c2ed7238d 100644
--- a/tests/ImageSharp.Tests/FakeImageOperationsProvider.cs
+++ b/tests/ImageSharp.Tests/FakeImageOperationsProvider.cs
@@ -88,7 +88,7 @@ namespace SixLabors.ImageSharp.Tests
                 return this;
             }
 
-            public MemoryManager GetMemoryManager() => this.source.GetConfiguration().MemoryManager;
+            public MemoryManager MemoryManager => this.source.GetConfiguration().MemoryManager;
 
             public struct AppliedOpperation
             {
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs b/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs
index b95f8fdf6..50babde69 100644
--- a/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs
@@ -12,6 +12,8 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
 {
+    using SixLabors.ImageSharp.Memory;
+
     public class PorterDuffFunctionsTests_TPixel
     {
         private static Span<T> AsSpan<T>(T value)
@@ -25,6 +27,8 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
             { new TestPixel<Rgba32>(1,1,1,1), new TestPixel<Rgba32>(0,0,0,.8f), .5f, new TestPixel<Rgba32>(0.6f, 0.6f, 0.6f, 1) },
         };
 
+        private MemoryManager MemoryManager { get; } = Configuration.Default.MemoryManager;
+
         [Theory]
         [MemberData(nameof(NormalBlendFunctionData))]
         public void NormalBlendFunction<TPixel>(TestPixel<TPixel> back, TestPixel<TPixel> source, float amount, TestPixel<TPixel> expected)
@@ -49,7 +53,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
             where TPixel : struct, IPixel<TPixel>
         {
             Span<TPixel> dest = new Span<TPixel>(new TPixel[1]);
-            new DefaultPixelBlenders<TPixel>.Normal().Blend(dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
+            new DefaultPixelBlenders<TPixel>.Normal().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
             VectorAssert.Equal(expected, dest[0], 2);
         }
 
@@ -88,7 +92,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
             where TPixel : struct, IPixel<TPixel>
         {
             Span<TPixel> dest = new Span<TPixel>(new TPixel[1]);
-            new DefaultPixelBlenders<TPixel>.Multiply().Blend(dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
+            new DefaultPixelBlenders<TPixel>.Multiply().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
             VectorAssert.Equal(expected, dest[0], 2);
         }
 
@@ -127,7 +131,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
             where TPixel : struct, IPixel<TPixel>
         {
             Span<TPixel> dest = new Span<TPixel>(new TPixel[1]);
-            new DefaultPixelBlenders<TPixel>.Add().Blend(dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
+            new DefaultPixelBlenders<TPixel>.Add().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
             VectorAssert.Equal(expected, dest[0], 2);
         }
 
@@ -166,7 +170,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
             where TPixel : struct, IPixel<TPixel>
         {
             Span<TPixel> dest = new Span<TPixel>(new TPixel[1]);
-            new DefaultPixelBlenders<TPixel>.Substract().Blend(dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
+            new DefaultPixelBlenders<TPixel>.Substract().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
             VectorAssert.Equal(expected, dest[0], 2);
         }
 
@@ -205,7 +209,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
             where TPixel : struct, IPixel<TPixel>
         {
             Span<TPixel> dest = new Span<TPixel>(new TPixel[1]);
-            new DefaultPixelBlenders<TPixel>.Screen().Blend(dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
+            new DefaultPixelBlenders<TPixel>.Screen().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
             VectorAssert.Equal(expected, dest[0], 2);
         }
 
@@ -244,7 +248,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
             where TPixel : struct, IPixel<TPixel>
         {
             Span<TPixel> dest = new Span<TPixel>(new TPixel[1]);
-            new DefaultPixelBlenders<TPixel>.Darken().Blend(dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
+            new DefaultPixelBlenders<TPixel>.Darken().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
             VectorAssert.Equal(expected, dest[0], 2);
         }
 
@@ -283,7 +287,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
             where TPixel : struct, IPixel<TPixel>
         {
             Span<TPixel> dest = new Span<TPixel>(new TPixel[1]);
-            new DefaultPixelBlenders<TPixel>.Lighten().Blend(dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
+            new DefaultPixelBlenders<TPixel>.Lighten().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
             VectorAssert.Equal(expected, dest[0], 2);
         }
 
@@ -322,7 +326,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
             where TPixel : struct, IPixel<TPixel>
         {
             Span<TPixel> dest = new Span<TPixel>(new TPixel[1]);
-            new DefaultPixelBlenders<TPixel>.Overlay().Blend(dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
+            new DefaultPixelBlenders<TPixel>.Overlay().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
             VectorAssert.Equal(expected, dest[0], 2);
         }
 
@@ -361,7 +365,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
             where TPixel : struct, IPixel<TPixel>
         {
             Span<TPixel> dest = new Span<TPixel>(new TPixel[1]);
-            new DefaultPixelBlenders<TPixel>.HardLight().Blend(dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
+            new DefaultPixelBlenders<TPixel>.HardLight().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
             VectorAssert.Equal(expected, dest[0], 2);
         }
     }

From b484dd401e7eb4175b19423024bad67d457a4d1a Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Thu, 22 Feb 2018 03:23:40 +0100
Subject: [PATCH 43/70] Super-optimized GenericBlock8x8<T> to replace
 PixelArea<T> in JpegEncoder

---
 .../Jpeg/Common/GenericBlock8x8.Generated.cs  |  26 ++++
 .../Jpeg/Common/GenericBlock8x8.Generated.tt  |  43 ++++++
 .../Formats/Jpeg/Common/GenericBlock8x8.cs    | 128 ++++++++++++++++++
 .../Components/Encoder/RgbToYCbCrTables.cs    |   4 +-
 .../Jpeg/GolangPort/JpegEncoderCore.cs        |   2 +-
 .../Jpeg/GolangPort/Utils/OrigJpegUtils.cs    |   2 +-
 src/ImageSharp/ImageSharp.csproj              |   9 ++
 .../Formats/Jpg/GenericBlock8x8Tests.cs       | 126 +++++++++++++++++
 .../Formats/Jpg/JpegUtilsTests.cs             |  12 +-
 9 files changed, 341 insertions(+), 11 deletions(-)
 create mode 100644 src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.Generated.cs
 create mode 100644 src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.Generated.tt
 create mode 100644 src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.cs
 create mode 100644 tests/ImageSharp.Tests/Formats/Jpg/GenericBlock8x8Tests.cs

diff --git a/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.Generated.cs b/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.Generated.cs
new file mode 100644
index 000000000..1bb37a7d3
--- /dev/null
+++ b/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.Generated.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Numerics;
+using System.Runtime.CompilerServices;
+
+// <auto-generated />
+namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+{
+	internal unsafe partial struct GenericBlock8x8<T>
+    {
+        #pragma warning disable 169
+
+        // It's not allowed use fix-sized buffers with generics, need to place all the fields manually:
+        private T _y0_x0, _y0_x1, _y0_x2, _y0_x3, _y0_x4, _y0_x5, _y0_x6, _y0_x7;
+        private T _y1_x0, _y1_x1, _y1_x2, _y1_x3, _y1_x4, _y1_x5, _y1_x6, _y1_x7;
+        private T _y2_x0, _y2_x1, _y2_x2, _y2_x3, _y2_x4, _y2_x5, _y2_x6, _y2_x7;
+        private T _y3_x0, _y3_x1, _y3_x2, _y3_x3, _y3_x4, _y3_x5, _y3_x6, _y3_x7;
+        private T _y4_x0, _y4_x1, _y4_x2, _y4_x3, _y4_x4, _y4_x5, _y4_x6, _y4_x7;
+        private T _y5_x0, _y5_x1, _y5_x2, _y5_x3, _y5_x4, _y5_x5, _y5_x6, _y5_x7;
+        private T _y6_x0, _y6_x1, _y6_x2, _y6_x3, _y6_x4, _y6_x5, _y6_x6, _y6_x7;
+        private T _y7_x0, _y7_x1, _y7_x2, _y7_x3, _y7_x4, _y7_x5, _y7_x6, _y7_x7;
+
+        #pragma warning restore 169
+	}
+}
diff --git a/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.Generated.tt b/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.Generated.tt
new file mode 100644
index 000000000..d9b15b34f
--- /dev/null
+++ b/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.Generated.tt
@@ -0,0 +1,43 @@
+<#
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+#>
+<#@ template debug="false" hostspecific="false" language="C#" #>
+<#@ assembly name="System.Core" #>
+<#@ import namespace="System.Linq" #>
+<#@ import namespace="System.Text" #>
+<#@ import namespace="System.Collections.Generic" #>
+<#@ output extension=".cs" #>
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Numerics;
+using System.Runtime.CompilerServices;
+
+// <auto-generated />
+namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+{
+	internal unsafe partial struct GenericBlock8x8<T>
+    {
+        #pragma warning disable 169
+
+        // It's not allowed use fix-sized buffers with generics, need to place all the fields manually:
+    <#
+			PushIndent("        ");
+            Write("    ");
+            for (int y = 0; y < 8; y++)
+            {
+                Write("private T ");
+                for (int x = 0; x < 8; x++)
+                {
+					Write($"_y{y}_x{x}");
+                    if (x < 7) Write(", ");
+                }
+                WriteLine(";");
+            }
+			PopIndent();
+	#>
+
+        #pragma warning restore 169
+	}
+}
diff --git a/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.cs b/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.cs
new file mode 100644
index 000000000..bc5838e9b
--- /dev/null
+++ b/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.cs
@@ -0,0 +1,128 @@
+using System;
+using System.Runtime.CompilerServices;
+using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Memory;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.Primitives;
+
+namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+{
+    /// <summary>
+    /// A generic 8x8 block implementation, useful for manipulating custom 8x8 pixel data.
+    /// </summary>
+    // ReSharper disable once InconsistentNaming
+    internal unsafe partial struct GenericBlock8x8<T>
+        where T : struct
+    {
+        public const int Size = 64;
+
+        public const int SizeInBytes = Size * 3;
+
+        public void LoadAndStretchEdges<TPixel>(IPixelSource<TPixel> source, int sourceX, int sourceY)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            var buffer = source.PixelBuffer as Buffer2D<T>;
+            if (buffer == null)
+            {
+                throw new InvalidOperationException("LoadAndStretchEdges<TPixels>() is only valid for TPixel == T !");
+            }
+
+            this.LoadAndStretchEdges(buffer, sourceX, sourceY);
+        }
+
+        /// <summary>
+        /// Load a 8x8 region of an image into the block.
+        /// The "outlying" area of the block will be stretched out with pixels on the right and bottom edge of the image.
+        /// </summary>
+        public void LoadAndStretchEdges(Buffer2D<T> source, int sourceX, int sourceY)
+        {
+            int width = Math.Min(8, source.Width - sourceX);
+            int height = Math.Min(8, source.Height - sourceY);
+
+            if (width <= 0 || height <= 0)
+            {
+                return;
+            }
+
+            uint byteWidth = (uint)width * (uint)Unsafe.SizeOf<T>();
+            int remainderXCount = 8 - width;
+
+            ref byte blockStart = ref Unsafe.As<GenericBlock8x8<T>, byte>(ref this);
+            ref byte imageStart = ref Unsafe.As<T, byte>(
+                                      ref Unsafe.Add(ref source.GetRowSpan(sourceY).DangerousGetPinnableReference(), sourceX)
+                                  );
+
+            int blockRowSizeInBytes = 8 * Unsafe.SizeOf<T>();
+            int imageRowSizeInBytes = source.Width * Unsafe.SizeOf<T>();
+
+            for (int y = 0; y < height; y++)
+            {
+                ref byte s = ref Unsafe.Add(ref imageStart, y * imageRowSizeInBytes);
+                ref byte d = ref Unsafe.Add(ref blockStart, y * blockRowSizeInBytes);
+
+                Unsafe.CopyBlock(ref d, ref s, byteWidth);
+
+                ref T last = ref Unsafe.Add(ref Unsafe.As<byte, T>(ref d), width - 1);
+
+                for (int x = 1; x <= remainderXCount; x++)
+                {
+                    Unsafe.Add(ref last, x) = last;
+                }
+            }
+
+            int remainderYCount = 8 - height;
+
+            if (remainderYCount == 0)
+            {
+                return;
+            }
+
+            ref byte lastRowStart = ref Unsafe.Add(ref blockStart, (height - 1) * blockRowSizeInBytes);
+
+            for (int y = 1; y <= remainderYCount; y++)
+            {
+                ref byte remStart = ref Unsafe.Add(ref lastRowStart, blockRowSizeInBytes * y);
+                Unsafe.CopyBlock(ref remStart, ref lastRowStart, (uint)blockRowSizeInBytes);
+            }
+        }
+
+        /// <summary>
+        /// ONLY FOR GenericBlock instances living on the stack!
+        /// </summary>
+        public Span<T> AsSpanUnsafe() => new Span<T>(Unsafe.AsPointer(ref this), Size);
+
+        /// <summary>
+        /// FOR TESTING ONLY!
+        /// Gets or sets a <see cref="Rgb24"/> value at the given index
+        /// </summary>
+        /// <param name="idx">The index</param>
+        /// <returns>The value</returns>
+        public T this[int idx]
+        {
+            get
+            {
+                ref T selfRef = ref Unsafe.As<GenericBlock8x8<T>, T>(ref this);
+                return Unsafe.Add(ref selfRef, idx);
+            }
+
+            set
+            {
+                ref T selfRef = ref Unsafe.As<GenericBlock8x8<T>, T>(ref this);
+                Unsafe.Add(ref selfRef, idx) = value;
+            }
+        }
+
+        /// <summary>
+        /// FOR TESTING ONLY!
+        /// Gets or sets a value in a row+coulumn of the 8x8 block
+        /// </summary>
+        /// <param name="x">The x position index in the row</param>
+        /// <param name="y">The column index</param>
+        /// <returns>The value</returns>
+        public T this[int x, int y]
+        {
+            get => this[(y * 8) + x];
+            set => this[(y * 8) + x] = value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
index 02bd451b9..3c1d66685 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
@@ -8,6 +8,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
     /// <summary>
     /// Provides 8-bit lookup tables for converting from Rgb to YCbCr colorspace.
     /// Methods to build the tables are based on libjpeg implementation.
+    /// TODO: Replace this logic with SIMD conversion (similar to the one in the decoder)!
     /// </summary>
     internal unsafe struct RgbToYCbCrTables
     {
@@ -91,6 +92,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
         }
 
         /// <summary>
+        /// TODO: Replace this logic with SIMD conversion (similar to the one in the decoder)!
         /// Optimized method to allocates the correct y, cb, and cr values to the DCT blocks from the given r, g, b values.
         /// </summary>
         /// <param name="yBlockRaw">The The luminance block.</param>
@@ -102,7 +104,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
         /// <param name="g">The green value.</param>
         /// <param name="b">The blue value.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Allocate(ref float* yBlockRaw, ref float* cbBlockRaw, ref float* crBlockRaw, ref RgbToYCbCrTables* tables, int index, int r, int g, int b)
+        public static void Rgb2YCbCr(float* yBlockRaw, float* cbBlockRaw, float* crBlockRaw, ref RgbToYCbCrTables* tables, int index, int r, int g, int b)
         {
             // float y = (0.299F * r) + (0.587F * g) + (0.114F * b);
             yBlockRaw[index] = (tables->YRTable[r] + tables->YGTable[g] + tables->YBTable[b]) >> ScaleBits;
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
index 4a9ddf353..b03b0b534 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
@@ -331,7 +331,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
 
                     int index = j8 + i;
 
-                    RgbToYCbCrTables.Allocate(ref yBlockRaw, ref cbBlockRaw, ref crBlockRaw, ref tables, index, r, g, b);
+                    RgbToYCbCrTables.Rgb2YCbCr(yBlockRaw, cbBlockRaw, crBlockRaw, ref tables, index, r, g, b);
 
                     dataIdx += 3;
                 }
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs
index 01ed5063b..42a7d56e3 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs
@@ -8,7 +8,7 @@ using SixLabors.ImageSharp.PixelFormats;
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Utils
 {
     /// <summary>
-    ///     Jpeg specific utilities and extension methods
+    /// Jpeg specific utilities and extension methods
     /// </summary>
     internal static class OrigJpegUtils
     {
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
index b812b0b22..8b89499ea 100644
--- a/src/ImageSharp/ImageSharp.csproj
+++ b/src/ImageSharp/ImageSharp.csproj
@@ -62,6 +62,10 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>Block8x8F.Generated.cs</LastGenOutput>
     </None>
+    <None Update="Formats\Jpeg\Common\GenericBlock8x8.Generated.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>GenericBlock8x8.Generated.cs</LastGenOutput>
+    </None>
     <None Update="Formats\Jpeg\Components\Block8x8F.Generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>Block8x8F.Generated.cs</LastGenOutput>
@@ -92,6 +96,11 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Block8x8F.Generated.tt</DependentUpon>
     </Compile>
+    <Compile Update="Formats\Jpeg\Common\GenericBlock8x8.Generated.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>GenericBlock8x8.Generated.tt</DependentUpon>
+    </Compile>
     <Compile Update="Formats\Jpeg\Components\Block8x8F.Generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/GenericBlock8x8Tests.cs b/tests/ImageSharp.Tests/Formats/Jpg/GenericBlock8x8Tests.cs
new file mode 100644
index 000000000..193e26fcb
--- /dev/null
+++ b/tests/ImageSharp.Tests/Formats/Jpg/GenericBlock8x8Tests.cs
@@ -0,0 +1,126 @@
+// ReSharper disable InconsistentNaming
+namespace SixLabors.ImageSharp.Tests.Formats.Jpg
+{
+    using System;
+    using System.Numerics;
+
+    using SixLabors.ImageSharp.Formats.Jpeg.Common;
+    using SixLabors.ImageSharp.Helpers;
+    using SixLabors.ImageSharp.PixelFormats;
+    using SixLabors.Primitives;
+
+    using Xunit;
+
+    public class GenericBlock8x8Tests
+    {
+        public static Image<TPixel> CreateTestImage<TPixel>()
+            where TPixel : struct, IPixel<TPixel>
+        {
+            var image = new Image<TPixel>(10, 10);
+            using (PixelAccessor<TPixel> pixels = image.Lock())
+            {
+                for (int i = 0; i < 10; i++)
+                {
+                    for (int j = 0; j < 10; j++)
+                    {
+                        var rgba = new Rgba32((byte)(i+1), (byte)(j+1), (byte)200, (byte)255);
+                        var color = default(TPixel);
+                        color.PackFromRgba32(rgba);
+
+                        pixels[i, j] = color;
+                    }
+                }
+            }
+
+            return image;
+        }
+
+        [Theory]
+        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.Rgb24 | PixelTypes.Rgba32 /* | PixelTypes.Rgba32 | PixelTypes.Argb32*/)]
+        public void LoadAndStretchCorners_FromOrigo<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            using (Image<TPixel> s = provider.GetImage())
+            {
+                var d = default(GenericBlock8x8<TPixel>);
+                d.LoadAndStretchEdges(s.Frames.RootFrame, 0, 0);
+
+                TPixel a = s.Frames.RootFrame[0, 0];
+                TPixel b = d[0, 0];
+
+                Assert.Equal(s[0, 0], d[0, 0]);
+                Assert.Equal(s[1, 0], d[1, 0]);
+                Assert.Equal(s[7, 0], d[7, 0]);
+                Assert.Equal(s[0, 1], d[0, 1]);
+                Assert.Equal(s[1, 1], d[1, 1]);
+                Assert.Equal(s[7, 0], d[7, 0]);
+                Assert.Equal(s[0, 7], d[0, 7]);
+                Assert.Equal(s[7, 7], d[7, 7]);
+            }
+        }
+
+        [Theory]
+        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.Rgb24 | PixelTypes.Rgba32)]
+        public unsafe void LoadAndStretchCorners_WithOffset<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            using (Image<TPixel> s = provider.GetImage())
+            {
+                var d = default(GenericBlock8x8<TPixel>);
+                d.LoadAndStretchEdges(s.Frames.RootFrame, 6, 7);
+
+                Assert.Equal(s[6, 7], d[0, 0]);
+                Assert.Equal(s[6, 8], d[0, 1]);
+                Assert.Equal(s[7, 8], d[1, 1]);
+
+                Assert.Equal(s[6, 9], d[0, 2]);
+                Assert.Equal(s[6, 9], d[0, 3]);
+                Assert.Equal(s[6, 9], d[0, 7]);
+
+                Assert.Equal(s[7, 9], d[1, 2]);
+                Assert.Equal(s[7, 9], d[1, 3]);
+                Assert.Equal(s[7, 9], d[1, 7]);
+
+                Assert.Equal(s[9, 9], d[3, 2]);
+                Assert.Equal(s[9, 9], d[3, 3]);
+                Assert.Equal(s[9, 9], d[3, 7]);
+
+                Assert.Equal(s[9, 7], d[3, 0]);
+                Assert.Equal(s[9, 7], d[4, 0]);
+                Assert.Equal(s[9, 7], d[7, 0]);
+
+                Assert.Equal(s[9, 9], d[3, 2]);
+                Assert.Equal(s[9, 9], d[4, 2]);
+                Assert.Equal(s[9, 9], d[7, 2]);
+
+                Assert.Equal(s[9, 9], d[4, 3]);
+                Assert.Equal(s[9, 9], d[7, 7]);
+            }
+        }
+
+        [Fact]
+        public void Indexer()
+        {
+            var block = default(GenericBlock8x8<Rgb24>);
+            Span<Rgb24> span = block.AsSpanUnsafe();
+            Assert.Equal(64, span.Length);
+
+            for (int i = 0; i < 64; i++)
+            {
+                span[i] = new Rgb24((byte)i, (byte)(2 * i), (byte)(3 * i));
+            }
+
+            Rgb24 expected00 = new Rgb24(0, 0, 0);
+            Rgb24 expected07 = new Rgb24(7, 14, 21);
+            Rgb24 expected11 = new Rgb24(9, 18, 27);
+            Rgb24 expected77 = new Rgb24(63, 126, 189);
+            Rgb24 expected67 = new Rgb24(62, 124, 186);
+
+            Assert.Equal(expected00, block[0, 0]);
+            Assert.Equal(expected07, block[7, 0]);
+            Assert.Equal(expected11, block[1, 1]);
+            Assert.Equal(expected67, block[6, 7]);
+            Assert.Equal(expected77, block[7, 7]);
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs
index 887e9d7e9..6fe6a9bfd 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs
@@ -1,18 +1,14 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-
+using System.Numerics;
+using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Utils;
+using SixLabors.ImageSharp.PixelFormats;
+using Xunit;
 
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 {
-    using System.Numerics;
-
-    using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Utils;
-    using SixLabors.ImageSharp.PixelFormats;
-
-    using Xunit;
-
     public class JpegUtilsTests
     {
         public static Image<TPixel> CreateTestImage<TPixel>()

From 8c15954391c6454374ecee6af08c4e48d4349808 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Thu, 22 Feb 2018 13:31:41 +0100
Subject: [PATCH 44/70] YCbCrForwardConverter<TPixel> WIP

---
 .../Components/Encoder/RgbToYCbCrTables.cs    | 58 ++++++++++++++++++-
 .../Jpeg/GolangPort/JpegEncoderCore.cs        | 37 +++++++++---
 .../Jpeg/GolangPort/Utils/OrigJpegUtils.cs    | 11 ++++
 3 files changed, 95 insertions(+), 11 deletions(-)

diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
index 3c1d66685..01fe51c8d 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
@@ -2,6 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Runtime.CompilerServices;
+using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Memory;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
 {
@@ -95,16 +99,16 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
         /// TODO: Replace this logic with SIMD conversion (similar to the one in the decoder)!
         /// Optimized method to allocates the correct y, cb, and cr values to the DCT blocks from the given r, g, b values.
         /// </summary>
+        /// <param name="tables">The reference to the tables instance.</param>
         /// <param name="yBlockRaw">The The luminance block.</param>
         /// <param name="cbBlockRaw">The red chroma block.</param>
         /// <param name="crBlockRaw">The blue chroma block.</param>
-        /// <param name="tables">The reference to the tables instance.</param>
         /// <param name="index">The current index.</param>
         /// <param name="r">The red value.</param>
         /// <param name="g">The green value.</param>
         /// <param name="b">The blue value.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Rgb2YCbCr(float* yBlockRaw, float* cbBlockRaw, float* crBlockRaw, ref RgbToYCbCrTables* tables, int index, int r, int g, int b)
+        public static void Rgb2YCbCr(RgbToYCbCrTables* tables, float* yBlockRaw, float* cbBlockRaw, float* crBlockRaw, int index, int r, int g, int b)
         {
             // float y = (0.299F * r) + (0.587F * g) + (0.114F * b);
             yBlockRaw[index] = (tables->YRTable[r] + tables->YGTable[g] + tables->YBTable[b]) >> ScaleBits;
@@ -116,6 +120,27 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
             crBlockRaw[index] = (tables->CbBTable[r] + tables->CrGTable[g] + tables->CrBTable[b]) >> ScaleBits;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void ConvertPixelInto(int r, int g, int b, ref float yResult, ref float cbResult, ref float crResult)
+        {
+            ref int start = ref Unsafe.As<RgbToYCbCrTables, int>(ref this);
+
+            ref int yR = ref start;
+            ref int yG = ref Unsafe.Add(ref start, 256 * 1);
+            ref int yB = ref Unsafe.Add(ref start, 256 * 2);
+
+            ref int cbR = ref Unsafe.Add(ref start, 256 * 3);
+            ref int cbG = ref Unsafe.Add(ref start, 256 * 4);
+            ref int cbB = ref Unsafe.Add(ref start, 256 * 5);
+
+            ref int crG = ref Unsafe.Add(ref start, 256 * 6);
+            ref int crB = ref Unsafe.Add(ref start, 256 * 7);
+
+            yResult = (Unsafe.Add(ref yR, r) + Unsafe.Add(ref yG, g) + Unsafe.Add(ref yB, b)) >> ScaleBits;
+            cbResult = (Unsafe.Add(ref cbR, r) + Unsafe.Add(ref cbG, g) + Unsafe.Add(ref cbB, b)) >> ScaleBits;
+            crResult = (Unsafe.Add(ref cbB, r) + Unsafe.Add(ref crG, g) + Unsafe.Add(ref crB, b)) >> ScaleBits;
+        }
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static int Fix(float x)
         {
@@ -128,4 +153,33 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
             return x >> ScaleBits;
         }
     }
+
+    // TODO!
+    internal struct YCbCrForwardConverter<TPixel>
+        where TPixel : struct, IPixel<TPixel>
+    {
+        public Block8x8F Y;
+
+        public Block8x8F Cb;
+
+        public Block8x8F Cr;
+
+        private RgbToYCbCrTables colorTables;
+
+        private GenericBlock8x8<TPixel> pixelBlock;
+
+        private GenericBlock8x8<Rgb24> rgbBlock;
+
+        public static YCbCrForwardConverter<TPixel> Create()
+        {
+            var result = default(YCbCrForwardConverter<TPixel>);
+            result.colorTables = RgbToYCbCrTables.Create();
+            return result;
+        }
+
+        public void Convert(IPixelSource<TPixel> pixels, int x, int y)
+        {
+
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
index b03b0b534..fcac30a2c 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
@@ -303,15 +303,19 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
             RgbToYCbCrTables* tables,
             int x,
             int y,
-            Block8x8F* yBlock,
-            Block8x8F* cbBlock,
-            Block8x8F* crBlock,
+            ref Block8x8F yBlock,
+            ref Block8x8F cbBlock,
+            ref Block8x8F crBlock,
             PixelArea<TPixel> rgbBytes)
             where TPixel : struct, IPixel<TPixel>
         {
-            float* yBlockRaw = (float*)yBlock;
-            float* cbBlockRaw = (float*)cbBlock;
-            float* crBlockRaw = (float*)crBlock;
+            ref float yBlockStart = ref Unsafe.As<Block8x8F, float>(ref yBlock);
+            ref float cbBlockStart = ref Unsafe.As<Block8x8F, float>(ref cbBlock);
+            ref float crBlockStart = ref Unsafe.As<Block8x8F, float>(ref crBlock);
+
+            float* yBlockRaw = (float*) Unsafe.AsPointer(ref yBlock);
+            float* cbBlockRaw = (float*)Unsafe.AsPointer(ref cbBlock);
+            float* crBlockRaw = (float*)Unsafe.AsPointer(ref crBlock);
 
             rgbBytes.Reset();
             pixels.CopyRGBBytesStretchedTo(rgbBytes, y, x);
@@ -331,7 +335,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
 
                     int index = j8 + i;
 
-                    RgbToYCbCrTables.Rgb2YCbCr(yBlockRaw, cbBlockRaw, crBlockRaw, ref tables, index, r, g, b);
+                    RgbToYCbCrTables.Rgb2YCbCr(tables, yBlockRaw, cbBlockRaw, crBlockRaw, index, r, g, b);
+                    //tables->ConvertPixelInto(
+                    //    r,
+                    //    g,
+                    //    b,
+                    //    ref Unsafe.Add(ref yBlockRaw, index),
+                    //    ref Unsafe.Add(ref cbBlockRaw, index),
+                    //    ref Unsafe.Add(ref crBlockRaw, index));
 
                     dataIdx += 3;
                 }
@@ -460,7 +471,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
                     {
                         for (int x = 0; x < pixels.Width; x += 8)
                         {
-                            ToYCbCr(pixels, tables, x, y, &b, &cb, &cr, rgbBytes);
+                            ToYCbCr(pixels, tables, x, y, ref b, ref cb, ref cr, rgbBytes);
 
                             prevDCY = this.WriteBlock(
                                 QuantIndex.Luminance,
@@ -920,7 +931,15 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
                                 int xOff = (i & 1) * 8;
                                 int yOff = (i & 2) * 4;
 
-                                ToYCbCr(pixels, tables, x + xOff, y + yOff, &b, cbPtr + i, crPtr + i, rgbBytes);
+                                ToYCbCr(
+                                    pixels,
+                                    tables,
+                                    x + xOff,
+                                    y + yOff,
+                                    ref b,
+                                    ref Unsafe.AsRef<Block8x8F>(cbPtr + i),
+                                    ref Unsafe.AsRef<Block8x8F>(crPtr + i),
+                                    rgbBytes);
 
                                 prevDCY = this.WriteBlock(
                                     QuantIndex.Luminance,
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs
index 42a7d56e3..caa7014a4 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs
@@ -7,11 +7,22 @@ using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Utils
 {
+    using SixLabors.ImageSharp.Formats.Jpeg.Common;
+
     /// <summary>
     /// Jpeg specific utilities and extension methods
     /// </summary>
     internal static class OrigJpegUtils
     {
+        /// <summary>
+        /// Stack only TPixel -> Rgb24 conversion method on 8x8 blocks.
+        /// </summary>
+        public static void ConvertToRgbUnsafe<TPixel>(ref GenericBlock8x8<TPixel> source, ref GenericBlock8x8<Rgb24> dest)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            PixelOperations<TPixel>.Instance.ToRgb24(source.AsSpanUnsafe(), dest.AsSpanUnsafe(), 64);
+        }
+
         /// <summary>
         /// Copy a region of an image into dest. De "outlier" area will be stretched out with pixels on the right and bottom of the image.
         /// </summary>

From de816e3c049395b56c5b10a75e7a678e363748ff Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Thu, 22 Feb 2018 18:48:32 +0100
Subject: [PATCH 45/70] build fix: MakeOpaque()

---
 tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
index 1315654c6..e9dc09989 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
@@ -30,10 +30,11 @@ namespace SixLabors.ImageSharp.Tests
         public static void MakeOpaque<TPixel>(this IImageProcessingContext<TPixel> ctx)
             where TPixel : struct, IPixel<TPixel>
         {
+            MemoryManager memoryManager = ctx.MemoryManager;
             ctx.Apply(
                 img =>
                     {
-                        using (var temp = new Buffer2D<Vector4>(img.Width, img.Height))
+                        using (Buffer2D<Vector4> temp = memoryManager.Allocate2D<Vector4>(img.Width, img.Height))
                         {
                             Span<Vector4> tempSpan = temp.Span;
                             foreach (ImageFrame<TPixel> frame in img.Frames)

From e2cf90e683fe211cd1e4e3a49cadf270dd10762e Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Thu, 22 Feb 2018 20:22:53 +0100
Subject: [PATCH 46/70] YCbCrForwardConverter<TPixel>

---
 .../Components/Encoder/RgbToYCbCrTables.cs    | 24 +++++++++++++++++++
 .../Jpeg/GolangPort/JpegEncoderCore.cs        | 23 ++++++++----------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
index 01fe51c8d..86b3fc903 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
@@ -9,6 +9,8 @@ using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
 {
+    using System;
+
     /// <summary>
     /// Provides 8-bit lookup tables for converting from Rgb to YCbCr colorspace.
     /// Methods to build the tables are based on libjpeg implementation.
@@ -179,7 +181,29 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
 
         public void Convert(IPixelSource<TPixel> pixels, int x, int y)
         {
+            this.pixelBlock.LoadAndStretchEdges(pixels, x, y);
+
+            Span<Rgb24> rgbSpan = this.rgbBlock.AsSpanUnsafe();
+            PixelOperations<TPixel>.Instance.ToRgb24(this.pixelBlock.AsSpanUnsafe(), rgbSpan, 64);
+
+            ref float yBlockStart = ref Unsafe.As<Block8x8F, float>(ref this.Y);
+            ref float cbBlockStart = ref Unsafe.As<Block8x8F, float>(ref this.Cb);
+            ref float crBlockStart = ref Unsafe.As<Block8x8F, float>(ref this.Cr);
+            ref Rgb24 rgbStart = ref rgbSpan[0];
 
+            for (int i = 0; i < 64; i++)
+            {
+                ref Rgb24 c = ref Unsafe.Add(ref rgbStart, i);
+
+                this.colorTables.ConvertPixelInto(
+                    c.R,
+                    c.G,
+                    c.B,
+                    ref Unsafe.Add(ref yBlockStart, i),
+                    ref Unsafe.Add(ref cbBlockStart, i),
+                    ref Unsafe.Add(ref crBlockStart, i)
+                    );
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
index fcac30a2c..e67a3f020 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
@@ -313,11 +313,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
             ref float cbBlockStart = ref Unsafe.As<Block8x8F, float>(ref cbBlock);
             ref float crBlockStart = ref Unsafe.As<Block8x8F, float>(ref crBlock);
 
-            float* yBlockRaw = (float*) Unsafe.AsPointer(ref yBlock);
-            float* cbBlockRaw = (float*)Unsafe.AsPointer(ref cbBlock);
-            float* crBlockRaw = (float*)Unsafe.AsPointer(ref crBlock);
-
-            rgbBytes.Reset();
             pixels.CopyRGBBytesStretchedTo(rgbBytes, y, x);
 
             ref byte data0 = ref rgbBytes.Bytes[0];
@@ -335,14 +330,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
 
                     int index = j8 + i;
 
-                    RgbToYCbCrTables.Rgb2YCbCr(tables, yBlockRaw, cbBlockRaw, crBlockRaw, index, r, g, b);
-                    //tables->ConvertPixelInto(
-                    //    r,
-                    //    g,
-                    //    b,
-                    //    ref Unsafe.Add(ref yBlockRaw, index),
-                    //    ref Unsafe.Add(ref cbBlockRaw, index),
-                    //    ref Unsafe.Add(ref crBlockRaw, index));
+                    // RgbToYCbCrTables.Rgb2YCbCr(tables, yBlockRaw, cbBlockRaw, crBlockRaw, index, r, g, b);
+                    tables->ConvertPixelInto(
+                        r,
+                        g,
+                        b,
+                        ref Unsafe.Add(ref yBlockStart, index),
+                        ref Unsafe.Add(ref cbBlockStart, index),
+                        ref Unsafe.Add(ref crBlockStart, index));
 
                     dataIdx += 3;
                 }
@@ -463,6 +458,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
             // ReSharper disable once InconsistentNaming
             int prevDCY = 0, prevDCCb = 0, prevDCCr = 0;
 
+            YCbCrForwardConverter<TPixel> pixelConverter = YCbCrForwardConverter<TPixel>.Create();
+
             fixed (RgbToYCbCrTables* tables = &rgbToYCbCrTables)
             {
                 using (PixelArea<TPixel> rgbBytes = new PixelArea<TPixel>(8, 8, ComponentOrder.Xyz))

From d137c05046f3f589148f39979325233615deeeb5 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Thu, 22 Feb 2018 20:33:12 +0100
Subject: [PATCH 47/70] Encode444 using YCbCrForwardConverter<TPixel>

---
 .../Jpeg/GolangPort/JpegEncoderCore.cs        | 86 +++++++++----------
 1 file changed, 39 insertions(+), 47 deletions(-)

diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
index e67a3f020..c8be8b02f 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
@@ -232,10 +232,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
             this.WriteDefineHuffmanTables(componentCount);
 
             // Write the image data.
-            using (PixelAccessor<TPixel> pixels = image.Lock())
-            {
-                this.WriteStartOfScan(pixels);
-            }
+            this.WriteStartOfScan(image);
 
             // Write the End Of Image marker.
             this.buffer[0] = OrigJpegConstants.Markers.XFF;
@@ -439,14 +436,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
         /// </summary>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="pixels">The pixel accessor providing access to the image pixels.</param>
-        private void Encode444<TPixel>(PixelAccessor<TPixel> pixels)
+        private void Encode444<TPixel>(Image<TPixel> pixels)
             where TPixel : struct, IPixel<TPixel>
         {
             // TODO: Need a JpegScanEncoder<TPixel> class or struct that encapsulates the scan-encoding implementation. (Similar to JpegScanDecoder.)
-            Block8x8F b = default(Block8x8F);
-            Block8x8F cb = default(Block8x8F);
-            Block8x8F cr = default(Block8x8F);
-
+            // (Partially done with YCbCrForwardConverter<TPixel>)
             Block8x8F temp1 = default(Block8x8F);
             Block8x8F temp2 = default(Block8x8F);
 
@@ -460,42 +454,36 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
 
             YCbCrForwardConverter<TPixel> pixelConverter = YCbCrForwardConverter<TPixel>.Create();
 
-            fixed (RgbToYCbCrTables* tables = &rgbToYCbCrTables)
+            for (int y = 0; y < pixels.Height; y += 8)
             {
-                using (PixelArea<TPixel> rgbBytes = new PixelArea<TPixel>(8, 8, ComponentOrder.Xyz))
+                for (int x = 0; x < pixels.Width; x += 8)
                 {
-                    for (int y = 0; y < pixels.Height; y += 8)
-                    {
-                        for (int x = 0; x < pixels.Width; x += 8)
-                        {
-                            ToYCbCr(pixels, tables, x, y, ref b, ref cb, ref cr, rgbBytes);
-
-                            prevDCY = this.WriteBlock(
-                                QuantIndex.Luminance,
-                                prevDCY,
-                                &b,
-                                &temp1,
-                                &temp2,
-                                &onStackLuminanceQuantTable,
-                                unzig.Data);
-                            prevDCCb = this.WriteBlock(
-                                QuantIndex.Chrominance,
-                                prevDCCb,
-                                &cb,
-                                &temp1,
-                                &temp2,
-                                &onStackChrominanceQuantTable,
-                                unzig.Data);
-                            prevDCCr = this.WriteBlock(
-                                QuantIndex.Chrominance,
-                                prevDCCr,
-                                &cr,
-                                &temp1,
-                                &temp2,
-                                &onStackChrominanceQuantTable,
-                                unzig.Data);
-                        }
-                    }
+                    pixelConverter.Convert(pixels.Frames.RootFrame, x, y);
+
+                    prevDCY = this.WriteBlock(
+                        QuantIndex.Luminance,
+                        prevDCY,
+                        &pixelConverter.Y,
+                        &temp1,
+                        &temp2,
+                        &onStackLuminanceQuantTable,
+                        unzig.Data);
+                    prevDCCb = this.WriteBlock(
+                        QuantIndex.Chrominance,
+                        prevDCCb,
+                        &pixelConverter.Cb,
+                        &temp1,
+                        &temp2,
+                        &onStackChrominanceQuantTable,
+                        unzig.Data);
+                    prevDCCr = this.WriteBlock(
+                        QuantIndex.Chrominance,
+                        prevDCCr,
+                        &pixelConverter.Cr,
+                        &temp1,
+                        &temp2,
+                        &onStackChrominanceQuantTable,
+                        unzig.Data);
                 }
             }
         }
@@ -866,8 +854,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
         /// Writes the StartOfScan marker.
         /// </summary>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <param name="pixels">The pixel accessor providing access to the image pixels.</param>
-        private void WriteStartOfScan<TPixel>(PixelAccessor<TPixel> pixels)
+        /// <param name="image">The pixel accessor providing access to the image pixels.</param>
+        private void WriteStartOfScan<TPixel>(Image<TPixel> image)
             where TPixel : struct, IPixel<TPixel>
         {
             // TODO: Need a JpegScanEncoder<TPixel> class or struct that encapsulates the scan-encoding implementation. (Similar to JpegScanDecoder.)
@@ -877,10 +865,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
             switch (this.subsample)
             {
                 case JpegSubsample.Ratio444:
-                    this.Encode444(pixels);
+                    this.Encode444(image);
                     break;
                 case JpegSubsample.Ratio420:
-                    this.Encode420(pixels);
+                    using (var pixels = image.Lock())
+                    {
+                        this.Encode420(pixels);
+                    }
+                    
                     break;
             }
 

From dc7a0efda02b77487ea81b1fe834c6d52c1e58a9 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Thu, 22 Feb 2018 20:49:06 +0100
Subject: [PATCH 48/70] All PixelArea<T> usages in JpegEncoder replaced by
 GenericBlock8x8<TPixel> + YCbCrForwardConverter<TPixel>

---
 .../Formats/Jpeg/Common/GenericBlock8x8.cs    |   5 +-
 .../Components/Encoder/RgbToYCbCrTables.cs    |  78 +-------------
 .../Encoder/YCbCrForwardConverter{TPixel}.cs  |  83 +++++++++++++++
 .../Jpeg/GolangPort/JpegEncoderCore.cs        | 100 ++++++++----------
 4 files changed, 132 insertions(+), 134 deletions(-)
 create mode 100644 src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/YCbCrForwardConverter{TPixel}.cs

diff --git a/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.cs b/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.cs
index bc5838e9b..aefc86eb1 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.cs
@@ -7,9 +7,12 @@ using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.Common
 {
+    using System.Runtime.InteropServices;
+
     /// <summary>
     /// A generic 8x8 block implementation, useful for manipulating custom 8x8 pixel data.
     /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
     // ReSharper disable once InconsistentNaming
     internal unsafe partial struct GenericBlock8x8<T>
         where T : struct
@@ -87,7 +90,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         }
 
         /// <summary>
-        /// ONLY FOR GenericBlock instances living on the stack!
+        /// Only for on-stack instances!
         /// </summary>
         public Span<T> AsSpanUnsafe() => new Span<T>(Unsafe.AsPointer(ref this), Size);
 
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
index 86b3fc903..923fe244e 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
@@ -2,15 +2,11 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
 {
-    using System;
-
     /// <summary>
     /// Provides 8-bit lookup tables for converting from Rgb to YCbCr colorspace.
     /// Methods to build the tables are based on libjpeg implementation.
@@ -101,27 +97,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
         /// TODO: Replace this logic with SIMD conversion (similar to the one in the decoder)!
         /// Optimized method to allocates the correct y, cb, and cr values to the DCT blocks from the given r, g, b values.
         /// </summary>
-        /// <param name="tables">The reference to the tables instance.</param>
-        /// <param name="yBlockRaw">The The luminance block.</param>
-        /// <param name="cbBlockRaw">The red chroma block.</param>
-        /// <param name="crBlockRaw">The blue chroma block.</param>
-        /// <param name="index">The current index.</param>
-        /// <param name="r">The red value.</param>
-        /// <param name="g">The green value.</param>
-        /// <param name="b">The blue value.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Rgb2YCbCr(RgbToYCbCrTables* tables, float* yBlockRaw, float* cbBlockRaw, float* crBlockRaw, int index, int r, int g, int b)
-        {
-            // float y = (0.299F * r) + (0.587F * g) + (0.114F * b);
-            yBlockRaw[index] = (tables->YRTable[r] + tables->YGTable[g] + tables->YBTable[b]) >> ScaleBits;
-
-            // float cb = 128F + ((-0.168736F * r) - (0.331264F * g) + (0.5F * b));
-            cbBlockRaw[index] = (tables->CbRTable[r] + tables->CbGTable[g] + tables->CbBTable[b]) >> ScaleBits;
-
-            // float b = MathF.Round(y + (1.772F * cb), MidpointRounding.AwayFromZero);
-            crBlockRaw[index] = (tables->CbBTable[r] + tables->CrGTable[g] + tables->CrBTable[b]) >> ScaleBits;
-        }
-
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void ConvertPixelInto(int r, int g, int b, ref float yResult, ref float cbResult, ref float crResult)
         {
@@ -155,55 +130,4 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
             return x >> ScaleBits;
         }
     }
-
-    // TODO!
-    internal struct YCbCrForwardConverter<TPixel>
-        where TPixel : struct, IPixel<TPixel>
-    {
-        public Block8x8F Y;
-
-        public Block8x8F Cb;
-
-        public Block8x8F Cr;
-
-        private RgbToYCbCrTables colorTables;
-
-        private GenericBlock8x8<TPixel> pixelBlock;
-
-        private GenericBlock8x8<Rgb24> rgbBlock;
-
-        public static YCbCrForwardConverter<TPixel> Create()
-        {
-            var result = default(YCbCrForwardConverter<TPixel>);
-            result.colorTables = RgbToYCbCrTables.Create();
-            return result;
-        }
-
-        public void Convert(IPixelSource<TPixel> pixels, int x, int y)
-        {
-            this.pixelBlock.LoadAndStretchEdges(pixels, x, y);
-
-            Span<Rgb24> rgbSpan = this.rgbBlock.AsSpanUnsafe();
-            PixelOperations<TPixel>.Instance.ToRgb24(this.pixelBlock.AsSpanUnsafe(), rgbSpan, 64);
-
-            ref float yBlockStart = ref Unsafe.As<Block8x8F, float>(ref this.Y);
-            ref float cbBlockStart = ref Unsafe.As<Block8x8F, float>(ref this.Cb);
-            ref float crBlockStart = ref Unsafe.As<Block8x8F, float>(ref this.Cr);
-            ref Rgb24 rgbStart = ref rgbSpan[0];
-
-            for (int i = 0; i < 64; i++)
-            {
-                ref Rgb24 c = ref Unsafe.Add(ref rgbStart, i);
-
-                this.colorTables.ConvertPixelInto(
-                    c.R,
-                    c.G,
-                    c.B,
-                    ref Unsafe.Add(ref yBlockStart, i),
-                    ref Unsafe.Add(ref cbBlockStart, i),
-                    ref Unsafe.Add(ref crBlockStart, i)
-                    );
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/YCbCrForwardConverter{TPixel}.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/YCbCrForwardConverter{TPixel}.cs
new file mode 100644
index 000000000..e3d7cd3e5
--- /dev/null
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/YCbCrForwardConverter{TPixel}.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Runtime.CompilerServices;
+using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.PixelFormats;
+
+namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
+{
+    /// <summary>
+    /// On-stack worker struct to efficiently encapsulate the TPixel -> Rgb24 -> YCbCr conversion chain of 8x8 pixel blocks.
+    /// </summary>
+    /// <typeparam name="TPixel">The pixel type to work on</typeparam>
+    internal struct YCbCrForwardConverter<TPixel>
+        where TPixel : struct, IPixel<TPixel>
+    {
+        /// <summary>
+        /// The Y component
+        /// </summary>
+        public Block8x8F Y;
+
+        /// <summary>
+        /// The Cb component
+        /// </summary>
+        public Block8x8F Cb;
+
+        /// <summary>
+        /// The Cr component
+        /// </summary>
+        public Block8x8F Cr;
+
+        /// <summary>
+        /// The color conversion tables
+        /// </summary>
+        private RgbToYCbCrTables colorTables;
+
+        /// <summary>
+        /// Temporal 8x8 block to hold TPixel data
+        /// </summary>
+        private GenericBlock8x8<TPixel> pixelBlock;
+
+        /// <summary>
+        /// Temporal RGB block
+        /// </summary>
+        private GenericBlock8x8<Rgb24> rgbBlock;
+
+        public static YCbCrForwardConverter<TPixel> Create()
+        {
+            var result = default(YCbCrForwardConverter<TPixel>);
+            result.colorTables = RgbToYCbCrTables.Create();
+            return result;
+        }
+
+        /// <summary>
+        /// Converts a 8x8 image area inside 'pixels' at position (x,y) placing the result members of the structure (<see cref="Y"/>, <see cref="Cb"/>, <see cref="Cr"/>)
+        /// </summary>
+        public void Convert(IPixelSource<TPixel> pixels, int x, int y)
+        {
+            this.pixelBlock.LoadAndStretchEdges(pixels, x, y);
+
+            Span<Rgb24> rgbSpan = this.rgbBlock.AsSpanUnsafe();
+            PixelOperations<TPixel>.Instance.ToRgb24(this.pixelBlock.AsSpanUnsafe(), rgbSpan, 64);
+
+            ref float yBlockStart = ref Unsafe.As<Block8x8F, float>(ref this.Y);
+            ref float cbBlockStart = ref Unsafe.As<Block8x8F, float>(ref this.Cb);
+            ref float crBlockStart = ref Unsafe.As<Block8x8F, float>(ref this.Cr);
+            ref Rgb24 rgbStart = ref rgbSpan[0];
+
+            for (int i = 0; i < 64; i++)
+            {
+                ref Rgb24 c = ref Unsafe.Add(ref rgbStart, i);
+
+                this.colorTables.ConvertPixelInto(
+                    c.R,
+                    c.G,
+                    c.B,
+                    ref Unsafe.Add(ref yBlockStart, i),
+                    ref Unsafe.Add(ref cbBlockStart, i),
+                    ref Unsafe.Add(ref crBlockStart, i)
+                );
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
index c8be8b02f..d9ebd265c 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
@@ -868,11 +868,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
                     this.Encode444(image);
                     break;
                 case JpegSubsample.Ratio420:
-                    using (var pixels = image.Lock())
-                    {
-                        this.Encode420(pixels);
-                    }
-                    
+                    this.Encode420(image);
                     break;
             }
 
@@ -886,7 +882,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
         /// </summary>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="pixels">The pixel accessor providing access to the image pixels.</param>
-        private void Encode420<TPixel>(PixelAccessor<TPixel> pixels)
+        private void Encode420<TPixel>(Image<TPixel> pixels)
             where TPixel : struct, IPixel<TPixel>
         {
             // TODO: Need a JpegScanEncoder<TPixel> class or struct that encapsulates the scan-encoding implementation. (Similar to JpegScanDecoder.)
@@ -905,62 +901,54 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
 
             ZigZag unzig = ZigZag.CreateUnzigTable();
 
+            var pixelConverter = YCbCrForwardConverter<TPixel>.Create();
+
             // ReSharper disable once InconsistentNaming
             int prevDCY = 0, prevDCCb = 0, prevDCCr = 0;
-            fixed (RgbToYCbCrTables* tables = &rgbToYCbCrTables)
+
+            for (int y = 0; y < pixels.Height; y += 16)
             {
-                using (PixelArea<TPixel> rgbBytes = new PixelArea<TPixel>(8, 8, ComponentOrder.Xyz))
+                for (int x = 0; x < pixels.Width; x += 16)
                 {
-                    for (int y = 0; y < pixels.Height; y += 16)
+                    for (int i = 0; i < 4; i++)
                     {
-                        for (int x = 0; x < pixels.Width; x += 16)
-                        {
-                            for (int i = 0; i < 4; i++)
-                            {
-                                int xOff = (i & 1) * 8;
-                                int yOff = (i & 2) * 4;
-
-                                ToYCbCr(
-                                    pixels,
-                                    tables,
-                                    x + xOff,
-                                    y + yOff,
-                                    ref b,
-                                    ref Unsafe.AsRef<Block8x8F>(cbPtr + i),
-                                    ref Unsafe.AsRef<Block8x8F>(crPtr + i),
-                                    rgbBytes);
-
-                                prevDCY = this.WriteBlock(
-                                    QuantIndex.Luminance,
-                                    prevDCY,
-                                    &b,
-                                    &temp1,
-                                    &temp2,
-                                    &onStackLuminanceQuantTable,
-                                    unzig.Data);
-                            }
-
-                            Block8x8F.Scale16X16To8X8(&b, cbPtr);
-                            prevDCCb = this.WriteBlock(
-                                QuantIndex.Chrominance,
-                                prevDCCb,
-                                &b,
-                                &temp1,
-                                &temp2,
-                                &onStackChrominanceQuantTable,
-                                unzig.Data);
-
-                            Block8x8F.Scale16X16To8X8(&b, crPtr);
-                            prevDCCr = this.WriteBlock(
-                                QuantIndex.Chrominance,
-                                prevDCCr,
-                                &b,
-                                &temp1,
-                                &temp2,
-                                &onStackChrominanceQuantTable,
-                                unzig.Data);
-                        }
+                        int xOff = (i & 1) * 8;
+                        int yOff = (i & 2) * 4;
+
+                        pixelConverter.Convert(pixels.Frames.RootFrame, x + xOff, y + yOff);
+
+                        cbPtr[i] = pixelConverter.Cb;
+                        crPtr[i] = pixelConverter.Cr;
+
+                        prevDCY = this.WriteBlock(
+                            QuantIndex.Luminance,
+                            prevDCY,
+                            &pixelConverter.Y,
+                            &temp1,
+                            &temp2,
+                            &onStackLuminanceQuantTable,
+                            unzig.Data);
                     }
+
+                    Block8x8F.Scale16X16To8X8(&b, cbPtr);
+                    prevDCCb = this.WriteBlock(
+                        QuantIndex.Chrominance,
+                        prevDCCb,
+                        &b,
+                        &temp1,
+                        &temp2,
+                        &onStackChrominanceQuantTable,
+                        unzig.Data);
+
+                    Block8x8F.Scale16X16To8X8(&b, crPtr);
+                    prevDCCr = this.WriteBlock(
+                        QuantIndex.Chrominance,
+                        prevDCCr,
+                        &b,
+                        &temp1,
+                        &temp2,
+                        &onStackChrominanceQuantTable,
+                        unzig.Data);
                 }
             }
         }

From 99320bb74fa964747af8b20e41dfb9bf8c8373e6 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Thu, 22 Feb 2018 20:55:55 +0100
Subject: [PATCH 49/70] fixing StyleCop errors

---
 .../DefaultInternalImageProcessorContext.cs   |  5 +-
 .../Formats/Jpeg/Common/GenericBlock8x8.cs    | 76 +++++++++----------
 .../Encoder/YCbCrForwardConverter{TPixel}.cs  |  3 +-
 .../Jpeg/GolangPort/Utils/OrigJpegUtils.cs    |  3 +-
 4 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/src/ImageSharp/DefaultInternalImageProcessorContext.cs b/src/ImageSharp/DefaultInternalImageProcessorContext.cs
index d58f6236f..5aba9ae69 100644
--- a/src/ImageSharp/DefaultInternalImageProcessorContext.cs
+++ b/src/ImageSharp/DefaultInternalImageProcessorContext.cs
@@ -36,6 +36,9 @@ namespace SixLabors.ImageSharp
             }
         }
 
+        /// <inheritdoc/>
+        public MemoryManager MemoryManager => this.source.GetConfiguration().MemoryManager;
+
         /// <inheritdoc/>
         public Image<TPixel> Apply()
         {
@@ -74,7 +77,5 @@ namespace SixLabors.ImageSharp
         {
             return this.ApplyProcessor(processor, this.source.Bounds());
         }
-
-        public MemoryManager MemoryManager => this.source.GetConfiguration().MemoryManager;
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.cs b/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.cs
index aefc86eb1..e20e850d7 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.cs
@@ -1,19 +1,18 @@
 using System;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
+// ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Formats.Jpeg.Common
 {
-    using System.Runtime.InteropServices;
-
     /// <summary>
     /// A generic 8x8 block implementation, useful for manipulating custom 8x8 pixel data.
     /// </summary>
     [StructLayout(LayoutKind.Sequential)]
-    // ReSharper disable once InconsistentNaming
     internal unsafe partial struct GenericBlock8x8<T>
         where T : struct
     {
@@ -21,6 +20,40 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
 
         public const int SizeInBytes = Size * 3;
 
+        /// <summary>
+        /// FOR TESTING ONLY!
+        /// Gets or sets a <see cref="Rgb24"/> value at the given index
+        /// </summary>
+        /// <param name="idx">The index</param>
+        /// <returns>The value</returns>
+        public T this[int idx]
+        {
+            get
+            {
+                ref T selfRef = ref Unsafe.As<GenericBlock8x8<T>, T>(ref this);
+                return Unsafe.Add(ref selfRef, idx);
+            }
+
+            set
+            {
+                ref T selfRef = ref Unsafe.As<GenericBlock8x8<T>, T>(ref this);
+                Unsafe.Add(ref selfRef, idx) = value;
+            }
+        }
+
+        /// <summary>
+        /// FOR TESTING ONLY!
+        /// Gets or sets a value in a row+coulumn of the 8x8 block
+        /// </summary>
+        /// <param name="x">The x position index in the row</param>
+        /// <param name="y">The column index</param>
+        /// <returns>The value</returns>
+        public T this[int x, int y]
+        {
+            get => this[(y * 8) + x];
+            set => this[(y * 8) + x] = value;
+        }
+
         public void LoadAndStretchEdges<TPixel>(IPixelSource<TPixel> source, int sourceX, int sourceY)
             where TPixel : struct, IPixel<TPixel>
         {
@@ -52,8 +85,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
 
             ref byte blockStart = ref Unsafe.As<GenericBlock8x8<T>, byte>(ref this);
             ref byte imageStart = ref Unsafe.As<T, byte>(
-                                      ref Unsafe.Add(ref source.GetRowSpan(sourceY).DangerousGetPinnableReference(), sourceX)
-                                  );
+                                      ref Unsafe.Add(ref source.GetRowSpan(sourceY).DangerousGetPinnableReference(), sourceX));
 
             int blockRowSizeInBytes = 8 * Unsafe.SizeOf<T>();
             int imageRowSizeInBytes = source.Width * Unsafe.SizeOf<T>();
@@ -93,39 +125,5 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         /// Only for on-stack instances!
         /// </summary>
         public Span<T> AsSpanUnsafe() => new Span<T>(Unsafe.AsPointer(ref this), Size);
-
-        /// <summary>
-        /// FOR TESTING ONLY!
-        /// Gets or sets a <see cref="Rgb24"/> value at the given index
-        /// </summary>
-        /// <param name="idx">The index</param>
-        /// <returns>The value</returns>
-        public T this[int idx]
-        {
-            get
-            {
-                ref T selfRef = ref Unsafe.As<GenericBlock8x8<T>, T>(ref this);
-                return Unsafe.Add(ref selfRef, idx);
-            }
-
-            set
-            {
-                ref T selfRef = ref Unsafe.As<GenericBlock8x8<T>, T>(ref this);
-                Unsafe.Add(ref selfRef, idx) = value;
-            }
-        }
-
-        /// <summary>
-        /// FOR TESTING ONLY!
-        /// Gets or sets a value in a row+coulumn of the 8x8 block
-        /// </summary>
-        /// <param name="x">The x position index in the row</param>
-        /// <param name="y">The column index</param>
-        /// <returns>The value</returns>
-        public T this[int x, int y]
-        {
-            get => this[(y * 8) + x];
-            set => this[(y * 8) + x] = value;
-        }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/YCbCrForwardConverter{TPixel}.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/YCbCrForwardConverter{TPixel}.cs
index e3d7cd3e5..3c95a8508 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/YCbCrForwardConverter{TPixel}.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/YCbCrForwardConverter{TPixel}.cs
@@ -75,8 +75,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
                     c.B,
                     ref Unsafe.Add(ref yBlockStart, i),
                     ref Unsafe.Add(ref cbBlockStart, i),
-                    ref Unsafe.Add(ref crBlockStart, i)
-                );
+                    ref Unsafe.Add(ref crBlockStart, i));
             }
         }
     }
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs
index caa7014a4..ef52f6af3 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs
@@ -3,12 +3,11 @@
 
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using SixLabors.ImageSharp.Formats.Jpeg.Common;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Utils
 {
-    using SixLabors.ImageSharp.Formats.Jpeg.Common;
-
     /// <summary>
     /// Jpeg specific utilities and extension methods
     /// </summary>

From c64374bbe7c0cf62910defd2e5c15584bb3d8c63 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Thu, 22 Feb 2018 21:02:01 +0100
Subject: [PATCH 50/70] cleanup

---
 .../Jpeg/GolangPort/JpegEncoderCore.cs        |  59 ----------
 .../Jpeg/GolangPort/Utils/OrigJpegUtils.cs    |  98 -----------------
 src/ImageSharp/ImageSharp.csproj              |   3 +
 .../Formats/Jpg/JpegUtilsTests.cs             | 102 ------------------
 .../Jpg/ReferenceImplementationsTests.cs      |   2 -
 ...ceImplementations.LLM_FloatingPoint_DCT.cs |   1 -
 6 files changed, 3 insertions(+), 262 deletions(-)
 delete mode 100644 src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs
 delete mode 100644 tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs

diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
index d9ebd265c..ba40ef72b 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
@@ -7,7 +7,6 @@ using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Formats.Jpeg.Common;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Utils;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.MetaData.Profiles.Icc;
@@ -283,64 +282,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
             }
         }
 
-        /// <summary>
-        /// Converts the 8x8 region of the image whose top-left corner is x,y to its YCbCr values.
-        /// </summary>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <param name="pixels">The pixel accessor.</param>
-        /// <param name="tables">The reference to the tables instance.</param>
-        /// <param name="x">The x-position within the image.</param>
-        /// <param name="y">The y-position within the image.</param>
-        /// <param name="yBlock">The luminance block.</param>
-        /// <param name="cbBlock">The red chroma block.</param>
-        /// <param name="crBlock">The blue chroma block.</param>
-        /// <param name="rgbBytes">Temporal <see cref="PixelArea{TPixel}"/> provided by the caller</param>
-        private static void ToYCbCr<TPixel>(
-            PixelAccessor<TPixel> pixels,
-            RgbToYCbCrTables* tables,
-            int x,
-            int y,
-            ref Block8x8F yBlock,
-            ref Block8x8F cbBlock,
-            ref Block8x8F crBlock,
-            PixelArea<TPixel> rgbBytes)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            ref float yBlockStart = ref Unsafe.As<Block8x8F, float>(ref yBlock);
-            ref float cbBlockStart = ref Unsafe.As<Block8x8F, float>(ref cbBlock);
-            ref float crBlockStart = ref Unsafe.As<Block8x8F, float>(ref crBlock);
-
-            pixels.CopyRGBBytesStretchedTo(rgbBytes, y, x);
-
-            ref byte data0 = ref rgbBytes.Bytes[0];
-            int dataIdx = 0;
-
-            for (int j = 0; j < 8; j++)
-            {
-                int j8 = j * 8;
-                for (int i = 0; i < 8; i++)
-                {
-                    // Convert returned bytes into the YCbCr color space. Assume RGBA
-                    int r = Unsafe.Add(ref data0, dataIdx);
-                    int g = Unsafe.Add(ref data0, dataIdx + 1);
-                    int b = Unsafe.Add(ref data0, dataIdx + 2);
-
-                    int index = j8 + i;
-
-                    // RgbToYCbCrTables.Rgb2YCbCr(tables, yBlockRaw, cbBlockRaw, crBlockRaw, index, r, g, b);
-                    tables->ConvertPixelInto(
-                        r,
-                        g,
-                        b,
-                        ref Unsafe.Add(ref yBlockStart, index),
-                        ref Unsafe.Add(ref cbBlockStart, index),
-                        ref Unsafe.Add(ref crBlockStart, index));
-
-                    dataIdx += 3;
-                }
-            }
-        }
-
         /// <summary>
         /// Emits the least significant count of bits of bits to the bit-stream.
         /// The precondition is bits
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs
deleted file mode 100644
index ef52f6af3..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OrigJpegUtils.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
-using SixLabors.ImageSharp.PixelFormats;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Utils
-{
-    /// <summary>
-    /// Jpeg specific utilities and extension methods
-    /// </summary>
-    internal static class OrigJpegUtils
-    {
-        /// <summary>
-        /// Stack only TPixel -> Rgb24 conversion method on 8x8 blocks.
-        /// </summary>
-        public static void ConvertToRgbUnsafe<TPixel>(ref GenericBlock8x8<TPixel> source, ref GenericBlock8x8<Rgb24> dest)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            PixelOperations<TPixel>.Instance.ToRgb24(source.AsSpanUnsafe(), dest.AsSpanUnsafe(), 64);
-        }
-
-        /// <summary>
-        /// Copy a region of an image into dest. De "outlier" area will be stretched out with pixels on the right and bottom of the image.
-        /// </summary>
-        /// <typeparam name="TPixel">The pixel type</typeparam>
-        /// <param name="pixels">The input pixel acessor</param>
-        /// <param name="dest">The destination <see cref="PixelArea{TPixel}"/></param>
-        /// <param name="sourceY">Starting Y coord</param>
-        /// <param name="sourceX">Starting X coord</param>
-        public static void CopyRGBBytesStretchedTo<TPixel>(
-            this PixelAccessor<TPixel> pixels,
-            PixelArea<TPixel> dest,
-            int sourceY,
-            int sourceX)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            pixels.SafeCopyTo(dest, sourceY, sourceX);
-            int stretchFromX = pixels.Width - sourceX;
-            int stretchFromY = pixels.Height - sourceY;
-            StretchPixels(dest, stretchFromX, stretchFromY);
-        }
-
-        // Nothing to stretch if (fromX, fromY) is outside the area, or is at (0,0)
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static bool IsInvalidStretchStartingPosition<TPixel>(PixelArea<TPixel> area, int fromX, int fromY)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            return fromX <= 0 || fromY <= 0 || fromX >= area.Width || fromY >= area.Height;
-        }
-
-        private static void StretchPixels<TPixel>(PixelArea<TPixel> area, int fromX, int fromY)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            if (IsInvalidStretchStartingPosition(area, fromX, fromY))
-            {
-                return;
-            }
-
-            for (int y = 0; y < fromY; y++)
-            {
-                ref RGB24 ptrBase = ref GetRowStart(area, y);
-
-                for (int x = fromX; x < area.Width; x++)
-                {
-                    // Copy the left neighbour pixel to the current one
-                    Unsafe.Add(ref ptrBase, x) = Unsafe.Add(ref ptrBase, x - 1);
-                }
-            }
-
-            for (int y = fromY; y < area.Height; y++)
-            {
-                ref RGB24 currBase = ref GetRowStart(area, y);
-                ref RGB24 prevBase = ref GetRowStart(area, y - 1);
-
-                for (int x = 0; x < area.Width; x++)
-                {
-                    // Copy the top neighbour pixel to the current one
-                    Unsafe.Add(ref currBase, x) = Unsafe.Add(ref prevBase, x);
-                }
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static ref RGB24 GetRowStart<TPixel>(PixelArea<TPixel> area, int y)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            return ref Unsafe.As<byte, RGB24>(ref area.GetRowSpan(y).DangerousGetPinnableReference());
-        }
-
-        [StructLayout(LayoutKind.Sequential, Size = 3)]
-        private struct RGB24
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
index 8b89499ea..833b9b96d 100644
--- a/src/ImageSharp/ImageSharp.csproj
+++ b/src/ImageSharp/ImageSharp.csproj
@@ -127,4 +127,7 @@
       <DependentUpon>PorterDuffFunctions.Generated.tt</DependentUpon>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Formats\Jpeg\GolangPort\Utils\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs
deleted file mode 100644
index 6fe6a9bfd..000000000
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.Numerics;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Utils;
-using SixLabors.ImageSharp.PixelFormats;
-using Xunit;
-
-// ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Tests.Formats.Jpg
-{
-    public class JpegUtilsTests
-    {
-        public static Image<TPixel> CreateTestImage<TPixel>()
-            where TPixel : struct, IPixel<TPixel>
-        {
-            var image = new Image<TPixel>(10, 10);
-            using (PixelAccessor<TPixel> pixels = image.Lock())
-            {
-                for (int i = 0; i < 10; i++)
-                {
-                    for (int j = 0; j < 10; j++)
-                    {
-                        var v = new Vector4(i / 10f, j / 10f, 0, 1);
-
-                        var color = default(TPixel);
-                        color.PackFromVector4(v);
-
-                        pixels[i, j] = color;
-                    }
-                }
-            }
-
-            return image;
-        }
-
-        [Theory]
-        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.Rgba32| PixelTypes.Rgba32 | PixelTypes.Argb32)]
-        public void CopyStretchedRGBTo_FromOrigo<TPixel>(TestImageProvider<TPixel> provider)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            using (Image<TPixel> src = provider.GetImage())
-            using (Image<TPixel> dest = new Image<TPixel>(8,8))
-            using (PixelArea<TPixel> area = new PixelArea<TPixel>(8, 8, ComponentOrder.Xyz))
-            using (PixelAccessor<TPixel> s = src.Lock())
-            using (PixelAccessor<TPixel> d = dest.Lock())
-            {
-                s.CopyRGBBytesStretchedTo(area, 0, 0);
-                d.CopyFrom(area, 0, 0);
-
-                Assert.Equal(s[0, 0], d[0, 0]);
-                Assert.Equal(s[7, 0], d[7, 0]);
-                Assert.Equal(s[0, 7], d[0, 7]);
-                Assert.Equal(s[7, 7], d[7, 7]);
-            }
-
-        }
-
-        [Theory]
-        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.Rgba32| PixelTypes.Rgba32 | PixelTypes.Argb32)]
-        public void CopyStretchedRGBTo_WithOffset<TPixel>(TestImageProvider<TPixel> provider)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            using (Image<TPixel> src = provider.GetImage())
-            using (PixelArea<TPixel> area = new PixelArea<TPixel>(8, 8, ComponentOrder.Xyz))
-            using (Image<TPixel> dest = new Image<TPixel>(8, 8))
-            using (PixelAccessor<TPixel> s = src.Lock())
-            using (PixelAccessor<TPixel> d = dest.Lock())
-            {
-                s.CopyRGBBytesStretchedTo(area, 7, 6);
-                d.CopyFrom(area, 0, 0);
-
-                Assert.Equal(s[6, 7], d[0, 0]);
-                Assert.Equal(s[6, 8], d[0, 1]);
-                Assert.Equal(s[7, 8], d[1, 1]);
-
-                Assert.Equal(s[6, 9], d[0, 2]);
-                Assert.Equal(s[6, 9], d[0, 3]);
-                Assert.Equal(s[6, 9], d[0, 7]);
-
-                Assert.Equal(s[7, 9], d[1, 2]);
-                Assert.Equal(s[7, 9], d[1, 3]);
-                Assert.Equal(s[7, 9], d[1, 7]);
-
-                Assert.Equal(s[9, 9], d[3, 2]);
-                Assert.Equal(s[9, 9], d[3, 3]);
-                Assert.Equal(s[9, 9], d[3, 7]);
-
-                Assert.Equal(s[9, 7], d[3, 0]);
-                Assert.Equal(s[9, 7], d[4, 0]);
-                Assert.Equal(s[9, 7], d[7, 0]);
-
-                Assert.Equal(s[9, 9], d[3, 2]);
-                Assert.Equal(s[9, 9], d[4, 2]);
-                Assert.Equal(s[9, 9], d[7, 2]);
-
-                Assert.Equal(s[9, 9], d[4, 3]);
-                Assert.Equal(s[9, 9], d[7, 7]);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs
index 26ec454f9..0276e1708 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Utils;
-
 using Xunit.Abstractions;
 
 // ReSharper disable InconsistentNaming
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.LLM_FloatingPoint_DCT.cs b/tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.LLM_FloatingPoint_DCT.cs
index ef9a73d12..37d42eb72 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.LLM_FloatingPoint_DCT.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.LLM_FloatingPoint_DCT.cs
@@ -6,7 +6,6 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
     using System.Runtime.CompilerServices;
 
     using SixLabors.ImageSharp.Formats.Jpeg.Common;
-    using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Utils;
 
     using Xunit.Abstractions;
 

From 70893d22ad1f7f3ac6762efd43d34e2c221c5d8d Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Thu, 22 Feb 2018 21:34:50 +0100
Subject: [PATCH 51/70] replaced some of the PixelArea usages in bmp decoder

---
 src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs  | 25 +++++++++++++----
 src/ImageSharp/Formats/Bmp/BmpEncoder.cs      |  3 ++-
 src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs  | 27 +++++++++++++++----
 src/ImageSharp/Memory/BufferExtensions.cs     | 12 +++++++++
 .../Memory/MemoryManagerExtensions.cs         | 18 +++++++++++++
 .../Formats/Bmp/BmpEncoderTests.cs            |  2 --
 6 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
index 201c041a2..0c77fc482 100644
--- a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
@@ -69,7 +69,9 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         /// </summary>
         private BmpInfoHeader infoHeader;
 
-        private Configuration configuration;
+        private readonly Configuration configuration;
+
+        private readonly MemoryManager memoryManager;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BmpDecoderCore"/> class.
@@ -79,6 +81,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         public BmpDecoderCore(Configuration configuration, IBmpDecoderOptions options)
         {
             this.configuration = configuration;
+            this.memoryManager = configuration.MemoryManager;
         }
 
         /// <summary>
@@ -432,16 +435,28 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             where TPixel : struct, IPixel<TPixel>
         {
             int padding = CalculatePadding(width, 3);
-            using (var row = new PixelArea<TPixel>(width, ComponentOrder.Zyx, padding))
+
+            using (IManagedByteBuffer row = this.memoryManager.AllocatePaddedPixelRowBuffer(width, 3, padding))
             {
                 for (int y = 0; y < height; y++)
                 {
-                    row.Read(this.currentStream);
-
+                    this.currentStream.Read(row);
                     int newY = Invert(y, height, inverted);
-                    pixels.CopyFrom(row, newY);
+                    Span<TPixel> pixelSpan = pixels.GetRowSpan(newY);
+                    PixelOperations<TPixel>.Instance.PackFromBgr24Bytes(row.Span, pixelSpan, width);
                 }
             }
+
+            //using (var row = new PixelArea<TPixel>(width, ComponentOrder.Zyx, padding))
+            //{
+            //    for (int y = 0; y < height; y++)
+            //    {
+            //        row.Read(this.currentStream);
+
+            //        int newY = Invert(y, height, inverted);
+            //        pixels.CopyFrom(row, newY);
+            //    }
+            //}
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Formats/Bmp/BmpEncoder.cs b/src/ImageSharp/Formats/Bmp/BmpEncoder.cs
index 366afceb5..d80e43c63 100644
--- a/src/ImageSharp/Formats/Bmp/BmpEncoder.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpEncoder.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Formats.Bmp
@@ -23,7 +24,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         public void Encode<TPixel>(Image<TPixel> image, Stream stream)
             where TPixel : struct, IPixel<TPixel>
         {
-            var encoder = new BmpEncoderCore(this);
+            var encoder = new BmpEncoderCore(this, image.GetMemoryManager());
             encoder.Encode(image, stream);
         }
     }
diff --git a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
index d34d17084..26d16cea3 100644
--- a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
@@ -8,6 +8,8 @@ using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Formats.Bmp
 {
+    using SixLabors.ImageSharp.Memory;
+
     /// <summary>
     /// Image encoder for writing an image to a stream as a Windows bitmap.
     /// </summary>
@@ -21,14 +23,18 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         /// <summary>
         /// Gets or sets the number of bits per pixel.
         /// </summary>
-        private BmpBitsPerPixel bitsPerPixel;
+        private readonly BmpBitsPerPixel bitsPerPixel;
+
+        private readonly MemoryManager memoryManager;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BmpEncoderCore"/> class.
         /// </summary>
         /// <param name="options">The encoder options</param>
-        public BmpEncoderCore(IBmpEncoderOptions options)
+        /// <param name="memoryManager">The memory manager</param>
+        public BmpEncoderCore(IBmpEncoderOptions options, MemoryManager memoryManager)
         {
+            this.memoryManager = memoryManager;
             this.bitsPerPixel = options.BitsPerPixel;
         }
 
@@ -173,14 +179,25 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         private void Write24Bit<TPixel>(EndianBinaryWriter writer, PixelAccessor<TPixel> pixels)
             where TPixel : struct, IPixel<TPixel>
         {
-            using (PixelArea<TPixel> row = new PixelArea<TPixel>(pixels.Width, ComponentOrder.Zyx, this.padding))
+            using (IManagedByteBuffer row =
+                this.memoryManager.AllocatePaddedPixelRowBuffer(pixels.Width, 3, this.padding))
             {
                 for (int y = pixels.Height - 1; y >= 0; y--)
                 {
-                    pixels.CopyTo(row, y);
-                    writer.Write(row.Bytes, 0, row.Length);
+                    Span<TPixel> pixelSpan = pixels.GetRowSpan(y);
+                    PixelOperations<TPixel>.Instance.ToBgr24Bytes(pixelSpan, row.Span, pixelSpan.Length);
+                    writer.Write(row.Array, 0, row.Length());
                 }
             }
+
+            //using (PixelArea<TPixel> row = new PixelArea<TPixel>(pixels.Width, ComponentOrder.Zyx, this.padding))
+            //{
+            //    for (int y = pixels.Height - 1; y >= 0; y--)
+            //    {
+            //        pixels.CopyTo(row, y);
+            //        writer.Write(row.Bytes, 0, row.Length);
+            //    }
+            //}
         }
     }
 }
diff --git a/src/ImageSharp/Memory/BufferExtensions.cs b/src/ImageSharp/Memory/BufferExtensions.cs
index b863dfc9a..882b8875f 100644
--- a/src/ImageSharp/Memory/BufferExtensions.cs
+++ b/src/ImageSharp/Memory/BufferExtensions.cs
@@ -6,6 +6,8 @@ using System.Runtime.CompilerServices;
 
 namespace SixLabors.ImageSharp.Memory
 {
+    using System.IO;
+
     internal static class BufferExtensions
     {
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -53,5 +55,15 @@ namespace SixLabors.ImageSharp.Memory
         public static ref T DangerousGetPinnableReference<T>(this IBuffer<T> buffer)
             where T : struct =>
             ref buffer.Span.DangerousGetPinnableReference();
+
+        public static void Read(this Stream stream, IManagedByteBuffer buffer)
+        {
+            stream.Read(buffer.Array, 0, buffer.Length());
+        }
+
+        public static void Write(this Stream stream, IManagedByteBuffer buffer)
+        {
+            stream.Write(buffer.Array, 0, buffer.Length());
+        }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/MemoryManagerExtensions.cs b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
index b7fcaf4b3..3511d2039 100644
--- a/src/ImageSharp/Memory/MemoryManagerExtensions.cs
+++ b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
@@ -51,5 +51,23 @@
         public static Buffer2D<T> AllocateClean2D<T>(this MemoryManager memoryManager, int width, int height)
             where T : struct =>
             Allocate2D<T>(memoryManager, width, height, true);
+
+        /// <summary>
+        /// Allocates padded buffers for BMP encoder/decoder. (Replacing old PixelRow/PixelArea)
+        /// </summary>
+        /// <param name="memoryManager">The <see cref="MemoryManager"/></param>
+        /// <param name="width">Pixel count in the row</param>
+        /// <param name="pixelSizeInBytes">The pixel size in bytes, eg. 3 for RGB</param>
+        /// <param name="paddingInBytes">The padding</param>
+        /// <returns>A <see cref="IManagedByteBuffer"/></returns>
+        public static IManagedByteBuffer AllocatePaddedPixelRowBuffer(
+            this MemoryManager memoryManager,
+            int width,
+            int pixelSizeInBytes,
+            int paddingInBytes)
+        {
+            int length = (width * pixelSizeInBytes) + paddingInBytes;
+            return memoryManager.AllocateManagedByteBuffer(length);
+        }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
index 362df2be6..a4ed0c0fd 100644
--- a/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
@@ -15,8 +15,6 @@ namespace SixLabors.ImageSharp.Tests
 
     public class BmpEncoderTests : FileTestBase
     {
-        private const PixelTypes PixelTypesToTest = PixelTypes.Rgba32 | PixelTypes.Bgra32 | PixelTypes.Rgb24;
-
         public static readonly TheoryData<BmpBitsPerPixel> BitsPerPixel =
             new TheoryData<BmpBitsPerPixel>
                 {

From a61707661c0b2303411039011b955288633af9fe Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Fri, 23 Feb 2018 00:52:44 +0100
Subject: [PATCH 52/70] removed PixelArea<T>!

---
 src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs  |  20 +-
 src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs  |  24 +-
 src/ImageSharp/Formats/Gif/GifDecoderCore.cs  |  47 +--
 src/ImageSharp/Image/ImageFrame{TPixel}.cs    |  42 +--
 src/ImageSharp/Image/PixelAccessor{TPixel}.cs | 303 ------------------
 src/ImageSharp/Image/PixelArea{TPixel}.cs     | 212 ------------
 src/ImageSharp/Memory/BufferArea{T}.cs        |  31 ++
 .../Image/PixelAccessorTests.cs               | 246 --------------
 .../Memory/BufferAreaTests.cs                 |  33 ++
 9 files changed, 125 insertions(+), 833 deletions(-)
 delete mode 100644 src/ImageSharp/Image/PixelArea{TPixel}.cs
 delete mode 100644 tests/ImageSharp.Tests/Image/PixelAccessorTests.cs

diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
index 0c77fc482..953a6fcb2 100644
--- a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
@@ -446,17 +446,6 @@ namespace SixLabors.ImageSharp.Formats.Bmp
                     PixelOperations<TPixel>.Instance.PackFromBgr24Bytes(row.Span, pixelSpan, width);
                 }
             }
-
-            //using (var row = new PixelArea<TPixel>(width, ComponentOrder.Zyx, padding))
-            //{
-            //    for (int y = 0; y < height; y++)
-            //    {
-            //        row.Read(this.currentStream);
-
-            //        int newY = Invert(y, height, inverted);
-            //        pixels.CopyFrom(row, newY);
-            //    }
-            //}
         }
 
         /// <summary>
@@ -471,14 +460,15 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             where TPixel : struct, IPixel<TPixel>
         {
             int padding = CalculatePadding(width, 4);
-            using (var row = new PixelArea<TPixel>(width, ComponentOrder.Zyxw, padding))
+
+            using (IManagedByteBuffer row = this.memoryManager.AllocatePaddedPixelRowBuffer(width, 4, padding))
             {
                 for (int y = 0; y < height; y++)
                 {
-                    row.Read(this.currentStream);
-
+                    this.currentStream.Read(row);
                     int newY = Invert(y, height, inverted);
-                    pixels.CopyFrom(row, newY);
+                    Span<TPixel> pixelSpan = pixels.GetRowSpan(newY);
+                    PixelOperations<TPixel>.Instance.PackFromBgra32Bytes(row.Span, pixelSpan, width);
                 }
             }
         }
diff --git a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
index 26d16cea3..5b85e9cb9 100644
--- a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
@@ -151,6 +151,11 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             }
         }
 
+        private IManagedByteBuffer AllocateRow(int width, int bytesPerPixel)
+        {
+            return this.memoryManager.AllocatePaddedPixelRowBuffer(width, bytesPerPixel, this.padding);
+        }
+
         /// <summary>
         /// Writes the 32bit color palette to the stream.
         /// </summary>
@@ -160,12 +165,13 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         private void Write32Bit<TPixel>(EndianBinaryWriter writer, PixelAccessor<TPixel> pixels)
             where TPixel : struct, IPixel<TPixel>
         {
-            using (PixelArea<TPixel> row = new PixelArea<TPixel>(pixels.Width, ComponentOrder.Zyxw, this.padding))
+            using (IManagedByteBuffer row = this.AllocateRow(pixels.Width, 4))
             {
                 for (int y = pixels.Height - 1; y >= 0; y--)
                 {
-                    pixels.CopyTo(row, y);
-                    writer.Write(row.Bytes, 0, row.Length);
+                    Span<TPixel> pixelSpan = pixels.GetRowSpan(y);
+                    PixelOperations<TPixel>.Instance.ToBgra32Bytes(pixelSpan, row.Span, pixelSpan.Length);
+                    writer.Write(row.Array, 0, row.Length());
                 }
             }
         }
@@ -179,8 +185,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         private void Write24Bit<TPixel>(EndianBinaryWriter writer, PixelAccessor<TPixel> pixels)
             where TPixel : struct, IPixel<TPixel>
         {
-            using (IManagedByteBuffer row =
-                this.memoryManager.AllocatePaddedPixelRowBuffer(pixels.Width, 3, this.padding))
+            using (IManagedByteBuffer row = this.AllocateRow(pixels.Width, 3))
             {
                 for (int y = pixels.Height - 1; y >= 0; y--)
                 {
@@ -189,15 +194,6 @@ namespace SixLabors.ImageSharp.Formats.Bmp
                     writer.Write(row.Array, 0, row.Length());
                 }
             }
-
-            //using (PixelArea<TPixel> row = new PixelArea<TPixel>(pixels.Width, ComponentOrder.Zyx, this.padding))
-            //{
-            //    for (int y = pixels.Height - 1; y >= 0; y--)
-            //    {
-            //        pixels.CopyTo(row, y);
-            //        writer.Write(row.Bytes, 0, row.Length);
-            //    }
-            //}
         }
     }
 }
diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
index da92665be..8fd7f04d2 100644
--- a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
@@ -542,28 +542,31 @@ namespace SixLabors.ImageSharp.Formats.Gif
                 return;
             }
 
-            // Optimization for when the size of the frame is the same as the image size.
-            if (this.restoreArea.Value.Width == imageWidth &&
-                this.restoreArea.Value.Height == imageHeight)
-            {
-                using (PixelAccessor<TPixel> pixelAccessor = frame.Lock())
-                {
-                    pixelAccessor.Reset();
-                }
-            }
-            else
-            {
-                using (var emptyRow = new PixelArea<TPixel>(this.restoreArea.Value.Width, ComponentOrder.Xyzw))
-                {
-                    using (PixelAccessor<TPixel> pixelAccessor = frame.Lock())
-                    {
-                        for (int y = this.restoreArea.Value.Top; y < this.restoreArea.Value.Top + this.restoreArea.Value.Height; y++)
-                        {
-                            pixelAccessor.CopyFrom(emptyRow, y, this.restoreArea.Value.Left);
-                        }
-                    }
-                }
-            }
+            BufferArea<TPixel> pixelArea = frame.PixelBuffer.GetArea(this.restoreArea.Value);
+            pixelArea.Clear();
+
+            //if (this.restoreArea.Value.Width == imageWidth &&
+            //    this.restoreArea.Value.Height == imageHeight)
+            //{
+            //    using (PixelAccessor<TPixel> pixelAccessor = frame.Lock())
+            //    {
+            //        pixelAccessor.Reset();
+            //    }
+            //}
+            //else
+            //{
+
+            //    using (var emptyRow = new PixelArea<TPixel>(this.restoreArea.Value.Width, ComponentOrder.Xyzw))
+            //    {
+            //        using (PixelAccessor<TPixel> pixelAccessor = frame.Lock())
+            //        {
+            //            for (int y = this.restoreArea.Value.Top; y < this.restoreArea.Value.Top + this.restoreArea.Value.Height; y++)
+            //            {
+            //                pixelAccessor.CopyFrom(emptyRow, y, this.restoreArea.Value.Left);
+            //            }
+            //        }
+            //    }
+            //}
 
             this.restoreArea = null;
         }
diff --git a/src/ImageSharp/Image/ImageFrame{TPixel}.cs b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
index 5170522de..163c7a3b0 100644
--- a/src/ImageSharp/Image/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
@@ -21,11 +21,6 @@ namespace SixLabors.ImageSharp
     public sealed class ImageFrame<TPixel> : IPixelSource<TPixel>, IDisposable
         where TPixel : struct, IPixel<TPixel>
     {
-        /// <summary>
-        /// The image pixels. Not private as Buffer2D requires an array in its constructor.
-        /// </summary>
-        private Buffer2D<TPixel> pixelBuffer;
-
         private bool isDisposed;
 
         /// <summary>
@@ -54,7 +49,7 @@ namespace SixLabors.ImageSharp
             Guard.NotNull(metaData, nameof(metaData));
 
             this.MemoryManager = memoryManager;
-            this.pixelBuffer = memoryManager.AllocateClean2D<TPixel>(width, height);
+            this.PixelBuffer = memoryManager.AllocateClean2D<TPixel>(width, height);
             this.MetaData = metaData;
         }
 
@@ -77,8 +72,8 @@ namespace SixLabors.ImageSharp
         internal ImageFrame(MemoryManager memoryManager, ImageFrame<TPixel> source)
         {
             this.MemoryManager = memoryManager;
-            this.pixelBuffer = memoryManager.Allocate2D<TPixel>(source.pixelBuffer.Width, source.pixelBuffer.Height);
-            source.pixelBuffer.Span.CopyTo(this.pixelBuffer.Span);
+            this.PixelBuffer = memoryManager.Allocate2D<TPixel>(source.PixelBuffer.Width, source.PixelBuffer.Height);
+            source.PixelBuffer.Span.CopyTo(this.PixelBuffer.Span);
             this.MetaData = source.MetaData.Clone();
         }
 
@@ -87,18 +82,23 @@ namespace SixLabors.ImageSharp
         /// </summary>
         public MemoryManager MemoryManager { get; }
 
+        /// <summary>
+        /// Gets the image pixels. Not private as Buffer2D requires an array in its constructor.
+        /// </summary>
+        internal Buffer2D<TPixel> PixelBuffer { get; private set; }
+
         /// <inheritdoc/>
-        Buffer2D<TPixel> IPixelSource<TPixel>.PixelBuffer => this.pixelBuffer;
+        Buffer2D<TPixel> IPixelSource<TPixel>.PixelBuffer => this.PixelBuffer;
 
         /// <summary>
         /// Gets the width.
         /// </summary>
-        public int Width => this.pixelBuffer.Width;
+        public int Width => this.PixelBuffer.Width;
 
         /// <summary>
         /// Gets the height.
         /// </summary>
-        public int Height => this.pixelBuffer.Height;
+        public int Height => this.PixelBuffer.Height;
 
         /// <summary>
         /// Gets the meta data of the frame.
@@ -116,13 +116,13 @@ namespace SixLabors.ImageSharp
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
             {
-                return this.pixelBuffer[x, y];
+                return this.PixelBuffer[x, y];
             }
 
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             set
             {
-                this.pixelBuffer[x, y] = value;
+                this.PixelBuffer[x, y] = value;
             }
         }
 
@@ -135,7 +135,7 @@ namespace SixLabors.ImageSharp
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal ref TPixel GetPixelReference(int x, int y)
         {
-            return ref this.pixelBuffer[x, y];
+            return ref this.PixelBuffer[x, y];
         }
 
         /// <summary>
@@ -168,8 +168,8 @@ namespace SixLabors.ImageSharp
             Guard.NotNull(pixelSource, nameof(pixelSource));
 
             // Push my memory into the accessor (which in turn unpins the old buffer ready for the images use)
-            Buffer2D<TPixel> newPixels = pixelSource.SwapBufferOwnership(this.pixelBuffer);
-            this.pixelBuffer = newPixels;
+            Buffer2D<TPixel> newPixels = pixelSource.SwapBufferOwnership(this.PixelBuffer);
+            this.PixelBuffer = newPixels;
         }
 
         /// <summary>
@@ -180,9 +180,9 @@ namespace SixLabors.ImageSharp
         {
             Guard.NotNull(pixelSource, nameof(pixelSource));
 
-            Buffer2D<TPixel> temp = this.pixelBuffer;
-            this.pixelBuffer = pixelSource.pixelBuffer;
-            pixelSource.pixelBuffer = temp;
+            Buffer2D<TPixel> temp = this.PixelBuffer;
+            this.PixelBuffer = pixelSource.PixelBuffer;
+            pixelSource.PixelBuffer = temp;
         }
 
         /// <summary>
@@ -195,8 +195,8 @@ namespace SixLabors.ImageSharp
                 return;
             }
 
-            this.pixelBuffer?.Dispose();
-            this.pixelBuffer = null;
+            this.PixelBuffer?.Dispose();
+            this.PixelBuffer = null;
 
             // Note disposing is done.
             this.isDisposed = true;
diff --git a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
index 3a894fb9a..f1c8531cc 100644
--- a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
+++ b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
@@ -158,65 +158,6 @@ namespace SixLabors.ImageSharp
             this.PixelBuffer.Buffer.Clear();
         }
 
-        /// <summary>
-        /// Copy an area of pixels to the image.
-        /// </summary>
-        /// <param name="area">The area.</param>
-        /// <param name="targetY">The target row index.</param>
-        /// <param name="targetX">The target column index.</param>
-        /// <exception cref="NotSupportedException">
-        /// Thrown when an unsupported component order value is passed.
-        /// </exception>
-        internal void CopyFrom(PixelArea<TPixel> area, int targetY, int targetX = 0)
-        {
-            this.CheckCoordinates(area, targetX, targetY);
-
-            this.CopyFrom(area, targetX, targetY, area.Width, area.Height);
-        }
-
-        /// <summary>
-        /// Copy pixels from the image to an area of pixels.
-        /// </summary>
-        /// <param name="area">The area.</param>
-        /// <param name="sourceY">The source row index.</param>
-        /// <param name="sourceX">The source column index.</param>
-        /// <exception cref="NotSupportedException">
-        /// Thrown when an unsupported component order value is passed.
-        /// </exception>
-        internal void CopyTo(PixelArea<TPixel> area, int sourceY, int sourceX = 0)
-        {
-            this.CheckCoordinates(area, sourceX, sourceY);
-
-            this.CopyTo(area, sourceX, sourceY, area.Width, area.Height);
-        }
-
-        /// <summary>
-        /// Copy pixels from the image to an area of pixels. This method will make sure that the pixels
-        /// that are copied are within the bounds of the image.
-        /// </summary>
-        /// <param name="area">The area.</param>
-        /// <param name="sourceY">The source row index.</param>
-        /// <param name="sourceX">The source column index.</param>
-        /// <exception cref="NotSupportedException">
-        /// Thrown when an unsupported component order value is passed.
-        /// </exception>
-        internal void SafeCopyTo(PixelArea<TPixel> area, int sourceY, int sourceX = 0)
-        {
-            int width = Math.Min(area.Width, this.Width - sourceX);
-            if (width < 1)
-            {
-                return;
-            }
-
-            int height = Math.Min(area.Height, this.Height - sourceY);
-            if (height < 1)
-            {
-                return;
-            }
-
-            this.CopyTo(area, sourceX, sourceY, width, height);
-        }
-
         /// <summary>
         /// Sets the pixel buffer in an unsafe manner. This should not be used unless you know what its doing!!!
         /// </summary>
@@ -239,161 +180,6 @@ namespace SixLabors.ImageSharp
             SpanHelper.Copy(this.PixelBuffer.Span, target.PixelBuffer.Span);
         }
 
-        /// <summary>
-        /// Copies from an area in <see cref="ComponentOrder.Zyx"/> format.
-        /// </summary>
-        /// <param name="area">The area.</param>
-        /// <param name="targetX">The target column index.</param>
-        /// <param name="targetY">The target row index.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyFromZyx(PixelArea<TPixel> area, int targetX, int targetY, int width, int height)
-        {
-            for (int y = 0; y < height; y++)
-            {
-                Span<byte> source = area.GetRowSpan(y);
-                Span<TPixel> destination = this.GetRowSpan(targetX, targetY + y);
-
-                Operations.PackFromBgr24Bytes(source, destination, width);
-            }
-        }
-
-        /// <summary>
-        /// Copies from an area in <see cref="ComponentOrder.Zyxw"/> format.
-        /// </summary>
-        /// <param name="area">The area.</param>
-        /// <param name="targetX">The target column index.</param>
-        /// <param name="targetY">The target row index.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyFromZyxw(PixelArea<TPixel> area, int targetX, int targetY, int width, int height)
-        {
-            for (int y = 0; y < height; y++)
-            {
-                Span<byte> source = area.GetRowSpan(y);
-                Span<TPixel> destination = this.GetRowSpan(targetX, targetY + y);
-
-                Operations.PackFromBgra32Bytes(source, destination, width);
-            }
-        }
-
-        /// <summary>
-        /// Copies from an area in <see cref="ComponentOrder.Xyz"/> format.
-        /// </summary>
-        /// <param name="area">The area.</param>
-        /// <param name="targetX">The target column index.</param>
-        /// <param name="targetY">The target row index.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyFromXyz(PixelArea<TPixel> area, int targetX, int targetY, int width, int height)
-        {
-            for (int y = 0; y < height; y++)
-            {
-                Span<byte> source = area.GetRowSpan(y);
-                Span<TPixel> destination = this.GetRowSpan(targetX, targetY + y);
-
-                Operations.PackFromRgb24Bytes(source, destination, width);
-            }
-        }
-
-        /// <summary>
-        /// Copies from an area in <see cref="ComponentOrder.Xyzw"/> format.
-        /// </summary>
-        /// <param name="area">The area.</param>
-        /// <param name="targetX">The target column index.</param>
-        /// <param name="targetY">The target row index.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyFromXyzw(PixelArea<TPixel> area, int targetX, int targetY, int width, int height)
-        {
-            for (int y = 0; y < height; y++)
-            {
-                Span<byte> source = area.GetRowSpan(y);
-                Span<TPixel> destination = this.GetRowSpan(targetX, targetY + y);
-                Operations.PackFromRgba32Bytes(source, destination, width);
-            }
-        }
-
-        /// <summary>
-        /// Copies to an area in <see cref="ComponentOrder.Zyx"/> format.
-        /// </summary>
-        /// <param name="area">The row.</param>
-        /// <param name="sourceX">The source column index.</param>
-        /// <param name="sourceY">The source row index.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyToZyx(PixelArea<TPixel> area, int sourceX, int sourceY, int width, int height)
-        {
-            for (int y = 0; y < height; y++)
-            {
-                Span<TPixel> source = this.GetRowSpan(sourceX, sourceY + y);
-                Span<byte> destination = area.GetRowSpan(y);
-                Operations.ToBgr24Bytes(source, destination, width);
-            }
-        }
-
-        /// <summary>
-        /// Copies to an area in <see cref="ComponentOrder.Zyxw"/> format.
-        /// </summary>
-        /// <param name="area">The row.</param>
-        /// <param name="sourceX">The source column index.</param>
-        /// <param name="sourceY">The source row index.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyToZyxw(PixelArea<TPixel> area, int sourceX, int sourceY, int width, int height)
-        {
-            for (int y = 0; y < height; y++)
-            {
-                Span<TPixel> source = this.GetRowSpan(sourceX, sourceY + y);
-                Span<byte> destination = area.GetRowSpan(y);
-                Operations.ToBgra32Bytes(source, destination, width);
-            }
-        }
-
-        /// <summary>
-        /// Copies to an area in <see cref="ComponentOrder.Xyz"/> format.
-        /// </summary>
-        /// <param name="area">The row.</param>
-        /// <param name="sourceX">The source column index.</param>
-        /// <param name="sourceY">The source row index.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyToXyz(PixelArea<TPixel> area, int sourceX, int sourceY, int width, int height)
-        {
-            for (int y = 0; y < height; y++)
-            {
-                Span<TPixel> source = this.GetRowSpan(sourceX, sourceY + y);
-                Span<byte> destination = area.GetRowSpan(y);
-                Operations.ToRgb24Bytes(source, destination, width);
-            }
-        }
-
-        /// <summary>
-        /// Copies to an area in <see cref="ComponentOrder.Xyzw"/> format.
-        /// </summary>
-        /// <param name="area">The row.</param>
-        /// <param name="sourceX">The source column index.</param>
-        /// <param name="sourceY">The source row index.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyToXyzw(PixelArea<TPixel> area, int sourceX, int sourceY, int width, int height)
-        {
-            for (int y = 0; y < height; y++)
-            {
-                Span<TPixel> source = this.GetRowSpan(sourceX, sourceY + y);
-                Span<byte> destination = area.GetRowSpan(y);
-                Operations.ToRgba32Bytes(source, destination, width);
-            }
-        }
-
         /// <summary>
         /// Sets the pixel buffer in an unsafe manor this should not be used unless you know what its doing!!!
         /// </summary>
@@ -410,95 +196,6 @@ namespace SixLabors.ImageSharp
             this.RowStride = this.Width * this.PixelSize;
         }
 
-        /// <summary>
-        /// Copy an area of pixels to the image.
-        /// </summary>
-        /// <param name="area">The area.</param>
-        /// <param name="targetX">The target column index.</param>
-        /// <param name="targetY">The target row index.</param>
-        /// <param name="width">The width of the area to copy.</param>
-        /// <param name="height">The height of the area to copy.</param>
-        /// <exception cref="NotSupportedException">
-        /// Thrown when an unsupported component order value is passed.
-        /// </exception>
-        private void CopyFrom(PixelArea<TPixel> area, int targetX, int targetY, int width, int height)
-        {
-            switch (area.ComponentOrder)
-            {
-                case ComponentOrder.Zyx:
-                    this.CopyFromZyx(area, targetX, targetY, width, height);
-                    break;
-                case ComponentOrder.Zyxw:
-                    this.CopyFromZyxw(area, targetX, targetY, width, height);
-                    break;
-                case ComponentOrder.Xyz:
-                    this.CopyFromXyz(area, targetX, targetY, width, height);
-                    break;
-                case ComponentOrder.Xyzw:
-                    this.CopyFromXyzw(area, targetX, targetY, width, height);
-                    break;
-                default:
-                    throw new NotSupportedException();
-            }
-        }
-
-        /// <summary>
-        /// Copy pixels from the image to an area of pixels.
-        /// </summary>
-        /// <param name="area">The area.</param>
-        /// <param name="sourceX">The source column index.</param>
-        /// <param name="sourceY">The source row index.</param>
-        /// <param name="width">The width of the area to copy.</param>
-        /// <param name="height">The height of the area to copy.</param>
-        /// <exception cref="NotSupportedException">
-        /// Thrown when an unsupported component order value is passed.
-        /// </exception>
-        private void CopyTo(PixelArea<TPixel> area, int sourceX, int sourceY, int width, int height)
-        {
-            switch (area.ComponentOrder)
-            {
-                case ComponentOrder.Zyx:
-                    this.CopyToZyx(area, sourceX, sourceY, width, height);
-                    break;
-                case ComponentOrder.Zyxw:
-                    this.CopyToZyxw(area, sourceX, sourceY, width, height);
-                    break;
-                case ComponentOrder.Xyz:
-                    this.CopyToXyz(area, sourceX, sourceY, width, height);
-                    break;
-                case ComponentOrder.Xyzw:
-                    this.CopyToXyzw(area, sourceX, sourceY, width, height);
-                    break;
-                default:
-                    throw new NotSupportedException();
-            }
-        }
-
-        /// <summary>
-        /// Checks that the given area and offset are within the bounds of the image.
-        /// </summary>
-        /// <param name="area">The area.</param>
-        /// <param name="x">The x-coordinate of the pixel. Must be greater than zero and less than the width of the image.</param>
-        /// <param name="y">The y-coordinate of the pixel. Must be greater than zero and less than the height of the image.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown if the dimensions are not within the bounds of the image.
-        /// </exception>
-        [Conditional("DEBUG")]
-        private void CheckCoordinates(PixelArea<TPixel> area, int x, int y)
-        {
-            int width = Math.Min(area.Width, this.Width - x);
-            if (width < 1)
-            {
-                throw new ArgumentOutOfRangeException(nameof(width), width, "Invalid area size specified.");
-            }
-
-            int height = Math.Min(area.Height, this.Height - y);
-            if (height < 1)
-            {
-                throw new ArgumentOutOfRangeException(nameof(height), height, "Invalid area size specified.");
-            }
-        }
-
         /// <summary>
         /// Checks the coordinates to ensure they are within bounds.
         /// </summary>
diff --git a/src/ImageSharp/Image/PixelArea{TPixel}.cs b/src/ImageSharp/Image/PixelArea{TPixel}.cs
deleted file mode 100644
index 764801722..000000000
--- a/src/ImageSharp/Image/PixelArea{TPixel}.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.Diagnostics;
-using System.IO;
-using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.PixelFormats;
-
-namespace SixLabors.ImageSharp
-{
-    /// <summary>
-    /// Represents an area of generic <see cref="Image{TPixel}"/> pixels.
-    /// </summary>
-    /// <typeparam name="TPixel">The pixel format.</typeparam>
-    internal sealed class PixelArea<TPixel> : IDisposable
-        where TPixel : struct, IPixel<TPixel>
-    {
-        /// <summary>
-        /// A value indicating whether this instance of the given entity has been disposed.
-        /// </summary>
-        /// <value><see langword="true"/> if this instance has been disposed; otherwise, <see langword="false"/>.</value>
-        /// <remarks>
-        /// If the entity is disposed, it must not be disposed a second time. The isDisposed field is set the first time the entity
-        /// is disposed. If the isDisposed field is true, then the Dispose() method will not dispose again. This help not to prolong the entity's
-        /// life in the Garbage Collector.
-        /// </remarks>
-        private bool isDisposed;
-
-        /// <summary>
-        /// The underlying buffer containing the raw pixel data.
-        /// </summary>
-        private readonly IManagedByteBuffer byteBuffer;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelArea{TPixel}"/> class.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <param name="componentOrder">The component order.</param>
-        public PixelArea(int width, ComponentOrder componentOrder)
-            : this(width, 1, componentOrder, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelArea{TPixel}"/> class.
-        /// </summary>
-        /// <param name="width">The width. </param>
-        /// <param name="componentOrder">The component order.</param>
-        /// <param name="padding">The number of bytes to pad each row.</param>
-        public PixelArea(int width, ComponentOrder componentOrder, int padding)
-            : this(width, 1, componentOrder, padding)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelArea{TPixel}"/> class.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        /// <param name="componentOrder">The component order.</param>
-        public PixelArea(int width, int height, ComponentOrder componentOrder)
-            : this(width, height, componentOrder, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelArea{TPixel}"/> class.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        /// <param name="componentOrder">The component order.</param>
-        /// <param name="padding">The number of bytes to pad each row.</param>
-        public PixelArea(int width, int height, ComponentOrder componentOrder, int padding)
-        {
-            this.Width = width;
-            this.Height = height;
-            this.ComponentOrder = componentOrder;
-            this.RowStride = (width * GetComponentCount(componentOrder)) + padding;
-            this.Length = this.RowStride * height;
-
-            this.byteBuffer = Configuration.Default.MemoryManager.AllocateCleanManagedByteBuffer(this.Length);
-        }
-
-        /// <summary>
-        /// Gets the data in bytes.
-        /// </summary>
-        public byte[] Bytes => this.byteBuffer.Array;
-
-        /// <summary>
-        /// Gets the length of the buffer.
-        /// </summary>
-        public int Length { get; }
-
-        /// <summary>
-        /// Gets the component order.
-        /// </summary>
-        public ComponentOrder ComponentOrder { get; }
-
-        /// <summary>
-        /// Gets the height.
-        /// </summary>
-        public int Height { get; }
-
-        /// <summary>
-        /// Gets the width of one row in the number of bytes.
-        /// </summary>
-        public int RowStride { get; }
-
-        /// <summary>
-        /// Gets the width.
-        /// </summary>
-        public int Width { get; }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            if (this.isDisposed)
-            {
-                return;
-            }
-
-            this.byteBuffer.Dispose();
-            this.isDisposed = true;
-        }
-
-        /// <summary>
-        /// Reads the stream to the area.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        public void Read(Stream stream)
-        {
-            stream.Read(this.Bytes, 0, this.Length);
-        }
-
-        /// <summary>
-        /// Writes the area to the stream.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        public void Write(Stream stream)
-        {
-            stream.Write(this.Bytes, 0, this.Length);
-        }
-
-        /// <summary>
-        /// Resets the bytes of the array to it's initial value.
-        /// </summary>
-        public void Reset()
-        {
-            this.byteBuffer.Clear();
-        }
-
-        /// <summary>
-        /// Gets a <see cref="Span{T}"/> to the row y.
-        /// </summary>
-        /// <param name="y">The y coordinate</param>
-        /// <returns>The <see cref="Span{T}"/></returns>
-        internal Span<byte> GetRowSpan(int y)
-        {
-            return this.byteBuffer.Slice(y * this.RowStride);
-        }
-
-        /// <summary>
-        /// Gets component count for the given order.
-        /// </summary>
-        /// <param name="componentOrder">The component order.</param>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        /// <exception cref="NotSupportedException">
-        /// Thrown if an invalid order is given.
-        /// </exception>
-        private static int GetComponentCount(ComponentOrder componentOrder)
-        {
-            switch (componentOrder)
-            {
-                case ComponentOrder.Zyx:
-                case ComponentOrder.Xyz:
-                    return 3;
-                case ComponentOrder.Zyxw:
-                case ComponentOrder.Xyzw:
-                    return 4;
-            }
-
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Checks that the length of the byte array to ensure that it matches the given width and height.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        /// <param name="bytes">The byte array.</param>
-        /// <param name="componentOrder">The component order.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown if the byte array is th incorrect length.
-        /// </exception>
-        [Conditional("DEBUG")]
-        private void CheckBytesLength(int width, int height, byte[] bytes, ComponentOrder componentOrder)
-        {
-            int requiredLength = (width * GetComponentCount(componentOrder)) * height;
-            if (bytes.Length != requiredLength)
-            {
-                throw new ArgumentOutOfRangeException(
-                          nameof(bytes),
-                          $"Invalid byte array length. Length {bytes.Length}; Should be {requiredLength}.");
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/BufferArea{T}.cs b/src/ImageSharp/Memory/BufferArea{T}.cs
index b5ed3566f..850cc4c16 100644
--- a/src/ImageSharp/Memory/BufferArea{T}.cs
+++ b/src/ImageSharp/Memory/BufferArea{T}.cs
@@ -45,11 +45,26 @@ namespace SixLabors.ImageSharp.Memory
         /// </summary>
         public Size Size => this.Rectangle.Size;
 
+        /// <summary>
+        /// Gets the width
+        /// </summary>
+        public int Width => this.Rectangle.Width;
+
+        /// <summary>
+        /// Gets the height
+        /// </summary>
+        public int Height => this.Rectangle.Height;
+
         /// <summary>
         /// Gets the pixel stride which is equal to the width of <see cref="DestinationBuffer"/>.
         /// </summary>
         public int Stride => this.DestinationBuffer.Width;
 
+        /// <summary>
+        /// Gets a value indicating whether the area refers to the entire <see cref="DestinationBuffer"/>
+        /// </summary>
+        public bool IsFullBufferArea => this.Size == this.DestinationBuffer.Size();
+
         /// <summary>
         /// Gets or sets a value at the given index.
         /// </summary>
@@ -126,5 +141,21 @@ namespace SixLabors.ImageSharp.Memory
         {
             return (y + this.Rectangle.Y) * this.DestinationBuffer.Width;
         }
+
+        public void Clear()
+        {
+            // Optimization for when the size of the area is the same as the buffer size.
+            if (this.IsFullBufferArea)
+            {
+                this.DestinationBuffer.Span.Clear();
+                return;
+            }
+
+            for (int y = 0; y < this.Rectangle.Height; y++)
+            {
+                Span<T> row = this.GetRowSpan(y);
+                row.Clear();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs b/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs
deleted file mode 100644
index 1ab3f2ce9..000000000
--- a/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.Numerics;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.Primitives;
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests
-{
-    /// <summary>
-    /// Tests the <see cref="PixelAccessor"/> class.
-    /// </summary>
-    public class PixelAccessorTests
-    {
-        public static Image<TPixel> CreateTestImage<TPixel>()
-            where TPixel : struct, IPixel<TPixel>
-        {
-            var image = new Image<TPixel>(10, 10);
-            using (PixelAccessor<TPixel> pixels = image.Lock())
-            {
-                for (int i = 0; i < 10; i++)
-                {
-                    for (int j = 0; j < 10; j++)
-                    {
-                        var v = new Vector4(i, j, 0, 1);
-                        v /= 10;
-
-                        var color = default(TPixel);
-                        color.PackFromVector4(v);
-
-                        pixels[i, j] = color;
-                    }
-                }
-            }
-            return image;
-        }
-
-        [Theory]
-        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All, ComponentOrder.Xyz)]
-        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All, ComponentOrder.Zyx)]
-        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All, ComponentOrder.Xyzw)]
-        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All, ComponentOrder.Zyxw)]
-        internal void CopyTo_Then_CopyFrom_OnFullImageRect<TPixel>(TestImageProvider<TPixel> provider, ComponentOrder order)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            using (Image<TPixel> src = provider.GetImage())
-            {
-                using (Image<TPixel> dest = new Image<TPixel>(src.Width, src.Height))
-                {
-                    using (PixelArea<TPixel> area = new PixelArea<TPixel>(src.Width, src.Height, order))
-                    {
-                        using (PixelAccessor<TPixel> srcPixels = src.Lock())
-                        {
-                            srcPixels.CopyTo(area, 0, 0);
-                        }
-
-                        using (PixelAccessor<TPixel> destPixels = dest.Lock())
-                        {
-                            destPixels.CopyFrom(area, 0, 0);
-                        }
-                    }
-
-                    Assert.True(src.IsEquivalentTo(dest, false));
-                }
-            }
-        }
-
-        [Theory]
-        [WithBlankImages(16, 16, PixelTypes.All, ComponentOrder.Xyz)]
-        [WithBlankImages(16, 16, PixelTypes.All, ComponentOrder.Zyx)]
-        [WithBlankImages(16, 16, PixelTypes.All, ComponentOrder.Xyzw)]
-        [WithBlankImages(16, 16, PixelTypes.All, ComponentOrder.Zyxw)]
-        internal void CopyToThenCopyFromWithOffset<TPixel>(TestImageProvider<TPixel> provider, ComponentOrder order)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            using (Image<TPixel> destImage = new Image<TPixel>(8, 8))
-            {
-                using (Image<TPixel> srcImage = provider.GetImage())
-                {
-                    srcImage.Mutate(x => x.Fill(NamedColors<TPixel>.Red, new Rectangle(4, 4, 8, 8)));
-                    using (PixelAccessor<TPixel> srcPixels = srcImage.Lock())
-                    {
-                        using (PixelArea<TPixel> area = new PixelArea<TPixel>(8, 8, order))
-                        {
-                            srcPixels.CopyTo(area, 4, 4);
-
-                            using (PixelAccessor<TPixel> destPixels = destImage.Lock())
-                            {
-                                destPixels.CopyFrom(area, 0, 0);
-                            }
-                        }
-                    }
-                }
-
-                provider.Utility.SourceFileOrDescription = order.ToString();
-                provider.Utility.SaveTestOutputFile(destImage, "bmp");
-
-                using (Image<TPixel> expectedImage = new Image<TPixel>(8, 8))
-                {
-                    expectedImage.Mutate(x => x.Fill(NamedColors<TPixel>.Red));
-                    Assert.True(destImage.IsEquivalentTo(expectedImage));
-                }
-            }
-        }
-
-
-        [Fact]
-        public void CopyFromZYX()
-        {
-            using (Image<Rgba32> image = new Image<Rgba32>(1, 1))
-            {
-                CopyFromZYXImpl(image);
-            }
-        }
-        
-        [Fact]
-        public void CopyFromZYXW()
-        {
-            using (Image<Rgba32> image = new Image<Rgba32>(1, 1))
-            {
-                CopyFromZYXWImpl(image);
-            }
-        }
-        
-        [Fact]
-        public void CopyToZYX()
-        {
-            using (Image<Rgba32> image = new Image<Rgba32>(1, 1))
-            {
-                CopyToZYXImpl(image);
-            }
-        }
-        
-        [Fact]
-        public void CopyToZYXW()
-        {
-            using (Image<Rgba32> image = new Image<Rgba32>(1, 1))
-            {
-                CopyToZYXWImpl(image);
-            }
-        }
-        
-        private static void CopyFromZYXImpl<TPixel>(Image<TPixel> image)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            using (PixelAccessor<TPixel> pixels = image.Lock())
-            {
-                byte red = 1;
-                byte green = 2;
-                byte blue = 3;
-                byte alpha = 255;
-
-                using (PixelArea<TPixel> row = new PixelArea<TPixel>(1, ComponentOrder.Zyx))
-                {
-                    row.Bytes[0] = blue;
-                    row.Bytes[1] = green;
-                    row.Bytes[2] = red;
-
-                    pixels.CopyFrom(row, 0);
-
-                    Rgba32 color = (Rgba32)(object)pixels[0, 0];
-                    Assert.Equal(red, color.R);
-                    Assert.Equal(green, color.G);
-                    Assert.Equal(blue, color.B);
-                    Assert.Equal(alpha, color.A);
-                }
-            }
-        }
-
-        private static void CopyFromZYXWImpl<TPixel>(Image<TPixel> image)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            using (PixelAccessor<TPixel> pixels = image.Lock())
-            {
-                byte red = 1;
-                byte green = 2;
-                byte blue = 3;
-                byte alpha = 4;
-
-                using (PixelArea<TPixel> row = new PixelArea<TPixel>(1, ComponentOrder.Zyxw))
-                {
-                    row.Bytes[0] = blue;
-                    row.Bytes[1] = green;
-                    row.Bytes[2] = red;
-                    row.Bytes[3] = alpha;
-
-                    pixels.CopyFrom(row, 0);
-
-                    Rgba32 color = (Rgba32)(object)pixels[0, 0];
-                    Assert.Equal(red, color.R);
-                    Assert.Equal(green, color.G);
-                    Assert.Equal(blue, color.B);
-                    Assert.Equal(alpha, color.A);
-                }
-            }
-        }
-
-        private static void CopyToZYXImpl<TPixel>(Image<TPixel> image)
-          where TPixel : struct, IPixel<TPixel>
-        {
-            using (PixelAccessor<TPixel> pixels = image.Lock())
-            {
-                byte red = 1;
-                byte green = 2;
-                byte blue = 3;
-
-                using (PixelArea<TPixel> row = new PixelArea<TPixel>(1, ComponentOrder.Zyx))
-                {
-                    pixels[0, 0] = (TPixel)(object)new Rgba32(red, green, blue);
-
-                    pixels.CopyTo(row, 0);
-
-                    Assert.Equal(blue, row.Bytes[0]);
-                    Assert.Equal(green, row.Bytes[1]);
-                    Assert.Equal(red, row.Bytes[2]);
-                }
-            }
-        }
-
-        private static void CopyToZYXWImpl<TPixel>(Image<TPixel> image)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            using (PixelAccessor<TPixel> pixels = image.Lock())
-            {
-                byte red = 1;
-                byte green = 2;
-                byte blue = 3;
-                byte alpha = 4;
-
-                using (PixelArea<TPixel> row = new PixelArea<TPixel>(1, ComponentOrder.Zyxw))
-                {
-                    pixels[0, 0] = (TPixel)(object)new Rgba32(red, green, blue, alpha);
-
-                    pixels.CopyTo(row, 0);
-
-                    Assert.Equal(blue, row.Bytes[0]);
-                    Assert.Equal(green, row.Bytes[1]);
-                    Assert.Equal(red, row.Bytes[2]);
-                    Assert.Equal(alpha, row.Bytes[3]);
-                }
-            }
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs b/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs
index 2ca409dc1..e96aa2e37 100644
--- a/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs
+++ b/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs
@@ -110,5 +110,38 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 Assert.Equal(expected, r);
             }
         }
+
+        [Fact]
+        public void Clear_FullArea()
+        {
+            using (Buffer2D<int> buffer = CreateTestBuffer(22, 13))
+            {
+                buffer.GetArea().Clear();
+                Span<int> fullSpan = buffer.Span;
+                Assert.True(fullSpan.SequenceEqual(new int[fullSpan.Length]));
+            }
+        }
+
+        [Fact]
+        public void Clear_SubArea()
+        {
+            using (Buffer2D<int> buffer = CreateTestBuffer(20, 30))
+            {
+                BufferArea<int> area = buffer.GetArea(5, 5, 10, 10);
+                area.Clear();
+
+                Assert.NotEqual(0, buffer[4, 4]);
+                Assert.NotEqual(0, buffer[15, 15]);
+
+                Assert.Equal(0, buffer[5, 5]);
+                Assert.Equal(0, buffer[14, 14]);
+
+                for (int y = area.Rectangle.Y; y < area.Rectangle.Bottom; y++)
+                {
+                    Span<int> span = buffer.GetRowSpan(y).Slice(area.Rectangle.X, area.Width);
+                    Assert.True(span.SequenceEqual(new int[area.Width]));
+                }
+            }
+        }
     }
 }
\ No newline at end of file

From 07baed95c26d67d8ebd6199f3ddf81d2fb39fe4c Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Fri, 23 Feb 2018 01:30:30 +0100
Subject: [PATCH 53/70] replaced PixelAccessor<T> with Buffer2D<T> in several
 processors

---
 src/ImageSharp/Formats/Gif/GifDecoderCore.cs  | 29 ++-----------------
 src/ImageSharp/Image/ImageFrame{TPixel}.cs    | 20 +++++++++++--
 src/ImageSharp/Memory/Buffer2D{T}.cs          | 22 ++++++++++++--
 .../Memory/MemoryManagerExtensions.cs         |  6 ++++
 .../Convolution/Convolution2DProcessor.cs     |  4 +--
 .../Convolution/Convolution2PassProcessor.cs  | 13 ++++-----
 .../Convolution/ConvolutionProcessor.cs       |  5 ++--
 .../Effects/OilPaintingProcessor.cs           |  6 ++--
 .../Processors/Transforms/CropProcessor.cs    |  4 +--
 .../Processors/Transforms/FlipProcessor.cs    |  7 +++--
 .../Formats/Bmp/BmpEncoderTests.cs            |  2 --
 .../ImageSharp.Tests/Memory/Buffer2DTests.cs  | 18 ++++++++++++
 .../Convolution/GaussianBlurTest.cs           |  9 ++----
 .../Processors/Effects/OilPaintTest.cs        | 10 +++----
 .../Processors/Transforms/FlipTests.cs        |  2 +-
 15 files changed, 90 insertions(+), 67 deletions(-)

diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
index 8fd7f04d2..48c8ceb8c 100644
--- a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
@@ -442,7 +442,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
 
                 imageFrame = currentFrame;
 
-                this.RestoreToBackground(imageFrame, image.Width, image.Height);
+                this.RestoreToBackground(imageFrame);
             }
 
             int i = 0;
@@ -532,9 +532,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// </summary>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="frame">The frame.</param>
-        /// <param name="imageWidth">Width of the image.</param>
-        /// <param name="imageHeight">Height of the image.</param>
-        private void RestoreToBackground<TPixel>(ImageFrame<TPixel> frame, int imageWidth, int imageHeight)
+        private void RestoreToBackground<TPixel>(ImageFrame<TPixel> frame)
             where TPixel : struct, IPixel<TPixel>
         {
             if (this.restoreArea == null)
@@ -545,29 +543,6 @@ namespace SixLabors.ImageSharp.Formats.Gif
             BufferArea<TPixel> pixelArea = frame.PixelBuffer.GetArea(this.restoreArea.Value);
             pixelArea.Clear();
 
-            //if (this.restoreArea.Value.Width == imageWidth &&
-            //    this.restoreArea.Value.Height == imageHeight)
-            //{
-            //    using (PixelAccessor<TPixel> pixelAccessor = frame.Lock())
-            //    {
-            //        pixelAccessor.Reset();
-            //    }
-            //}
-            //else
-            //{
-
-            //    using (var emptyRow = new PixelArea<TPixel>(this.restoreArea.Value.Width, ComponentOrder.Xyzw))
-            //    {
-            //        using (PixelAccessor<TPixel> pixelAccessor = frame.Lock())
-            //        {
-            //            for (int y = this.restoreArea.Value.Top; y < this.restoreArea.Value.Top + this.restoreArea.Value.Height; y++)
-            //            {
-            //                pixelAccessor.CopyFrom(emptyRow, y, this.restoreArea.Value.Left);
-            //            }
-            //        }
-            //    }
-            //}
-
             this.restoreArea = null;
         }
 
diff --git a/src/ImageSharp/Image/ImageFrame{TPixel}.cs b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
index 163c7a3b0..0dc730fe5 100644
--- a/src/ImageSharp/Image/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
@@ -14,6 +14,8 @@ using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp
 {
+    using SixLabors.ImageSharp.Helpers;
+
     /// <summary>
     /// Represents a single frame in a animation.
     /// </summary>
@@ -151,12 +153,26 @@ namespace SixLabors.ImageSharp
         }
 
         /// <summary>
-        /// Copies the pixels to another <see cref="PixelAccessor{TPixel}"/> of the same size.
+        /// Copies the pixels to a <see cref="PixelAccessor{TPixel}"/> of the same size.
         /// </summary>
         /// <param name="target">The target pixel buffer accessor.</param>
         internal void CopyTo(PixelAccessor<TPixel> target)
         {
-            SpanHelper.Copy(this.GetPixelSpan(), target.PixelBuffer.Span);
+            this.CopyTo(target.PixelBuffer);
+        }
+
+        /// <summary>
+        /// Copies the pixels to a <see cref="Buffer2D{TPixel}"/> of the same size.
+        /// </summary>
+        /// <param name="target">The target pixel buffer accessor.</param>
+        internal void CopyTo(Buffer2D<TPixel> target)
+        {
+            if (this.Size() != target.Size())
+            {
+                throw new ArgumentException("ImageFrame<T>.CopyTo(): target must be of the same size!", nameof(target));
+            }
+
+            SpanHelper.Copy(this.GetPixelSpan(), target.Span);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Memory/Buffer2D{T}.cs b/src/ImageSharp/Memory/Buffer2D{T}.cs
index 6b18aaa8f..d9e645845 100644
--- a/src/ImageSharp/Memory/Buffer2D{T}.cs
+++ b/src/ImageSharp/Memory/Buffer2D{T}.cs
@@ -29,14 +29,14 @@ namespace SixLabors.ImageSharp.Memory
         }
 
         /// <inheritdoc />
-        public int Width { get; }
+        public int Width { get; private set; }
 
         /// <inheritdoc />
-        public int Height { get; }
+        public int Height { get; private set; }
 
         public Span<T> Span => this.Buffer.Span;
 
-        public IBuffer<T> Buffer { get; }
+        public IBuffer<T> Buffer { get; private set; }
 
         /// <summary>
         /// Gets a reference to the element at the specified position.
@@ -60,5 +60,21 @@ namespace SixLabors.ImageSharp.Memory
         {
             this.Buffer?.Dispose();
         }
+
+        public static void SwapContents(Buffer2D<T> a, Buffer2D<T> b)
+        {
+            Size aSize = a.Size();
+            Size bSize = b.Size();
+
+            IBuffer<T> temp = a.Buffer;
+            a.Buffer = b.Buffer;
+            b.Buffer = temp;
+
+            b.Width = aSize.Width;
+            b.Height = aSize.Height;
+
+            a.Width = bSize.Width;
+            a.Height = bSize.Height;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/MemoryManagerExtensions.cs b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
index 3511d2039..810af13db 100644
--- a/src/ImageSharp/Memory/MemoryManagerExtensions.cs
+++ b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
@@ -1,5 +1,7 @@
 namespace SixLabors.ImageSharp.Memory
 {
+    using SixLabors.Primitives;
+
     /// <summary>
     /// Extension methods for <see cref="MemoryManager"/>.
     /// </summary>
@@ -44,6 +46,10 @@
             return new Buffer2D<T>(buffer, width, height);
         }
 
+        public static Buffer2D<T> Allocate2D<T>(this MemoryManager memoryManager, Size size)
+            where T : struct =>
+            Allocate2D<T>(memoryManager, size.Width, size.Height, false);
+
         public static Buffer2D<T> Allocate2D<T>(this MemoryManager memoryManager, int width, int height)
             where T : struct =>
             Allocate2D<T>(memoryManager, width, height, false);
diff --git a/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
index 378978d63..2c13ead16 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
@@ -56,7 +56,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int maxY = endY - 1;
             int maxX = endX - 1;
 
-            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, source.Width, source.Height))
+            using (Buffer2D<TPixel> targetPixels = configuration.MemoryManager.Allocate2D<TPixel>(source.Width, source.Height))
             {
                 source.CopyTo(targetPixels);
 
@@ -122,7 +122,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                         }
                     });
 
-                source.SwapPixelsBuffers(targetPixels);
+                Buffer2D<TPixel>.SwapContents(source.PixelBuffer, targetPixels);
             }
         }
     }
diff --git a/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
index 7730f1fa7..0d87aa1dc 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
@@ -43,15 +43,12 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <inheritdoc/>
         protected override void OnApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
         {
-            int width = source.Width;
-            int height = source.Height;
             ParallelOptions parallelOptions = configuration.ParallelOptions;
 
-            using (var firstPassPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
-            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
+            using (Buffer2D<TPixel> firstPassPixels = configuration.MemoryManager.Allocate2D<TPixel>(source.Size()))
             {
-                this.ApplyConvolution(firstPassPixels, sourcePixels, source.Bounds(), this.KernelX, parallelOptions);
-                this.ApplyConvolution(sourcePixels, firstPassPixels, sourceRectangle, this.KernelY, parallelOptions);
+                this.ApplyConvolution(firstPassPixels, source.PixelBuffer, source.Bounds(), this.KernelX, parallelOptions);
+                this.ApplyConvolution(source.PixelBuffer, firstPassPixels, sourceRectangle, this.KernelY, parallelOptions);
             }
         }
 
@@ -67,8 +64,8 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <param name="kernel">The kernel operator.</param>
         /// <param name="parallelOptions">The parellel options</param>
         private void ApplyConvolution(
-            PixelAccessor<TPixel> targetPixels,
-            PixelAccessor<TPixel> sourcePixels,
+            Buffer2D<TPixel> targetPixels,
+            Buffer2D<TPixel> sourcePixels,
             Rectangle sourceRectangle,
             Fast2DArray<float> kernel,
             ParallelOptions parallelOptions)
diff --git a/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
index b700343bf..2f369113d 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
@@ -5,6 +5,7 @@ using System;
 using System.Numerics;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
@@ -45,7 +46,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int maxY = endY - 1;
             int maxX = endX - 1;
 
-            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, source.Width, source.Height))
+            using (Buffer2D<TPixel> targetPixels = configuration.MemoryManager.Allocate2D<TPixel>(source.Size()))
             {
                 source.CopyTo(targetPixels);
 
@@ -94,7 +95,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                      }
                  });
 
-                source.SwapPixelsBuffers(targetPixels);
+                Buffer2D<TPixel>.SwapContents(source.PixelBuffer, targetPixels);
             }
         }
     }
diff --git a/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
index af2c29759..950ffc60f 100644
--- a/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
@@ -11,6 +11,8 @@ using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Processing.Processors
 {
+    using SixLabors.ImageSharp.Helpers;
+
     /// <summary>
     /// An <see cref="IImageProcessor{TPixel}"/> to apply an oil painting effect to an <see cref="Image{TPixel}"/>.
     /// </summary>
@@ -65,7 +67,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int radius = this.BrushSize >> 1;
             int levels = this.Levels;
 
-            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, source.Width, source.Height))
+            using (Buffer2D<TPixel> targetPixels = configuration.MemoryManager.Allocate2D<TPixel>(source.Size()))
             {
                 source.CopyTo(targetPixels);
 
@@ -133,7 +135,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                         }
                     });
 
-                source.SwapPixelsBuffers(targetPixels);
+                Buffer2D<TPixel>.SwapContents(source.PixelBuffer, targetPixels);
             }
         }
     }
diff --git a/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
index 9448aac5e..37c76bdcf 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
@@ -44,7 +44,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int minX = Math.Max(this.CropRectangle.X, sourceRectangle.X);
             int maxX = Math.Min(this.CropRectangle.Right, sourceRectangle.Right);
 
-            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, this.CropRectangle.Width, this.CropRectangle.Height))
+            using (Buffer2D<TPixel> targetPixels = configuration.MemoryManager.Allocate2D<TPixel>(this.CropRectangle.Size))
             {
                 Parallel.For(
                     minY,
@@ -57,7 +57,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                         SpanHelper.Copy(sourceRow, targetRow, maxX - minX);
                     });
 
-                source.SwapPixelsBuffers(targetPixels);
+                Buffer2D<TPixel>.SwapContents(source.PixelBuffer, targetPixels);
             }
         }
 
diff --git a/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
index f52bc97c1..eb1672591 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
@@ -10,6 +10,8 @@ using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Processing.Processors
 {
+    using SixLabors.ImageSharp.Helpers;
+
     /// <summary>
     /// Provides methods that allow the flipping of an image around its center point.
     /// </summary>
@@ -54,11 +56,10 @@ namespace SixLabors.ImageSharp.Processing.Processors
         /// <param name="configuration">The configuration.</param>
         private void FlipX(ImageFrame<TPixel> source, Configuration configuration)
         {
-            int width = source.Width;
             int height = source.Height;
             int halfHeight = (int)Math.Ceiling(source.Height * .5F);
 
-            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
+            using (Buffer2D<TPixel> targetPixels = configuration.MemoryManager.Allocate2D<TPixel>(source.Size()))
             {
                 Parallel.For(
                     0,
@@ -76,7 +77,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                             altSourceRow.CopyTo(targetRow);
                         });
 
-                source.SwapPixelsBuffers(targetPixels);
+                Buffer2D<TPixel>.SwapContents(source.PixelBuffer, targetPixels);
             }
         }
 
diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
index a4ed0c0fd..3a5fbe838 100644
--- a/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
@@ -48,9 +48,7 @@ namespace SixLabors.ImageSharp.Tests
         {
             TestBmpEncoderCore(provider, bitsPerPixel);
         }
-
         
-
         private static void TestBmpEncoderCore<TPixel>(TestImageProvider<TPixel> provider, BmpBitsPerPixel bitsPerPixel)
             where TPixel : struct, IPixel<TPixel>
         {   
diff --git a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
index a765a77b1..565e06572 100644
--- a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
+++ b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
@@ -8,6 +8,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
 
     using SixLabors.ImageSharp.Memory;
     using SixLabors.ImageSharp.Tests.Common;
+    using SixLabors.Primitives;
 
     using Xunit;
 
@@ -127,5 +128,22 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 Assert.True(Unsafe.AreSame(ref expected, ref actual));
             }
         }
+
+        [Fact]
+        public void SwapContents()
+        {
+            using (Buffer2D<int> a = this.MemoryManager.Allocate2D<int>(10, 5))
+            using (Buffer2D<int> b = this.MemoryManager.Allocate2D<int>(3, 7))
+            {
+                IBuffer<int> aa = a.Buffer;
+                IBuffer<int> bb = b.Buffer;
+
+                Buffer2D<int>.SwapContents(a, b);
+
+                Assert.Equal(bb, a.Buffer);
+                Assert.Equal(new Size(3, 7), a.Size());
+                Assert.Equal(new Size(10, 5), b.Size());
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs
index 3508d544b..89e9a13b5 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs
@@ -11,12 +11,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
 {
     public class GaussianBlurTest : FileTestBase
     {
-        public static readonly TheoryData<int> GaussianBlurValues
-        = new TheoryData<int>
-        {
-            3,
-            5
-        };
+        public static readonly TheoryData<int> GaussianBlurValues = new TheoryData<int> { 3, 5 };
 
         [Theory]
         [WithFileCollection(nameof(DefaultFiles), nameof(GaussianBlurValues), DefaultPixelType)]
@@ -36,7 +31,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
             where TPixel : struct, IPixel<TPixel>
         {
             using (Image<TPixel> source = provider.GetImage())
-            using (var image = source.Clone())
+            using (Image<TPixel> image = source.Clone())
             {
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs
index 608fcf10c..a9127f61d 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs
@@ -11,12 +11,10 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
 {
     public class OilPaintTest : FileTestBase
     {
-        public static readonly TheoryData<int, int> OilPaintValues
-            = new TheoryData<int, int>
-            {
-                { 15, 10 },
-                { 6, 5 }
-            };
+        public static readonly TheoryData<int, int> OilPaintValues = new TheoryData<int, int>
+                                                                         {
+                                                                             { 15, 10 }, { 6, 5 }
+                                                                         };
 
         [Theory]
         [WithFileCollection(nameof(DefaultFiles), nameof(OilPaintValues), DefaultPixelType)]
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs
index d4de4c3d2..9ca399498 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs
@@ -27,7 +27,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Flip(flipType));
-                image.DebugSave(provider, flipType, Extensions.Bmp);
+                image.DebugSave(provider, flipType);
             }
         }
     }

From a7750e8838292219d83981fc5725cf39527c2499 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Fri, 23 Feb 2018 01:43:39 +0100
Subject: [PATCH 54/70] PixelAccessor<T> is now a meaningless thin wrapper
 around Buffer2D<T>

---
 src/ImageSharp/Image/PixelAccessor{TPixel}.cs | 77 ++-----------------
 .../Processors/Transforms/FlipProcessor.cs    |  4 +-
 src/ImageSharp/Quantizers/Quantize.cs         | 23 +++---
 3 files changed, 21 insertions(+), 83 deletions(-)

diff --git a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
index f1c8531cc..63e4c015c 100644
--- a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
+++ b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
@@ -17,25 +17,6 @@ namespace SixLabors.ImageSharp
     internal sealed class PixelAccessor<TPixel> : IDisposable, IBuffer2D<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
-#pragma warning disable SA1401 // Fields must be private
-        /// <summary>
-        /// The <see cref="Buffer2D{T}"/> containing the pixel data.
-        /// </summary>
-        internal Buffer2D<TPixel> PixelBuffer;
-        private bool ownedBuffer;
-#pragma warning restore SA1401 // Fields must be private
-
-        /// <summary>
-        /// A value indicating whether this instance of the given entity has been disposed.
-        /// </summary>
-        /// <value><see langword="true"/> if this instance has been disposed; otherwise, <see langword="false"/>.</value>
-        /// <remarks>
-        /// If the entity is disposed, it must not be disposed a second time. The isDisposed field is set the first time the entity
-        /// is disposed. If the isDisposed field is true, then the Dispose() method will not dispose again. This help not to prolong the entity's
-        /// life in the Garbage Collector.
-        /// </remarks>
-        private bool isDisposed;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="PixelAccessor{TPixel}"/> class.
         /// </summary>
@@ -46,43 +27,13 @@ namespace SixLabors.ImageSharp
             Guard.MustBeGreaterThan(image.PixelBuffer.Width, 0, "image width");
             Guard.MustBeGreaterThan(image.PixelBuffer.Height, 0, "image height");
 
-            this.SetPixelBufferUnsafe(image.PixelBuffer, false);
+            this.SetPixelBufferUnsafe(image.PixelBuffer);
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PixelAccessor{TPixel}"/> class.
+        /// Gets the <see cref="Buffer2D{T}"/> containing the pixel data.
         /// </summary>
-        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
-        /// <param name="width">The width of the image represented by the pixel buffer.</param>
-        /// <param name="height">The height of the image represented by the pixel buffer.</param>
-        public PixelAccessor(MemoryManager memoryManager, int width, int height)
-            : this(width, height, memoryManager.Allocate2D<TPixel>(width, height, true), true)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelAccessor{TPixel}" /> class.
-        /// </summary>
-        /// <param name="width">The width of the image represented by the pixel buffer.</param>
-        /// <param name="height">The height of the image represented by the pixel buffer.</param>
-        /// <param name="pixels">The pixel buffer.</param>
-        /// <param name="ownedBuffer">if set to <c>true</c> [owned buffer].</param>
-        private PixelAccessor(int width, int height, Buffer2D<TPixel> pixels, bool ownedBuffer)
-        {
-            Guard.NotNull(pixels, nameof(pixels));
-            Guard.MustBeGreaterThan(width, 0, nameof(width));
-            Guard.MustBeGreaterThan(height, 0, nameof(height));
-
-            this.SetPixelBufferUnsafe(pixels, ownedBuffer);
-        }
-
-        /// <summary>
-        /// Finalizes an instance of the <see cref="PixelAccessor{TPixel}"/> class.
-        /// </summary>
-        ~PixelAccessor()
-        {
-            this.Dispose();
-        }
+        internal Buffer2D<TPixel> PixelBuffer { get; private set; }
 
         /// <summary>
         /// Gets the size of a single pixel in the number of bytes.
@@ -132,22 +83,6 @@ namespace SixLabors.ImageSharp
         /// <inheritdoc />
         public void Dispose()
         {
-            if (this.isDisposed || !this.ownedBuffer)
-            {
-                return;
-            }
-
-            // Note disposing is done.
-            this.isDisposed = true;
-
-            this.PixelBuffer.Dispose();
-
-            // This object will be cleaned up by the Dispose method.
-            // Therefore, you should call GC.SuppressFinalize to
-            // take this object off the finalization queue
-            // and prevent finalization code for this object
-            // from executing a second time.
-            GC.SuppressFinalize(this);
         }
 
         /// <summary>
@@ -167,7 +102,7 @@ namespace SixLabors.ImageSharp
         internal Buffer2D<TPixel> SwapBufferOwnership(Buffer2D<TPixel> pixels)
         {
             Buffer2D<TPixel> oldPixels = this.PixelBuffer;
-            this.SetPixelBufferUnsafe(pixels, this.ownedBuffer);
+            this.SetPixelBufferUnsafe(pixels);
             return oldPixels;
         }
 
@@ -184,11 +119,9 @@ namespace SixLabors.ImageSharp
         /// Sets the pixel buffer in an unsafe manor this should not be used unless you know what its doing!!!
         /// </summary>
         /// <param name="pixels">The pixel buffer</param>
-        /// <param name="ownedBuffer">if set to <c>true</c> then this instance ownes the buffer and thus should dispose of it afterwards.</param>
-        private void SetPixelBufferUnsafe(Buffer2D<TPixel> pixels, bool ownedBuffer)
+        private void SetPixelBufferUnsafe(Buffer2D<TPixel> pixels)
         {
             this.PixelBuffer = pixels;
-            this.ownedBuffer = ownedBuffer;
 
             this.Width = pixels.Width;
             this.Height = pixels.Height;
diff --git a/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
index eb1672591..7a6f5d9da 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
@@ -93,7 +93,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             int height = source.Height;
             int halfWidth = (int)Math.Ceiling(width * .5F);
 
-            using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
+            using (Buffer2D<TPixel> targetPixels = configuration.MemoryManager.Allocate2D<TPixel>(source.Size()))
             {
                 Parallel.For(
                     0,
@@ -112,7 +112,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                             }
                         });
 
-                source.SwapPixelsBuffers(targetPixels);
+                Buffer2D<TPixel>.SwapContents(source.PixelBuffer, targetPixels);
             }
         }
     }
diff --git a/src/ImageSharp/Quantizers/Quantize.cs b/src/ImageSharp/Quantizers/Quantize.cs
index 4052d4685..ee9c4d608 100644
--- a/src/ImageSharp/Quantizers/Quantize.cs
+++ b/src/ImageSharp/Quantizers/Quantize.cs
@@ -9,6 +9,8 @@ using SixLabors.ImageSharp.Quantizers;
 
 namespace SixLabors.ImageSharp
 {
+    using SixLabors.ImageSharp.Memory;
+
     /// <summary>
     /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
@@ -61,23 +63,26 @@ namespace SixLabors.ImageSharp
                 QuantizedImage<TPixel> quantized = quantizer.Quantize(img.Frames.RootFrame, maxColors);
                 int palleteCount = quantized.Palette.Length - 1;
 
-                using (var pixels = new PixelAccessor<TPixel>(source.MemoryManager, quantized.Width, quantized.Height))
+                using (Buffer2D<TPixel> pixels = source.MemoryManager.Allocate2D<TPixel>(quantized.Width, quantized.Height))
                 {
                     Parallel.For(
                         0,
                         pixels.Height,
                         img.GetConfiguration().ParallelOptions,
                         y =>
-                        {
-                            for (int x = 0; x < pixels.Width; x++)
                             {
-                                int i = x + (y * pixels.Width);
-                                TPixel color = quantized.Palette[Math.Min(palleteCount, quantized.Pixels[i])];
-                                pixels[x, y] = color;
-                            }
-                        });
+                                Span<TPixel> row = pixels.GetRowSpan(y);
+                                int yy = y * pixels.Width;
+                                for (int x = 0; x < pixels.Width; x++)
+                                {
+                                    int i = x + yy;
+                                    TPixel color = quantized.Palette[Math.Min(palleteCount, quantized.Pixels[i])];
+                                    row[x] = color;
+                                    //pixels[x, y] = color;
+                                }
+                            });
 
-                    img.Frames[0].SwapPixelsBuffers(pixels);
+                    Buffer2D<TPixel>.SwapContents(img.Frames[0].PixelBuffer, pixels);
                 }
             });
         }

From a6fb21a8a05729ff97dbc3e892fc475e15731d46 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Fri, 23 Feb 2018 01:55:47 +0100
Subject: [PATCH 55/70] do not use Configuration.Default.MemoryManager in
 AddFrame()

---
 src/ImageSharp/Image/ImageFrame.LoadPixelData.cs | 10 ++++++----
 src/ImageSharp/Image/ImageFrameCollection.cs     |  6 +++++-
 src/ImageSharp/Memory/Buffer2D{T}.cs             | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/ImageSharp/Image/ImageFrame.LoadPixelData.cs b/src/ImageSharp/Image/ImageFrame.LoadPixelData.cs
index 153a757e1..b9341a1b2 100644
--- a/src/ImageSharp/Image/ImageFrame.LoadPixelData.cs
+++ b/src/ImageSharp/Image/ImageFrame.LoadPixelData.cs
@@ -20,30 +20,32 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// Create a new instance of the <see cref="Image{TPixel}"/> class from the given byte array in <typeparamref name="TPixel"/> format.
         /// </summary>
+        /// <param name="memoryManager">The memory manager to use for allocations</param>
         /// <param name="data">The byte array containing image data.</param>
         /// <param name="width">The width of the final image.</param>
         /// <param name="height">The height of the final image.</param>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
-        public static ImageFrame<TPixel> LoadPixelData<TPixel>(Span<byte> data, int width, int height)
+        public static ImageFrame<TPixel> LoadPixelData<TPixel>(MemoryManager memoryManager, Span<byte> data, int width, int height)
             where TPixel : struct, IPixel<TPixel>
-            => LoadPixelData(data.NonPortableCast<byte, TPixel>(), width, height);
+            => LoadPixelData(memoryManager, data.NonPortableCast<byte, TPixel>(), width, height);
 
         /// <summary>
         /// Create a new instance of the <see cref="Image{TPixel}"/> class from the raw <typeparamref name="TPixel"/> data.
         /// </summary>
+        /// <param name="memoryManager">The memory manager to use for allocations</param>
         /// <param name="data">The Span containing the image Pixel data.</param>
         /// <param name="width">The width of the final image.</param>
         /// <param name="height">The height of the final image.</param>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
-        public static ImageFrame<TPixel> LoadPixelData<TPixel>(Span<TPixel> data, int width, int height)
+        public static ImageFrame<TPixel> LoadPixelData<TPixel>(MemoryManager memoryManager, Span<TPixel> data, int width, int height)
             where TPixel : struct, IPixel<TPixel>
         {
             int count = width * height;
             Guard.MustBeGreaterThanOrEqualTo(data.Length, count, nameof(data));
 
-            var image = new ImageFrame<TPixel>(Configuration.Default.MemoryManager, width, height);
+            var image = new ImageFrame<TPixel>(memoryManager, width, height);
             SpanHelper.Copy(data, image.GetPixelSpan(), count);
 
             return image;
diff --git a/src/ImageSharp/Image/ImageFrameCollection.cs b/src/ImageSharp/Image/ImageFrameCollection.cs
index bfdf1df76..aefeacce1 100644
--- a/src/ImageSharp/Image/ImageFrameCollection.cs
+++ b/src/ImageSharp/Image/ImageFrameCollection.cs
@@ -80,7 +80,11 @@ namespace SixLabors.ImageSharp
         /// <inheritdoc/>
         public ImageFrame<TPixel> AddFrame(TPixel[] data)
         {
-            var frame = ImageFrame.LoadPixelData(new Span<TPixel>(data), this.RootFrame.Width, this.RootFrame.Height);
+            var frame = ImageFrame.LoadPixelData(
+                this.parent.GetMemoryManager(),
+                new Span<TPixel>(data),
+                this.RootFrame.Width,
+                this.RootFrame.Height);
             this.frames.Add(frame);
             return frame;
         }
diff --git a/src/ImageSharp/Memory/Buffer2D{T}.cs b/src/ImageSharp/Memory/Buffer2D{T}.cs
index d9e645845..7f9fb59c4 100644
--- a/src/ImageSharp/Memory/Buffer2D{T}.cs
+++ b/src/ImageSharp/Memory/Buffer2D{T}.cs
@@ -34,8 +34,14 @@ namespace SixLabors.ImageSharp.Memory
         /// <inheritdoc />
         public int Height { get; private set; }
 
+        /// <summary>
+        /// Gets the span to the whole area.
+        /// </summary>
         public Span<T> Span => this.Buffer.Span;
 
+        /// <summary>
+        /// Gets the backing <see cref="IBuffer{T}"/>
+        /// </summary>
         public IBuffer<T> Buffer { get; private set; }
 
         /// <summary>
@@ -56,11 +62,20 @@ namespace SixLabors.ImageSharp.Memory
             }
         }
 
+        /// <summary>
+        /// Disposes the <see cref="Buffer2D{T}"/> instance
+        /// </summary>
         public void Dispose()
         {
             this.Buffer?.Dispose();
         }
 
+        /// <summary>
+        /// Swap the contents (<see cref="Buffer"/>, <see cref="Width"/>, <see cref="Height"/>) of the two buffers.
+        /// Useful to transfer the contents of a temporal <see cref="Buffer2D{T}"/> to a persistent <see cref="ImageFrame{TPixel}.PixelBuffer"/>
+        /// </summary>
+        /// <param name="a">The first buffer</param>
+        /// <param name="b">The second buffer</param>
         public static void SwapContents(Buffer2D<T> a, Buffer2D<T> b)
         {
             Size aSize = a.Size();

From d9dcfbe5c4e4ce96557e8b6cfddfc7301153251b Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Fri, 23 Feb 2018 02:00:37 +0100
Subject: [PATCH 56/70] code analyzers fighting each other

---
 src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs                | 3 +--
 src/ImageSharp/Image/ImageFrame{TPixel}.cs                  | 3 +--
 src/ImageSharp/Memory/BufferExtensions.cs                   | 3 +--
 src/ImageSharp/Memory/MemoryManagerExtensions.cs            | 6 +++---
 .../Processing/Processors/Effects/OilPaintingProcessor.cs   | 3 +--
 .../Processing/Processors/Transforms/FlipProcessor.cs       | 3 +--
 src/ImageSharp/Quantizers/Quantize.cs                       | 4 +---
 7 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
index 5b85e9cb9..66c8b6c08 100644
--- a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
@@ -4,12 +4,11 @@
 using System;
 using System.IO;
 using SixLabors.ImageSharp.IO;
+using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Formats.Bmp
 {
-    using SixLabors.ImageSharp.Memory;
-
     /// <summary>
     /// Image encoder for writing an image to a stream as a Windows bitmap.
     /// </summary>
diff --git a/src/ImageSharp/Image/ImageFrame{TPixel}.cs b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
index 0dc730fe5..833a22f7c 100644
--- a/src/ImageSharp/Image/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
@@ -7,6 +7,7 @@ using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
@@ -14,8 +15,6 @@ using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp
 {
-    using SixLabors.ImageSharp.Helpers;
-
     /// <summary>
     /// Represents a single frame in a animation.
     /// </summary>
diff --git a/src/ImageSharp/Memory/BufferExtensions.cs b/src/ImageSharp/Memory/BufferExtensions.cs
index 882b8875f..919a6ef34 100644
--- a/src/ImageSharp/Memory/BufferExtensions.cs
+++ b/src/ImageSharp/Memory/BufferExtensions.cs
@@ -2,12 +2,11 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.IO;
 using System.Runtime.CompilerServices;
 
 namespace SixLabors.ImageSharp.Memory
 {
-    using System.IO;
-
     internal static class BufferExtensions
     {
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
diff --git a/src/ImageSharp/Memory/MemoryManagerExtensions.cs b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
index 810af13db..206000245 100644
--- a/src/ImageSharp/Memory/MemoryManagerExtensions.cs
+++ b/src/ImageSharp/Memory/MemoryManagerExtensions.cs
@@ -1,7 +1,7 @@
-namespace SixLabors.ImageSharp.Memory
-{
-    using SixLabors.Primitives;
+using SixLabors.Primitives;
 
+namespace SixLabors.ImageSharp.Memory
+{
     /// <summary>
     /// Extension methods for <see cref="MemoryManager"/>.
     /// </summary>
diff --git a/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
index 950ffc60f..c199a32c8 100644
--- a/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
@@ -5,14 +5,13 @@ using System;
 using System.Numerics;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Processing.Processors
 {
-    using SixLabors.ImageSharp.Helpers;
-
     /// <summary>
     /// An <see cref="IImageProcessor{TPixel}"/> to apply an oil painting effect to an <see cref="Image{TPixel}"/>.
     /// </summary>
diff --git a/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
index 7a6f5d9da..9b8b785b5 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
@@ -4,14 +4,13 @@
 using System;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Processing.Processors
 {
-    using SixLabors.ImageSharp.Helpers;
-
     /// <summary>
     /// Provides methods that allow the flipping of an image around its center point.
     /// </summary>
diff --git a/src/ImageSharp/Quantizers/Quantize.cs b/src/ImageSharp/Quantizers/Quantize.cs
index ee9c4d608..f2a09abb7 100644
--- a/src/ImageSharp/Quantizers/Quantize.cs
+++ b/src/ImageSharp/Quantizers/Quantize.cs
@@ -4,13 +4,12 @@
 using System;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Quantizers;
 
 namespace SixLabors.ImageSharp
 {
-    using SixLabors.ImageSharp.Memory;
-
     /// <summary>
     /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
@@ -78,7 +77,6 @@ namespace SixLabors.ImageSharp
                                     int i = x + yy;
                                     TPixel color = quantized.Palette[Math.Min(palleteCount, quantized.Pixels[i])];
                                     row[x] = color;
-                                    //pixels[x, y] = color;
                                 }
                             });
 

From c792b03279d45e172eb494270c210d6f6d4e2ae3 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sun, 25 Feb 2018 20:28:39 +0100
Subject: [PATCH 57/70] using WeakReference in ArrayPoolMemoryManager.Buffer

---
 .../Memory/ArrayPoolMemoryManager.Buffer{T}.cs      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
index 78e275e8c..65a91bfdf 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
@@ -16,13 +16,13 @@ namespace SixLabors.ImageSharp.Memory
         {
             private readonly int length;
 
-            private readonly ArrayPool<byte> sourcePool;
+            private WeakReference<ArrayPool<byte>> sourcePoolReference;
 
             public Buffer(byte[] data, int length, ArrayPool<byte> sourcePool)
             {
                 this.Data = data;
                 this.length = length;
-                this.sourcePool = sourcePool;
+                this.sourcePoolReference = new WeakReference<ArrayPool<byte>>(sourcePool);
             }
 
             protected byte[] Data { get; private set; }
@@ -31,12 +31,17 @@ namespace SixLabors.ImageSharp.Memory
 
             public void Dispose()
             {
-                if (this.Data == null)
+                if (this.Data == null || this.sourcePoolReference == null)
                 {
                     return;
                 }
 
-                this.sourcePool.Return(this.Data);
+                if (this.sourcePoolReference.TryGetTarget(out ArrayPool<byte> pool))
+                {
+                    pool.Return(this.Data);
+                }
+
+                this.sourcePoolReference = null;
                 this.Data = null;
             }
         }

From c1b4707113885bee0dcffeb11eb1abff782ffbb3 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sun, 25 Feb 2018 20:38:32 +0100
Subject: [PATCH 58/70] tuning ArrayPoolMemoryManager configuration based on
 benchmark results

---
 src/ImageSharp/Configuration.cs               |  2 +-
 .../ArrayPoolMemoryManager.Buffer{T}.cs       | 17 ++++++++++
 ...yPoolMemoryManager.CommonFactoryMethods.cs | 33 ++++++++++++++++---
 .../Memory/ArrayPoolMemoryManager.cs          |  3 +-
 src/ImageSharp/Memory/IManagedByteBuffer.cs   |  2 +-
 src/ImageSharp/Memory/MemoryManager.cs        |  6 ++++
 6 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs
index 2fe3c26e2..9a627eeb7 100644
--- a/src/ImageSharp/Configuration.cs
+++ b/src/ImageSharp/Configuration.cs
@@ -86,7 +86,7 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// Gets or sets the <see cref="MemoryManager"/> that is currently in use.
         /// </summary>
-        public MemoryManager MemoryManager { get; set; } = ArrayPoolMemoryManager.CreateWithNormalPooling();
+        public MemoryManager MemoryManager { get; set; } = ArrayPoolMemoryManager.CreateDefault();
 
         /// <summary>
         /// Gets the maximum header size of all the formats.
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
index 65a91bfdf..a00ee8c30 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
@@ -11,11 +11,20 @@ namespace SixLabors.ImageSharp.Memory
     /// </summary>
     public partial class ArrayPoolMemoryManager
     {
+        /// <summary>
+        /// The buffer implementation of <see cref="ArrayPoolMemoryManager"/>
+        /// </summary>
         private class Buffer<T> : IBuffer<T>
             where T : struct
         {
+            /// <summary>
+            /// The length of the buffer
+            /// </summary>
             private readonly int length;
 
+            /// <summary>
+            /// A weak reference to the source pool.
+            /// </summary>
             private WeakReference<ArrayPool<byte>> sourcePoolReference;
 
             public Buffer(byte[] data, int length, ArrayPool<byte> sourcePool)
@@ -25,10 +34,15 @@ namespace SixLabors.ImageSharp.Memory
                 this.sourcePoolReference = new WeakReference<ArrayPool<byte>>(sourcePool);
             }
 
+            /// <summary>
+            /// Gets the buffer as a byte array.
+            /// </summary>
             protected byte[] Data { get; private set; }
 
+            /// <inheritdoc />
             public Span<T> Span => this.Data.AsSpan().NonPortableCast<byte, T>().Slice(0, this.length);
 
+            /// <inheritdoc />
             public void Dispose()
             {
                 if (this.Data == null || this.sourcePoolReference == null)
@@ -46,6 +60,9 @@ namespace SixLabors.ImageSharp.Memory
             }
         }
 
+        /// <summary>
+        /// The <see cref="IManagedByteBuffer"/> implementation of <see cref="ArrayPoolMemoryManager"/>.
+        /// </summary>
         private class ManagedByteBuffer : Buffer<byte>, IManagedByteBuffer
         {
             public ManagedByteBuffer(byte[] data, int length, ArrayPool<byte> sourcePool)
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.CommonFactoryMethods.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.CommonFactoryMethods.cs
index 918c5d41a..d1424870d 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.CommonFactoryMethods.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.CommonFactoryMethods.cs
@@ -7,22 +7,36 @@
     {
         /// <summary>
         /// The default value for: maximum size of pooled arrays in bytes.
-        /// Currently set to 32MB, which is equivalent to 8 megapixels of raw <see cref="Rgba32"/> data.
+        /// Currently set to 24MB, which is equivalent to 8 megapixels of raw <see cref="Rgba32"/> data.
         /// </summary>
-        internal const int DefaultMaxPooledBufferSizeInBytes = 32 * 1024 * 1024;
+        internal const int DefaultMaxPooledBufferSizeInBytes = 24 * 1024 * 1024;
 
         /// <summary>
         /// The value for: The threshold to pool arrays in <see cref="largeArrayPool"/> which has less buckets for memory safety.
         /// </summary>
         private const int DefaultBufferSelectorThresholdInBytes = 8 * 1024 * 1024;
 
+        /// <summary>
+        /// The default bucket count for <see cref="largeArrayPool"/>.
+        /// </summary>
+        private const int DefaultLargePoolBucketCount = 6;
+
+        /// <summary>
+        /// The default bucket count for <see cref="normalArrayPool"/>.
+        /// </summary>
+        private const int DefaultNormalPoolBucketCount = 16;
+
         /// <summary>
         /// This is the default. Should be good for most use cases.
         /// </summary>
         /// <returns>The memory manager</returns>
-        public static ArrayPoolMemoryManager CreateWithNormalPooling()
+        public static ArrayPoolMemoryManager CreateDefault()
         {
-            return new ArrayPoolMemoryManager(DefaultMaxPooledBufferSizeInBytes, DefaultBufferSelectorThresholdInBytes, 8, 24);
+            return new ArrayPoolMemoryManager(
+                DefaultMaxPooledBufferSizeInBytes,
+                DefaultBufferSelectorThresholdInBytes,
+                DefaultLargePoolBucketCount,
+                DefaultNormalPoolBucketCount);
         }
 
         /// <summary>
@@ -31,7 +45,16 @@
         /// <returns>The memory manager</returns>
         public static ArrayPoolMemoryManager CreateWithModeratePooling()
         {
-            return new ArrayPoolMemoryManager(1024 * 1024, 1024 * 16, 16, 24);
+            return new ArrayPoolMemoryManager(1024 * 1024, 32 * 1024, 16, 24);
+        }
+
+        /// <summary>
+        /// Only pool small buffers like image rows.
+        /// </summary>
+        /// <returns>The memory manager</returns>
+        public static ArrayPoolMemoryManager CreateWithMinimalPooling()
+        {
+            return new ArrayPoolMemoryManager(64 * 1024, 32 * 1024, 8, 24);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
index 36bc3a870..7b8c7ab32 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs
@@ -48,7 +48,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="maxPoolSizeInBytes">The maximum size of pooled arrays. Arrays over the thershold are gonna be always allocated.</param>
         /// <param name="poolSelectorThresholdInBytes">Arrays over this threshold will be pooled in <see cref="largeArrayPool"/> which has less buckets for memory safety.</param>
         public ArrayPoolMemoryManager(int maxPoolSizeInBytes, int poolSelectorThresholdInBytes)
-            : this(maxPoolSizeInBytes, poolSelectorThresholdInBytes, 8, 24)
+            : this(maxPoolSizeInBytes, poolSelectorThresholdInBytes, DefaultLargePoolBucketCount, DefaultNormalPoolBucketCount)
         {
         }
 
@@ -106,6 +106,7 @@ namespace SixLabors.ImageSharp.Memory
             return buffer;
         }
 
+        /// <inheritdoc />
         internal override IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear)
         {
             ArrayPool<byte> pool = this.GetArrayPool(length);
diff --git a/src/ImageSharp/Memory/IManagedByteBuffer.cs b/src/ImageSharp/Memory/IManagedByteBuffer.cs
index d75fb9b6c..4d159ce86 100644
--- a/src/ImageSharp/Memory/IManagedByteBuffer.cs
+++ b/src/ImageSharp/Memory/IManagedByteBuffer.cs
@@ -4,7 +4,7 @@
 namespace SixLabors.ImageSharp.Memory
 {
     /// <summary>
-    /// Represents a byte buffer backed by a managed array.
+    /// Represents a byte buffer backed by a managed array. Useful for interop with classic .NET API-s.
     /// </summary>
     internal interface IManagedByteBuffer : IBuffer<byte>
     {
diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryManager.cs
index 8e2df8cec..52bdc897f 100644
--- a/src/ImageSharp/Memory/MemoryManager.cs
+++ b/src/ImageSharp/Memory/MemoryManager.cs
@@ -19,6 +19,12 @@ namespace SixLabors.ImageSharp.Memory
         internal abstract IBuffer<T> Allocate<T>(int length, bool clear)
             where T : struct;
 
+        /// <summary>
+        /// Allocates an <see cref="IManagedByteBuffer"/>
+        /// </summary>
+        /// <param name="length">The requested buffer length</param>
+        /// <param name="clear">A value indicating whether to clean the buffer</param>
+        /// <returns>The <see cref="IManagedByteBuffer"/></returns>
         internal abstract IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear);
 
         /// <summary>

From b0a1ebc5f76c7f5bf4bd7e00f1971dad759b0b91 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sun, 25 Feb 2018 20:39:32 +0100
Subject: [PATCH 59/70] tuning ArrayPoolMemoryManager configuration based on
 benchmark results

---
 tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
index f99ee4dde..805bc908c 100644
--- a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
+++ b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
@@ -171,9 +171,9 @@ namespace SixLabors.ImageSharp.Tests.Memory
         }
 
         [Fact]
-        public void CreateWithNormalPooling()
+        public void CreateDefault()
         {
-            this.MemoryManager = ArrayPoolMemoryManager.CreateWithNormalPooling();
+            this.MemoryManager = ArrayPoolMemoryManager.CreateDefault();
 
             Assert.False(this.CheckIsRentingPooledBuffer<Rgba32>(2 * 4096 * 4096));
             Assert.True(this.CheckIsRentingPooledBuffer<Rgba32>(2048 * 2048));

From 3f4cdf168580afce7624529024910fb142a79964 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sun, 25 Feb 2018 21:59:59 +0100
Subject: [PATCH 60/70] build fix after merge

---
 .../Processors/DrawImageProcessor.cs                   | 10 +++++-----
 .../Transforms/ProjectiveTransformProcessor.cs         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
index 880098088..632b4d449 100644
--- a/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
@@ -74,11 +74,11 @@ namespace SixLabors.ImageSharp.Drawing.Processors
 
             int width = maxX - minX;
 
-                MemoryManager memoryManager = this.Image.GetConfiguration().MemoryManager;
+            MemoryManager memoryManager = this.Image.GetConfiguration().MemoryManager;
 
-                using (IBuffer<float> amount = memoryManager.Allocate<float>(width))
-                {
-                    amount.Span.Fill(this.Alpha);
+            using (IBuffer<float> amount = memoryManager.Allocate<float>(width))
+            {
+                amount.Span.Fill(this.Opacity);
 
                 Parallel.For(
                     minY,
@@ -88,7 +88,7 @@ namespace SixLabors.ImageSharp.Drawing.Processors
                         {
                             Span<TPixel> background = source.GetPixelRowSpan(y).Slice(minX, width);
                             Span<TPixel> foreground = targetImage.GetPixelRowSpan(y - locationY).Slice(targetX, width);
-                                this.blender.Blend(memoryManager, background, background, foreground, amount.Span);
+                            blender.Blend(memoryManager, background, background, foreground, amount.Span);
                         });
             }
         }
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs
index 63ef3bfe2..458871cdc 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs
@@ -74,7 +74,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             IEnumerable<ImageFrame<TPixel>> frames = source.Frames.Select(
                 x => new ImageFrame<TPixel>(
                     source.GetMemoryManager(),
-                    this.targetRectangle.Size,
+                    this.targetDimensions,
                     x.MetaData.Clone()));
 
             // Use the overload to prevent an extra frame being added

From 62381eff8f9f3f3461c04b2f4da24d2343547921 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sun, 25 Feb 2018 22:12:20 +0100
Subject: [PATCH 61/70] removing duplicate reference to SixLabors.Core

---
 src/ImageSharp/ImageSharp.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
index 833b9b96d..cb0539f78 100644
--- a/src/ImageSharp/ImageSharp.csproj
+++ b/src/ImageSharp/ImageSharp.csproj
@@ -34,7 +34,6 @@
     <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SixLabors.Core" Version="1.0.0-beta0004" />
     <PackageReference Include="SixLabors.Core" Version="1.0.0-ci0005" />
     <AdditionalFiles Include="..\..\stylecop.json" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">

From cec6083d49fa833eacef7e36d2d37b763e397225 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Mon, 26 Feb 2018 01:05:18 +0100
Subject: [PATCH 62/70] SimpleManagedMemoryManager -> SimpleGcMemoryManager

---
 ...SimpleManagedMemoryManager.cs => SimpleGcMemoryManager.cs} | 4 ++--
 ...gedMemoryManagerTests.cs => SimpleGcMemoryManagerTests.cs} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename src/ImageSharp/Memory/{SimpleManagedMemoryManager.cs => SimpleGcMemoryManager.cs} (73%)
 rename tests/ImageSharp.Tests/Memory/{SimpleManagedMemoryManagerTests.cs => SimpleGcMemoryManagerTests.cs} (68%)

diff --git a/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs b/src/ImageSharp/Memory/SimpleGcMemoryManager.cs
similarity index 73%
rename from src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
rename to src/ImageSharp/Memory/SimpleGcMemoryManager.cs
index 701c71ad4..f4518bbb9 100644
--- a/src/ImageSharp/Memory/SimpleManagedMemoryManager.cs
+++ b/src/ImageSharp/Memory/SimpleGcMemoryManager.cs
@@ -1,9 +1,9 @@
 namespace SixLabors.ImageSharp.Memory
 {
     /// <summary>
-    /// Implements <see cref="MemoryManager"/> by allocating new buffers on every call.
+    /// Implements <see cref="MemoryManager"/> by newing up arrays by the GC on every allocation requests.
     /// </summary>
-    public class SimpleManagedMemoryManager : MemoryManager
+    public class SimpleGcMemoryManager : MemoryManager
     {
         /// <inheritdoc />
         internal override IBuffer<T> Allocate<T>(int length, bool clear)
diff --git a/tests/ImageSharp.Tests/Memory/SimpleManagedMemoryManagerTests.cs b/tests/ImageSharp.Tests/Memory/SimpleGcMemoryManagerTests.cs
similarity index 68%
rename from tests/ImageSharp.Tests/Memory/SimpleManagedMemoryManagerTests.cs
rename to tests/ImageSharp.Tests/Memory/SimpleGcMemoryManagerTests.cs
index eb7414582..0d1c2beb8 100644
--- a/tests/ImageSharp.Tests/Memory/SimpleManagedMemoryManagerTests.cs
+++ b/tests/ImageSharp.Tests/Memory/SimpleGcMemoryManagerTests.cs
@@ -2,12 +2,12 @@ namespace SixLabors.ImageSharp.Tests.Memory
 {
     using SixLabors.ImageSharp.Memory;
 
-    public class SimpleManagedMemoryManagerTests
+    public class SimpleGcMemoryManagerTests
     {
         public class BufferTests : BufferTestSuite
         {
             public BufferTests()
-                : base(new SimpleManagedMemoryManager())
+                : base(new SimpleGcMemoryManager())
             {
             }
         }

From 6d3b8576402686a14147aba93b242f7ac8418e32 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Mon, 26 Feb 2018 21:04:09 +0100
Subject: [PATCH 63/70] review cleanup

---
 .../Brushes/SolidBrush{TPixel}.cs             | 28 +++++++------------
 src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs  |  6 ++--
 .../Formats/Jpeg/Common/Block8x8F.CopyTo.cs   |  4 +--
 src/ImageSharp/Memory/BufferArea{T}.cs        |  2 +-
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs b/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
index 692889556..9630c707e 100644
--- a/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
@@ -89,28 +89,20 @@ namespace SixLabors.ImageSharp.Drawing.Brushes
             /// <inheritdoc />
             internal override void Apply(Span<float> scanline, int x, int y)
             {
-                try
-                {
-                    Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
-
-                    MemoryManager memoryManager = this.Target.MemoryManager;
+                Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
 
-                    using (IBuffer<float> amountBuffer = memoryManager.Allocate<float>(scanline.Length))
-                    {
-                        Span<float> amountSpan = amountBuffer.Span;
+                MemoryManager memoryManager = this.Target.MemoryManager;
 
-                        for (int i = 0; i < scanline.Length; i++)
-                        {
-                            amountSpan[i] = scanline[i] * this.Options.BlendPercentage;
-                        }
+                using (IBuffer<float> amountBuffer = memoryManager.Allocate<float>(scanline.Length))
+                {
+                    Span<float> amountSpan = amountBuffer.Span;
 
-                        this.Blender.Blend(memoryManager, destinationRow, destinationRow, this.Colors.Span, amountSpan);
+                    for (int i = 0; i < scanline.Length; i++)
+                    {
+                        amountSpan[i] = scanline[i] * this.Options.BlendPercentage;
                     }
-                }
-                catch (Exception)
-                {
-                    // TODO: Why are we catching exceptions here silently ???
-                    throw;
+
+                    this.Blender.Blend(memoryManager, destinationRow, destinationRow, this.Colors.Span, amountSpan);
                 }
             }
         }
diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
index 953a6fcb2..9f4dba5b4 100644
--- a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
@@ -224,7 +224,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             var color = default(TPixel);
             var rgba = new Rgba32(0, 0, 0, 255);
 
-            using (var buffer = this.configuration.MemoryManager.Allocate2D<byte>(width, height, true))
+            using (var buffer = this.memoryManager.AllocateClean2D<byte>(width, height))
             {
                 this.UncompressRle8(width, buffer.Span);
 
@@ -346,7 +346,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
                 padding = 4 - padding;
             }
 
-            using (IManagedByteBuffer row = this.configuration.MemoryManager.AllocateManagedByteBuffer(arrayWidth + padding, true))
+            using (IManagedByteBuffer row = this.memoryManager.AllocateCleanManagedByteBuffer(arrayWidth + padding))
             {
                 var color = default(TPixel);
                 var rgba = new Rgba32(0, 0, 0, 255);
@@ -398,7 +398,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             var color = default(TPixel);
             var rgba = new Rgba32(0, 0, 0, 255);
 
-            using (var buffer = this.configuration.MemoryManager.AllocateManagedByteBuffer(stride))
+            using (var buffer = this.memoryManager.AllocateManagedByteBuffer(stride))
             {
                 for (int y = 0; y < height; y++)
                 {
diff --git a/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.CopyTo.cs b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.CopyTo.cs
index 39a6bee2e..ca167015b 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.CopyTo.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.CopyTo.cs
@@ -53,7 +53,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         public void CopyTo(BufferArea<float> area)
         {
             ref byte selfBase = ref Unsafe.As<Block8x8F, byte>(ref this);
-            ref byte destBase = ref Unsafe.As<float, byte>(ref area.GetReferenceToOrigo());
+            ref byte destBase = ref Unsafe.As<float, byte>(ref area.GetReferenceToOrigin());
             int destStride = area.Stride * sizeof(float);
 
             CopyRowImpl(ref selfBase, ref destBase, destStride, 0);
@@ -76,7 +76,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
 
         private void CopyTo2x2(BufferArea<float> area)
         {
-            ref float destBase = ref area.GetReferenceToOrigo();
+            ref float destBase = ref area.GetReferenceToOrigin();
             int destStride = area.Stride;
 
             this.WidenCopyImpl2x2(ref destBase, 0, destStride);
diff --git a/src/ImageSharp/Memory/BufferArea{T}.cs b/src/ImageSharp/Memory/BufferArea{T}.cs
index 850cc4c16..e88ed6ca8 100644
--- a/src/ImageSharp/Memory/BufferArea{T}.cs
+++ b/src/ImageSharp/Memory/BufferArea{T}.cs
@@ -78,7 +78,7 @@ namespace SixLabors.ImageSharp.Memory
         /// </summary>
         /// <returns>The reference to the [0,0] element</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ref T GetReferenceToOrigo() =>
+        public ref T GetReferenceToOrigin() =>
             ref this.DestinationBuffer.Span[(this.Rectangle.Y * this.DestinationBuffer.Width) + this.Rectangle.X];
 
         /// <summary>

From ef630f152e3f2e2fee09b1886dbd0257f02deeec Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Mon, 26 Feb 2018 21:17:18 +0100
Subject: [PATCH 64/70] added comments for the WeakReference stuff

---
 .../Memory/ArrayPoolMemoryManager.Buffer{T}.cs      |  4 ++++
 .../Memory/ArrayPoolMemoryManagerTests.cs           | 13 ++++++++++---
 tests/ImageSharp.Tests/Memory/BufferAreaTests.cs    |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs b/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
index a00ee8c30..d4f58fb6f 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs
@@ -25,6 +25,10 @@ namespace SixLabors.ImageSharp.Memory
             /// <summary>
             /// A weak reference to the source pool.
             /// </summary>
+            /// <remarks>
+            /// By using a weak reference here, we are making sure that array pools and their retained arrays are always GC-ed
+            /// after a call to <see cref="ArrayPoolMemoryManager.ReleaseRetainedResources"/>, regardless of having buffer instances still being in use.
+            /// </remarks>
             private WeakReference<ArrayPool<byte>> sourcePoolReference;
 
             public Buffer(byte[] data, int length, ArrayPool<byte> sourcePool)
diff --git a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
index 805bc908c..a199bb319 100644
--- a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
+++ b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
@@ -127,14 +127,21 @@ namespace SixLabors.ImageSharp.Tests.Memory
             }
         }
 
-        [Fact]
-        public void ReleaseRetainedResources_ReplacesInnerArrayPool()
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void ReleaseRetainedResources_ReplacesInnerArrayPool(bool keepBufferAlive)
         {
             IBuffer<int> buffer = this.MemoryManager.Allocate<int>(32);
             ref int ptrToPrev0 = ref buffer.Span.DangerousGetPinnableReference();
-            buffer.Dispose();
+
+            if (!keepBufferAlive)
+            {
+                buffer.Dispose();
+            }
 
             this.MemoryManager.ReleaseRetainedResources();
+            
             buffer = this.MemoryManager.Allocate<int>(32);
 
             Assert.False(Unsafe.AreSame(ref ptrToPrev0, ref buffer.DangerousGetPinnableReference()));
diff --git a/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs b/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs
index e96aa2e37..db7367d97 100644
--- a/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs
+++ b/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs
@@ -104,7 +104,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             {
                 BufferArea<int> area0 = buffer.GetArea(6, 8, 10, 10);
 
-                ref int r = ref area0.GetReferenceToOrigo();
+                ref int r = ref area0.GetReferenceToOrigin();
 
                 int expected = buffer[6, 8];
                 Assert.Equal(expected, r);

From 87fe71511a1bc857fcb8bcba2ab8e74504b94665 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 27 Feb 2018 00:36:44 +0100
Subject: [PATCH 65/70] optimize ResizeProcessor parallel behavior and Span<T>
 usage

---
 .../Processors/Transforms/ResizeProcessor.cs  | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
index 1e7642250..0708a6c23 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
@@ -132,33 +132,35 @@ namespace SixLabors.ImageSharp.Processing.Processors
                     0,
                     sourceRectangle.Bottom,
                     configuration.ParallelOptions,
-                    y =>
+                    () => this.MemoryManager.Allocate<Vector4>(source.Width),
+                    (int y, ParallelLoopState sate, IBuffer<Vector4> tempRowBuffer) =>
                         {
-                            // TODO: Without Parallel.For() this buffer object could be reused:
-                            using (IBuffer<Vector4> tempRowBuffer = this.MemoryManager.Allocate<Vector4>(source.Width))
-                            {
-                                Span<Vector4> firstPassRow = firstPassPixels.GetRowSpan(y);
-                                Span<TPixel> sourceRow = source.GetPixelRowSpan(y);
-                                PixelOperations<TPixel>.Instance.ToVector4(sourceRow, tempRowBuffer.Span, sourceRow.Length);
+                            Span<Vector4> firstPassRow = firstPassPixels.GetRowSpan(y);
+                            Span<TPixel> sourceRow = source.GetPixelRowSpan(y);
+                            Span<Vector4> tempRowSpan = tempRowBuffer.Span;
 
-                                if (this.Compand)
+                            PixelOperations<TPixel>.Instance.ToVector4(sourceRow, tempRowSpan, sourceRow.Length);
+
+                            if (this.Compand)
+                            {
+                                for (int x = minX; x < maxX; x++)
                                 {
-                                    for (int x = minX; x < maxX; x++)
-                                    {
-                                        WeightsWindow window = this.HorizontalWeights.Weights[x - startX];
-                                        firstPassRow[x] = window.ComputeExpandedWeightedRowSum(tempRowBuffer.Span, sourceX);
-                                    }
+                                    WeightsWindow window = this.HorizontalWeights.Weights[x - startX];
+                                    firstPassRow[x] = window.ComputeExpandedWeightedRowSum(tempRowSpan, sourceX);
                                 }
-                                else
+                            }
+                            else
+                            {
+                                for (int x = minX; x < maxX; x++)
                                 {
-                                    for (int x = minX; x < maxX; x++)
-                                    {
-                                        WeightsWindow window = this.HorizontalWeights.Weights[x - startX];
-                                        firstPassRow[x] = window.ComputeWeightedRowSum(tempRowBuffer.Span, sourceX);
-                                    }
+                                    WeightsWindow window = this.HorizontalWeights.Weights[x - startX];
+                                    firstPassRow[x] = window.ComputeWeightedRowSum(tempRowSpan, sourceX);
                                 }
                             }
-                        });
+
+                            return tempRowBuffer;
+                        },
+                    (IBuffer<Vector4> tmp) => tmp.Dispose());
 
                 // Now process the rows.
                 Parallel.For(

From 09d993b503a186fd6a28f24c496d8476ce06a0ae Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 27 Feb 2018 00:37:23 +0100
Subject: [PATCH 66/70] introducing ParallelFor.WithTemporalBuffer(): common
 utility for the parallel buffer reusal trick

---
 src/ImageSharp/Common/Helpers/ParallelFor.cs  | 60 +++++++++++++++++++
 .../Processors/Transforms/ResizeProcessor.cs  | 13 ++--
 2 files changed, 65 insertions(+), 8 deletions(-)
 create mode 100644 src/ImageSharp/Common/Helpers/ParallelFor.cs

diff --git a/src/ImageSharp/Common/Helpers/ParallelFor.cs b/src/ImageSharp/Common/Helpers/ParallelFor.cs
new file mode 100644
index 000000000..9a30b0b50
--- /dev/null
+++ b/src/ImageSharp/Common/Helpers/ParallelFor.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Threading.Tasks;
+using SixLabors.ImageSharp.Memory;
+
+namespace SixLabors.ImageSharp
+{
+    /// <summary>
+    /// Utility methods for Parallel.For() execution. Use this instead of raw <see cref="Parallel"/> calls!
+    /// </summary>
+    internal static class ParallelFor
+    {
+        /// <summary>
+        /// Helper method to execute Parallel.For using the settings in <see cref="Configuration.ParallelOptions"/>
+        /// </summary>
+        public static void WithConfiguration(int fromInclusive, int toExclusive, Configuration configuration, Action<int> body)
+        {
+            Parallel.For(fromInclusive, toExclusive, configuration.ParallelOptions, body);
+        }
+
+        /// <summary>
+        /// Helper method to execute Parallel.For with temporal worker buffer in an optimized way.
+        /// The buffer will be only instantiated for each worker Task, the contents are not cleaned automatically.
+        /// </summary>
+        /// <typeparam name="T">The value type of the buffer</typeparam>
+        /// <param name="fromInclusive">The start index, inclusive.</param>
+        /// <param name="toExclusive">The end index, exclusive.</param>
+        /// <param name="configuration">The <see cref="Configuration"/> used for getting the <see cref="MemoryManager"/> and <see cref="ParallelOptions"/></param>
+        /// <param name="bufferLength">The length of the requested parallel buffer</param>
+        /// <param name="body">The delegate that is invoked once per iteration.</param>
+        public static void WithTemporalBuffer<T>(
+            int fromInclusive,
+            int toExclusive,
+            Configuration configuration,
+            int bufferLength,
+            Action<int, IBuffer<T>> body)
+            where T : struct
+        {
+            MemoryManager memoryManager = configuration.MemoryManager;
+            ParallelOptions parallelOptions = configuration.ParallelOptions;
+
+            IBuffer<T> InitBuffer()
+            {
+                return memoryManager.Allocate<T>(bufferLength);
+            }
+
+            void CleanUpBuffer(IBuffer<T> buffer)
+            {
+                buffer.Dispose();
+            }
+
+            IBuffer<T> BodyFunc(int i, ParallelLoopState state, IBuffer<T> buffer)
+            {
+                body(i, buffer);
+                return buffer;
+            }
+
+            Parallel.For(fromInclusive, toExclusive, parallelOptions, InitBuffer, BodyFunc, CleanUpBuffer);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
index 0708a6c23..169496a98 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
@@ -128,12 +128,12 @@ namespace SixLabors.ImageSharp.Processing.Processors
             {
                 firstPassPixels.Buffer.Clear();
 
-                Parallel.For(
+                ParallelFor.WithTemporalBuffer(
                     0,
                     sourceRectangle.Bottom,
-                    configuration.ParallelOptions,
-                    () => this.MemoryManager.Allocate<Vector4>(source.Width),
-                    (int y, ParallelLoopState sate, IBuffer<Vector4> tempRowBuffer) =>
+                    configuration,
+                    source.Width,
+                    (int y, IBuffer<Vector4> tempRowBuffer) =>
                         {
                             Span<Vector4> firstPassRow = firstPassPixels.GetRowSpan(y);
                             Span<TPixel> sourceRow = source.GetPixelRowSpan(y);
@@ -157,10 +157,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                                     firstPassRow[x] = window.ComputeWeightedRowSum(tempRowSpan, sourceX);
                                 }
                             }
-
-                            return tempRowBuffer;
-                        },
-                    (IBuffer<Vector4> tmp) => tmp.Dispose());
+                        });
 
                 // Now process the rows.
                 Parallel.For(

From 70839cad77d910d5f4126f959b6f6754f1a2e222 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 27 Feb 2018 02:03:11 +0100
Subject: [PATCH 67/70] removed Span bottleneck from Block8x8F.CopyTo() +
 removed unnecessary pinning from OrigHuffmanTree

(cherry picked from commit 81f6a9407b81be97706286f7974c419583dddf8a)
---
 .../Formats/Jpeg/Common/Block8x8F.CopyTo.cs   |  7 ++-
 .../Components/Decoder/InputProcessor.cs      |  4 +-
 .../Components/Decoder/OrigHuffmanTree.cs     | 60 +++++++++++--------
 src/ImageSharp/Memory/BufferArea{T}.cs        |  2 +-
 4 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.CopyTo.cs b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.CopyTo.cs
index ca167015b..d8963a8b6 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.CopyTo.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.CopyTo.cs
@@ -26,6 +26,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
                 return;
             }
 
+            ref float destBase = ref area.GetReferenceToOrigin();
+
             // TODO: Optimize: implement all the cases with loopless special code! (T4?)
             for (int y = 0; y < 8; y++)
             {
@@ -40,9 +42,12 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
 
                     for (int i = 0; i < verticalScale; i++)
                     {
+                        int baseIdx = ((yy + i) * area.Stride) + xx;
+
                         for (int j = 0; j < horizontalScale; j++)
                         {
-                            area[xx + j, yy + i] = value;
+                            // area[xx + j, yy + i] = value;
+                            Unsafe.Add(ref destBase, baseIdx + j) = value;
                         }
                     }
                 }
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
index f06509200..e9f468a85 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
@@ -223,7 +223,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                 if (this.LastErrorCode == OrigDecoderErrorCode.NoError)
                 {
                     int lutIndex = (this.Bits.Accumulator >> (this.Bits.UnreadBits - OrigHuffmanTree.LutSizeLog2)) & 0xFF;
-                    int v = huffmanTree.ReadLut(lutIndex);
+                    int v = huffmanTree.Lut[lutIndex];
 
                     if (v != 0)
                     {
@@ -262,7 +262,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                 this.Bits.UnreadBits--;
                 this.Bits.Mask >>= 1;
 
-                if (code <= huffmanTree.GetMaxCode(i))
+                if (code <= huffmanTree.MaxCodes[i])
                 {
                     result = huffmanTree.GetValue(code, i);
                     return this.LastErrorCode = OrigDecoderErrorCode.NoError;
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs
index f773a12df..85273c69e 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs
@@ -4,12 +4,14 @@
 using System;
 using System.Buffers;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     /// <summary>
     /// Represents a Huffman tree
     /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
     internal unsafe struct OrigHuffmanTree
     {
         /// <summary>
@@ -68,29 +70,29 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// are 1 plus the code length, or 0 if the value is too large to fit in
         /// lutSize bits.
         /// </summary>
-        public fixed int Lut[MaxNCodes];
+        public FixedInt32Buffer256 Lut;
 
         /// <summary>
         /// Gets the the decoded values, sorted by their encoding.
         /// </summary>
-        public fixed int Values[MaxNCodes];
+        public FixedInt32Buffer256 Values;
 
         /// <summary>
         /// Gets the array of minimum codes.
         /// MinCodes[i] is the minimum code of length i, or -1 if there are no codes of that length.
         /// </summary>
-        public fixed int MinCodes[MaxCodeLength];
+        public FixedInt32Buffer16 MinCodes;
 
         /// <summary>
         /// Gets the array of maximum codes.
         /// MaxCodes[i] is the maximum code of length i, or -1 if there are no codes of that length.
         /// </summary>
-        public fixed int MaxCodes[MaxCodeLength];
+        public FixedInt32Buffer16 MaxCodes;
 
         /// <summary>
         /// Gets the array of indices. Indices[i] is the index into Values of MinCodes[i].
         /// </summary>
-        public fixed int Indices[MaxCodeLength];
+        public FixedInt32Buffer16 Indices;
 
         /// <summary>
         /// Creates and initializes an array of <see cref="OrigHuffmanTree" /> instances of size <see cref="NumberOfTrees" />
@@ -143,8 +145,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
             byte[] values = new byte[MaxNCodes];
             inputProcessor.ReadFull(values, 0, this.Length);
 
-            fixed (int* valuesPtr = this.Values)
-            fixed (int* lutPtr = this.Lut)
+            fixed (int* valuesPtr = this.Values.Data)
+            fixed (int* lutPtr = this.Lut.Data)
             {
                 for (int i = 0; i < values.Length; i++)
                 {
@@ -184,9 +186,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                 }
             }
 
-            fixed (int* minCodesPtr = this.MinCodes)
-            fixed (int* maxCodesPtr = this.MaxCodes)
-            fixed (int* indicesPtr = this.Indices)
+            fixed (int* minCodesPtr = this.MinCodes.Data)
+            fixed (int* maxCodesPtr = this.MaxCodes.Data)
+            fixed (int* indicesPtr = this.Indices.Data)
             {
                 // Derive minCodes, maxCodes, and indices.
                 int c = 0, index = 0;
@@ -219,31 +221,41 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// <param name="code">The code</param>
         /// <param name="codeLength">The code length</param>
         /// <returns>The value</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public int GetValue(int code, int codeLength)
         {
-            fixed (int* valuesPtr = this.Values)
-            fixed (int* minCodesPtr = this.MinCodes)
-            fixed (int* indicesPtr = this.Indices)
-            {
-                return valuesPtr[indicesPtr[codeLength] + code - minCodesPtr[codeLength]];
-            }
+            return this.Values[this.Indices[codeLength] + code - this.MinCodes[codeLength]];
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public int ReadLut(int index)
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct FixedInt32Buffer256
         {
-            fixed (int* lutPtr = this.Lut)
+            public fixed int Data[256];
+
+            public int this[int idx]
             {
-                return lutPtr[index];
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get
+                {
+                    ref int self = ref Unsafe.As<FixedInt32Buffer256, int>(ref this);
+                    return Unsafe.Add(ref self, idx);
+                }
             }
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public int GetMaxCode(int index)
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct FixedInt32Buffer16
         {
-            fixed (int* maxCodesPtr = this.MaxCodes)
+            public fixed int Data[16];
+
+            public int this[int idx]
             {
-                return maxCodesPtr[index];
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get
+                {
+                    ref int self = ref Unsafe.As<FixedInt32Buffer16, int>(ref this);
+                    return Unsafe.Add(ref self, idx);
+                }
             }
         }
     }
diff --git a/src/ImageSharp/Memory/BufferArea{T}.cs b/src/ImageSharp/Memory/BufferArea{T}.cs
index e88ed6ca8..588eae483 100644
--- a/src/ImageSharp/Memory/BufferArea{T}.cs
+++ b/src/ImageSharp/Memory/BufferArea{T}.cs
@@ -137,7 +137,7 @@ namespace SixLabors.ImageSharp.Memory
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private int GetRowIndex(int y)
+        internal int GetRowIndex(int y)
         {
             return (y + this.Rectangle.Y) * this.DestinationBuffer.Width;
         }

From 90937b57caf88964d0bfeb6218231e7dc3d3b0eb Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 27 Feb 2018 02:19:01 +0100
Subject: [PATCH 68/70] Removing all the buffer magic from the Bytes struct. It
 only made things worse!

(cherry picked from commit 0bf64a09598ba988318c170259a7aab4d9391cb5)
---
 .../GolangPort/Components/Decoder/Bytes.cs    | 35 ++++++++-----------
 .../Components/Decoder/InputProcessor.cs      |  4 +--
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
index c10771b46..3fc46093e 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
@@ -28,12 +28,12 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// buffer[i:j] are the buffered bytes read from the underlying
         /// stream that haven't yet been passed further on.
         /// </summary>
-        public IManagedByteBuffer Buffer;
+        public byte[] Buffer;
 
         /// <summary>
         /// Values of <see cref="Buffer"/> converted to <see cref="int"/>-s
         /// </summary>
-        public IBuffer<int> BufferAsInt;
+        public int[] BufferAsInt;
 
         /// <summary>
         /// Start of bytes read
@@ -58,10 +58,12 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// <returns>The bytes created</returns>
         public static Bytes Create(MemoryManager memoryManager)
         {
+            // DO NOT bother with buffers and array pooling here!
+            // It only makes things worse!
             return new Bytes
             {
-                Buffer = memoryManager.AllocateManagedByteBuffer(BufferSize),
-                BufferAsInt = memoryManager.Allocate<int>(BufferSize)
+                Buffer = new byte[BufferSize],
+                BufferAsInt = new int[BufferSize]
             };
         }
 
@@ -70,9 +72,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// </summary>
         public void Dispose()
         {
-            this.Buffer?.Dispose();
-            this.BufferAsInt?.Dispose();
-
             this.Buffer = null;
             this.BufferAsInt = null;
         }
@@ -88,8 +87,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
             // Take the fast path if bytes.buf contains at least two bytes.
             if (this.I + 2 <= this.J)
             {
-                Span<int> bufferSpan = this.BufferAsInt.Span;
-                x = bufferSpan[this.I];
+                x = this.BufferAsInt[this.I];
                 this.I++;
                 this.UnreadableBytes = 1;
                 if (x != OrigJpegConstants.Markers.XFFInt)
@@ -97,7 +95,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                     return OrigDecoderErrorCode.NoError;
                 }
 
-                if (bufferSpan[this.I] != 0x00)
+                if (this.BufferAsInt[this.I] != 0x00)
                 {
                     return OrigDecoderErrorCode.MissingFF00;
                 }
@@ -171,7 +169,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                 }
             }
 
-            result = this.Buffer.Span[this.I];
+            result = this.Buffer[this.I];
             this.I++;
             this.UnreadableBytes = 0;
             return errorCode;
@@ -197,7 +195,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                 }
             }
 
-            result = this.BufferAsInt.Span[this.I];
+            result = this.BufferAsInt[this.I];
             this.I++;
             this.UnreadableBytes = 0;
             return errorCode;
@@ -231,20 +229,18 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
                 DecoderThrowHelper.ThrowImageFormatException.FillCalledWhenUnreadBytesExist();
             }
 
-            Span<byte> byteSpan = this.Buffer.Span;
-
             // Move the last 2 bytes to the start of the buffer, in case we need
             // to call UnreadByteStuffedByte.
             if (this.J > 2)
             {
-                byteSpan[0] = byteSpan[this.J - 2];
-                byteSpan[1] = byteSpan[this.J - 1];
+                this.Buffer[0] = this.Buffer[this.J - 2];
+                this.Buffer[1] = this.Buffer[this.J - 1];
                 this.I = 2;
                 this.J = 2;
             }
 
             // Fill in the rest of the buffer.
-            int n = inputStream.Read(this.Buffer.Array, this.J, byteSpan.Length - this.J);
+            int n = inputStream.Read(this.Buffer, this.J, this.Buffer.Length - this.J);
             if (n == 0)
             {
                 return OrigDecoderErrorCode.UnexpectedEndOfStream;
@@ -252,10 +248,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 
             this.J += n;
 
-            Span<int> intSpan = this.BufferAsInt.Span;
-            for (int i = 0; i < byteSpan.Length; i++)
+            for (int i = 0; i < this.Buffer.Length; i++)
             {
-                intSpan[i] = byteSpan[i];
+                this.BufferAsInt[i] = this.Buffer[i];
             }
 
             return OrigDecoderErrorCode.NoError;
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
index e9f468a85..e7c58f234 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
@@ -158,13 +158,13 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
             {
                 if (this.Bytes.J - this.Bytes.I >= length)
                 {
-                    Array.Copy(this.Bytes.Buffer.Array, this.Bytes.I, data, offset, length);
+                    Array.Copy(this.Bytes.Buffer, this.Bytes.I, data, offset, length);
                     this.Bytes.I += length;
                     length -= length;
                 }
                 else
                 {
-                    Array.Copy(this.Bytes.Buffer.Array, this.Bytes.I, data, offset, this.Bytes.J - this.Bytes.I);
+                    Array.Copy(this.Bytes.Buffer, this.Bytes.I, data, offset, this.Bytes.J - this.Bytes.I);
                     offset += this.Bytes.J - this.Bytes.I;
                     length -= this.Bytes.J - this.Bytes.I;
                     this.Bytes.I += this.Bytes.J - this.Bytes.I;

From 34e3920a4fd28fcd9473592d5b9f11975eb9b10f Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Tue, 27 Feb 2018 17:34:09 +1100
Subject: [PATCH 69/70] Remove unneeded parameter

---
 .../Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs     | 6 +-----
 .../Jpeg/GolangPort/Components/Decoder/InputProcessor.cs    | 5 ++---
 .../Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs          | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
index 3fc46093e..2a3817400 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
@@ -2,12 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Buffers;
 using System.IO;
 using System.Runtime.CompilerServices;
 
-using SixLabors.ImageSharp.Memory;
-
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     /// <summary>
@@ -54,9 +51,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// <summary>
         /// Creates a new instance of the <see cref="Bytes"/>, and initializes it's buffer.
         /// </summary>
-        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <returns>The bytes created</returns>
-        public static Bytes Create(MemoryManager memoryManager)
+        public static Bytes Create()
         {
             // DO NOT bother with buffers and array pooling here!
             // It only makes things worse!
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
index e7c58f234..01bd65bfc 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
@@ -28,13 +28,12 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// <summary>
         /// Initializes a new instance of the <see cref="InputProcessor"/> struct.
         /// </summary>
-        /// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
         /// <param name="inputStream">The input <see cref="Stream"/></param>
         /// <param name="temp">Temporal buffer, same as <see cref="OrigJpegDecoderCore.Temp"/></param>
-        public InputProcessor(MemoryManager memoryManager, Stream inputStream, byte[] temp)
+        public InputProcessor(Stream inputStream, byte[] temp)
         {
             this.Bits = default(Bits);
-            this.Bytes = Bytes.Create(memoryManager);
+            this.Bytes = Bytes.Create();
             this.InputStream = inputStream;
             this.Temp = temp;
             this.LastErrorCode = OrigDecoderErrorCode.NoError;
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
index ddc294fa4..33d625725 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
@@ -231,7 +231,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
         {
             this.MetaData = new ImageMetaData();
             this.InputStream = stream;
-            this.InputProcessor = new InputProcessor(this.configuration.MemoryManager, stream, this.Temp);
+            this.InputProcessor = new InputProcessor(stream, this.Temp);
 
             // Check for the Start Of Image marker.
             this.InputProcessor.ReadFull(this.Temp, 0, 2);

From 59f1f0fc05a2e3c9cb70ff69b86eca60994b00ed Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 27 Feb 2018 16:44:43 +0100
Subject: [PATCH 70/70] Temporary Vortex

---
 src/ImageSharp.Drawing/Paths/ShapeRegion.cs               | 2 +-
 src/ImageSharp/Common/Extensions/SimdUtils.cs             | 4 ++--
 src/ImageSharp/Common/Helpers/ParallelFor.cs              | 6 +++---
 .../Jpeg/Common/Decoder/JpegComponentPostProcessor.cs     | 2 +-
 .../Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs | 2 +-
 .../Jpeg/GolangPort/Components/Decoder/InputProcessor.cs  | 2 +-
 .../Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs | 2 +-
 src/ImageSharp/Memory/Buffer2D{T}.cs                      | 2 +-
 .../Processing/Processors/Transforms/ResizeProcessor.cs   | 2 +-
 .../ReferenceImplementations.LLM_FloatingPoint_DCT.cs     | 2 +-
 .../ImageSharp.Tests/TestUtilities/TestImageExtensions.cs | 8 ++++----
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/ImageSharp.Drawing/Paths/ShapeRegion.cs b/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
index 072a38cf8..cc27f7fbb 100644
--- a/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
+++ b/src/ImageSharp.Drawing/Paths/ShapeRegion.cs
@@ -47,7 +47,7 @@ namespace SixLabors.ImageSharp.Drawing
             var start = new PointF(this.Bounds.Left - 1, y);
             var end = new PointF(this.Bounds.Right + 1, y);
 
-            // TODO: This is a temporal workaround because of the lack of Span<T> API-s on IPath. We should use MemoryManager.Allocate() here!
+            // TODO: This is a temporary workaround because of the lack of Span<T> API-s on IPath. We should use MemoryManager.Allocate() here!
             PointF[] innerBuffer = new PointF[buffer.Length];
             int count = this.Shape.FindIntersections(start, end, innerBuffer, 0);
 
diff --git a/src/ImageSharp/Common/Extensions/SimdUtils.cs b/src/ImageSharp/Common/Extensions/SimdUtils.cs
index 0188bc03c..7f46b7a84 100644
--- a/src/ImageSharp/Common/Extensions/SimdUtils.cs
+++ b/src/ImageSharp/Common/Extensions/SimdUtils.cs
@@ -83,7 +83,7 @@ namespace SixLabors.ImageSharp
             Vector<float> magick = new Vector<float>(32768.0f);
             Vector<float> scale = new Vector<float>(255f) / new Vector<float>(256f);
 
-            // need to copy to a temporal struct, because
+            // need to copy to a temporary struct, because
             // SimdUtils.Octet.OfUInt32 temp = Unsafe.As<Vector<float>, SimdUtils.Octet.OfUInt32>(ref x)
             // does not work. TODO: This might be a CoreClr bug, need to ask/report
             var temp = default(Octet.OfUInt32);
@@ -124,7 +124,7 @@ namespace SixLabors.ImageSharp
             Vector<float> magick = new Vector<float>(32768.0f);
             Vector<float> scale = new Vector<float>(255f) / new Vector<float>(256f);
 
-            // need to copy to a temporal struct, because
+            // need to copy to a temporary struct, because
             // SimdUtils.Octet.OfUInt32 temp = Unsafe.As<Vector<float>, SimdUtils.Octet.OfUInt32>(ref x)
             // does not work. TODO: This might be a CoreClr bug, need to ask/report
             var temp = default(Octet.OfUInt32);
diff --git a/src/ImageSharp/Common/Helpers/ParallelFor.cs b/src/ImageSharp/Common/Helpers/ParallelFor.cs
index 9a30b0b50..da9125905 100644
--- a/src/ImageSharp/Common/Helpers/ParallelFor.cs
+++ b/src/ImageSharp/Common/Helpers/ParallelFor.cs
@@ -18,8 +18,8 @@ namespace SixLabors.ImageSharp
         }
 
         /// <summary>
-        /// Helper method to execute Parallel.For with temporal worker buffer in an optimized way.
-        /// The buffer will be only instantiated for each worker Task, the contents are not cleaned automatically.
+        /// Helper method to execute Parallel.For with temporary worker buffer shared between executing tasks.
+        /// The buffer is not guaranteed to be clean!
         /// </summary>
         /// <typeparam name="T">The value type of the buffer</typeparam>
         /// <param name="fromInclusive">The start index, inclusive.</param>
@@ -27,7 +27,7 @@ namespace SixLabors.ImageSharp
         /// <param name="configuration">The <see cref="Configuration"/> used for getting the <see cref="MemoryManager"/> and <see cref="ParallelOptions"/></param>
         /// <param name="bufferLength">The length of the requested parallel buffer</param>
         /// <param name="body">The delegate that is invoked once per iteration.</param>
-        public static void WithTemporalBuffer<T>(
+        public static void WithTemporaryBuffer<T>(
             int fromInclusive,
             int toExclusive,
             Configuration configuration,
diff --git a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegComponentPostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegComponentPostProcessor.cs
index ea9e52ae1..1be637b6d 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegComponentPostProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegComponentPostProcessor.cs
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
         public IJpegComponent Component { get; }
 
         /// <summary>
-        /// Gets the temporal working buffer of color values.
+        /// Gets the temporary working buffer of color values.
         /// </summary>
         public Buffer2D<float> ColorBuffer { get; }
 
diff --git a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
index aa1c216a7..2adf3e02d 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs
@@ -74,7 +74,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
         public int NumberOfPostProcessorSteps { get; }
 
         /// <summary>
-        /// Gets the size of the temporal buffers we need to allocate into <see cref="JpegComponentPostProcessor.ColorBuffer"/>.
+        /// Gets the size of the temporary buffers we need to allocate into <see cref="JpegComponentPostProcessor.ColorBuffer"/>.
         /// </summary>
         public Size PostProcessorBufferSize { get; }
 
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
index e7c58f234..3bef32551 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
@@ -46,7 +46,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         public Stream InputStream { get; }
 
         /// <summary>
-        /// Gets the temporal buffer, same instance as <see cref="OrigJpegDecoderCore.Temp"/>
+        /// Gets the temporary buffer, same instance as <see cref="OrigJpegDecoderCore.Temp"/>
         /// </summary>
         public byte[] Temp { get; }
 
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs
index 85273c69e..dbc7bb0f7 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs
@@ -107,7 +107,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
         /// Internal part of the DHT processor, whatever does it mean
         /// </summary>
         /// <param name="inputProcessor">The decoder instance</param>
-        /// <param name="defineHuffmanTablesData">The temporal buffer that holds the data that has been read from the Jpeg stream</param>
+        /// <param name="defineHuffmanTablesData">The temporary buffer that holds the data that has been read from the Jpeg stream</param>
         /// <param name="remaining">Remaining bits</param>
         public void ProcessDefineHuffmanTablesMarkerLoop(
             ref InputProcessor inputProcessor,
diff --git a/src/ImageSharp/Memory/Buffer2D{T}.cs b/src/ImageSharp/Memory/Buffer2D{T}.cs
index 7f9fb59c4..dc992368c 100644
--- a/src/ImageSharp/Memory/Buffer2D{T}.cs
+++ b/src/ImageSharp/Memory/Buffer2D{T}.cs
@@ -72,7 +72,7 @@ namespace SixLabors.ImageSharp.Memory
 
         /// <summary>
         /// Swap the contents (<see cref="Buffer"/>, <see cref="Width"/>, <see cref="Height"/>) of the two buffers.
-        /// Useful to transfer the contents of a temporal <see cref="Buffer2D{T}"/> to a persistent <see cref="ImageFrame{TPixel}.PixelBuffer"/>
+        /// Useful to transfer the contents of a temporary <see cref="Buffer2D{T}"/> to a persistent <see cref="ImageFrame{TPixel}.PixelBuffer"/>
         /// </summary>
         /// <param name="a">The first buffer</param>
         /// <param name="b">The second buffer</param>
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
index 169496a98..2c18dc29b 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
@@ -128,7 +128,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
             {
                 firstPassPixels.Buffer.Clear();
 
-                ParallelFor.WithTemporalBuffer(
+                ParallelFor.WithTemporaryBuffer(
                     0,
                     sourceRectangle.Bottom,
                     configuration,
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.LLM_FloatingPoint_DCT.cs b/tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.LLM_FloatingPoint_DCT.cs
index 37d42eb72..e18323f84 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.LLM_FloatingPoint_DCT.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.LLM_FloatingPoint_DCT.cs
@@ -131,7 +131,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
 
             /// <summary>
             /// Original: https://github.com/norishigefukushima/dct_simd/blob/master/dct/dct8x8_simd.cpp#L239
-            /// Applyies IDCT transformation on "s" copying transformed values to "d", using temporal block "temp"
+            /// Applyies IDCT transformation on "s" copying transformed values to "d", using temporary block "temp"
             /// </summary>
             /// <param name="s"></param>
             /// <param name="d"></param>
diff --git a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
index e9dc09989..6014e2533 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
@@ -254,7 +254,7 @@ namespace SixLabors.ImageSharp.Tests
                 testOutputDetails,
                 appendPixelTypeToFileName);
 
-            var temporalFrameImages = new List<Image<TPixel>>();
+            var temporaryFrameImages = new List<Image<TPixel>>();
 
             IImageDecoder decoder = TestEnvironment.GetReferenceDecoder(frameFiles[0]);
 
@@ -266,14 +266,14 @@ namespace SixLabors.ImageSharp.Tests
                 }
 
                 var tempImage = Image.Load<TPixel>(path, decoder);
-                temporalFrameImages.Add(tempImage);
+                temporaryFrameImages.Add(tempImage);
             }
 
-            Image<TPixel> firstTemp = temporalFrameImages[0];
+            Image<TPixel> firstTemp = temporaryFrameImages[0];
             
             var result = new Image<TPixel>(firstTemp.Width, firstTemp.Height);
 
-            foreach (Image<TPixel> fi in temporalFrameImages)
+            foreach (Image<TPixel> fi in temporaryFrameImages)
             {
                 result.Frames.AddFrame(fi.Frames.RootFrame);
                 fi.Dispose();