From 31b77898552b0018ec40c8d01152ef182c9bfd7e Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sun, 17 Jun 2018 20:53:21 +0200
Subject: [PATCH] reference UnmanagedMemoryStream and implement
 ReadOnlySpan<byte> overloads of Image.Load()

---
 src/ImageSharp/Image.FromBytes.cs | 39 ++++++++++++++++++++++++++-----
 src/ImageSharp/ImageSharp.csproj  |  3 +++
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/ImageSharp/Image.FromBytes.cs b/src/ImageSharp/Image.FromBytes.cs
index 7e55fe787..8365dbd50 100644
--- a/src/ImageSharp/Image.FromBytes.cs
+++ b/src/ImageSharp/Image.FromBytes.cs
@@ -173,6 +173,8 @@ namespace SixLabors.ImageSharp
             }
         }
 
+#if !NETSTANDARD1_1
+
         /// <summary>
         /// Load a new instance of <see cref="Image{Rgba32}"/> from the given encoded byte span.
         /// </summary>
@@ -205,10 +207,16 @@ namespace SixLabors.ImageSharp
         /// <param name="data">The byte span containing encoded image data.</param>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
-        public static Image<TPixel> Load<TPixel>(Configuration config, ReadOnlySpan<byte> data)
+        public static unsafe Image<TPixel> Load<TPixel>(Configuration config, ReadOnlySpan<byte> data)
             where TPixel : struct, IPixel<TPixel>
         {
-            throw new NotImplementedException();
+            fixed (byte* ptr = &data.GetPinnableReference())
+            {
+                using (var stream = new UnmanagedMemoryStream(ptr, data.Length))
+                {
+                    return Load<TPixel>(config, stream);
+                }
+            }
         }
 
         /// <summary>
@@ -219,10 +227,19 @@ namespace SixLabors.ImageSharp
         /// <param name="decoder">The decoder.</param>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
-        public static Image<TPixel> Load<TPixel>(Configuration config, ReadOnlySpan<byte> data, IImageDecoder decoder)
+        public static unsafe Image<TPixel> Load<TPixel>(
+            Configuration config,
+            ReadOnlySpan<byte> data,
+            IImageDecoder decoder)
             where TPixel : struct, IPixel<TPixel>
         {
-            throw new NotImplementedException();
+            fixed (byte* ptr = &data.GetPinnableReference())
+            {
+                using (var stream = new UnmanagedMemoryStream(ptr, data.Length))
+                {
+                    return Load<TPixel>(config, stream, decoder);
+                }
+            }
         }
 
         /// <summary>
@@ -233,10 +250,20 @@ namespace SixLabors.ImageSharp
         /// <param name="format">The <see cref="IImageFormat"/> of the decoded image.</param>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
-        public static Image<TPixel> Load<TPixel>(Configuration config, ReadOnlySpan<byte> data, out IImageFormat format)
+        public static unsafe Image<TPixel> Load<TPixel>(
+            Configuration config,
+            ReadOnlySpan<byte> data,
+            out IImageFormat format)
             where TPixel : struct, IPixel<TPixel>
         {
-            throw new NotImplementedException();
+            fixed (byte* ptr = &data.GetPinnableReference())
+            {
+                using (var stream = new UnmanagedMemoryStream(ptr, data.Length))
+                {
+                    return Load<TPixel>(config, stream, out format);
+                }
+            }
         }
+#endif
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
index b1934faa6..9860486e3 100644
--- a/src/ImageSharp/ImageSharp.csproj
+++ b/src/ImageSharp/ImageSharp.csproj
@@ -44,6 +44,9 @@
     <PackageReference Include="System.Memory" Version="4.5.0" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.0" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.1' ">
+    <PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
+  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard1.3'">
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
     <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />