From b32c7849f321fffc9dadac8d5a7c05207e90501c Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sat, 9 Jun 2018 13:54:32 +0200
Subject: [PATCH] introduce .GetPixelMemory(), get rid of
 BufferExtensions.GetMemory()

---
 .../Advanced/AdvancedImageExtensions.cs          | 12 ++++++++++++
 src/ImageSharp/Memory/BufferExtensions.cs        | 16 ----------------
 src/ImageSharp/Memory/IBuffer{T}.cs              |  7 ++++++-
 src/ImageSharp/PixelAccessor{TPixel}.cs          |  2 --
 tests/ImageSharp.Tests/Memory/BufferTestSuite.cs |  4 ++--
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/ImageSharp/Advanced/AdvancedImageExtensions.cs b/src/ImageSharp/Advanced/AdvancedImageExtensions.cs
index cbd8db748..5060f5f37 100644
--- a/src/ImageSharp/Advanced/AdvancedImageExtensions.cs
+++ b/src/ImageSharp/Advanced/AdvancedImageExtensions.cs
@@ -23,6 +23,18 @@ namespace SixLabors.ImageSharp.Advanced
             where TPixel : struct, IPixel<TPixel>
             => GetConfiguration((IConfigurable)source);
 
+        /// <summary>
+        /// Gets the <see cref="Memory{T}"/> storing the whole pixel buffer in row major order.
+        /// </summary>
+        /// <typeparam name="TPixel">The Pixel format.</typeparam>
+        /// <param name="source">The source <see cref="ImageFrame{TPixel}"/></param>
+        /// <returns>The <see cref="Memory{T}"/></returns>
+        public static Memory<TPixel> GetPixelMemory<TPixel>(this ImageFrame<TPixel> source)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            return source.PixelBuffer.Buffer.Memory;
+        }
+
         /// <summary>
         /// Returns a reference to the 0th element of the Pixel buffer,
         /// allowing direct manipulation of pixel data through unsafe operations.
diff --git a/src/ImageSharp/Memory/BufferExtensions.cs b/src/ImageSharp/Memory/BufferExtensions.cs
index 8da9157f4..0f04f34f2 100644
--- a/src/ImageSharp/Memory/BufferExtensions.cs
+++ b/src/ImageSharp/Memory/BufferExtensions.cs
@@ -10,22 +10,6 @@ namespace SixLabors.ImageSharp.Memory
 {
     internal static class BufferExtensions
     {
-        public static Memory<T> GetMemory<T>(this IBuffer<T> buffer)
-            where T : struct
-        {
-            System.Buffers.MemoryManager<T> bufferManager = buffer as System.Buffers.MemoryManager<T>;
-
-            if (bufferManager == null)
-            {
-                // TODO: We need a better way to integrate IBuffer<T> with MemoryManager<T>. The prior should probably entirely replace the latter!
-                throw new ArgumentException(
-                    "BufferExtensions.GetMemory<T>(buffer): buffer should be convertable to System.Buffers.MemoryManager<T>!",
-                    nameof(buffer));
-            }
-
-            return bufferManager.Memory;
-        }
-
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static int Length<T>(this IBuffer<T> buffer)
             where T : struct => buffer.GetSpan().Length;
diff --git a/src/ImageSharp/Memory/IBuffer{T}.cs b/src/ImageSharp/Memory/IBuffer{T}.cs
index ab139e175..c23a46e6a 100644
--- a/src/ImageSharp/Memory/IBuffer{T}.cs
+++ b/src/ImageSharp/Memory/IBuffer{T}.cs
@@ -15,9 +15,14 @@ namespace SixLabors.ImageSharp.Memory
         where T : struct
     {
         /// <summary>
-        /// Gets the span to the memory "promised" by this buffer
+        /// Gets the span to the memory "promised" by this buffer.
         /// </summary>
         /// <returns>The <see cref="Span{T}"/></returns>
         Span<T> GetSpan();
+
+        /// <summary>
+        /// Gets the <see cref="Memory{T}"/> ownerd by this buffer.
+        /// </summary>
+        Memory<T> Memory { get; }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/PixelAccessor{TPixel}.cs b/src/ImageSharp/PixelAccessor{TPixel}.cs
index 1e789f0a6..757983270 100644
--- a/src/ImageSharp/PixelAccessor{TPixel}.cs
+++ b/src/ImageSharp/PixelAccessor{TPixel}.cs
@@ -54,8 +54,6 @@ namespace SixLabors.ImageSharp
         /// <inheritdoc />
         public Span<TPixel> Span => this.PixelBuffer.Span;
 
-        private static PixelOperations<TPixel> Operations => PixelOperations<TPixel>.Instance;
-
         /// <summary>
         /// Gets or sets the pixel at the specified position.
         /// </summary>
diff --git a/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs b/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs
index fe2b1b8bf..b6385a424 100644
--- a/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs
+++ b/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs
@@ -290,7 +290,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             {
                 Span<CustomStruct> span0 = buffer.GetSpan();
                 span0[10].A = 30;
-                Memory<CustomStruct> memory = buffer.GetMemory();
+                Memory<CustomStruct> memory = buffer.Memory;
                 
                 Assert.Equal(42, memory.Length);
                 Span<CustomStruct> span1 = memory.Span;
@@ -308,7 +308,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 Span<int> span0 = buffer.GetSpan();
                 span0[10] = 30;
 
-                Memory<int> memory = buffer.GetMemory();
+                Memory<int> memory = buffer.Memory;
 
                 using (MemoryHandle h = memory.Pin())
                 {