Merge branch 'master' into js/faster-pdf-js-decoder

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

@@ -6,6 +6,7 @@
         <VersionPrefix Condition="$(packageversion) == ''">0.0.1</VersionPrefix>
         <Authors>SixLabors and contributors</Authors>
         <TargetFrameworks>netstandard1.1;netstandard2.0</TargetFrameworks>
+        <LangVersion>7.2</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <AssemblyName>SixLabors.ImageSharp.Drawing</AssemblyName>

src/ImageSharp/Formats/Jpeg/Common/Block8x8.cs

@@ -35,7 +35,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         public Block8x8(Span<short> coefficients)
         {
             ref byte selfRef = ref Unsafe.As<Block8x8, byte>(ref this);
-            ref byte sourceRef = ref MemoryMarshal.GetReference(coefficients.NonPortableCast<short, byte>());
+            ref byte sourceRef = ref MemoryMarshal.GetReference(MemoryMarshal.Cast<short, byte>(coefficients));
             Unsafe.CopyBlock(ref selfRef, ref sourceRef, Size * sizeof(short));
         }
 
@@ -205,7 +205,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         public void CopyTo(Span<short> destination)
         {
             ref byte selfRef = ref Unsafe.As<Block8x8, byte>(ref this);
-            ref byte destRef = ref MemoryMarshal.GetReference(destination.NonPortableCast<short, byte>());
+            ref byte destRef = ref MemoryMarshal.GetReference(MemoryMarshal.Cast<short, byte>(destination));
             Unsafe.CopyBlock(ref destRef, ref selfRef, Size * sizeof(short));
         }
 

src/ImageSharp/Formats/Png/PngDecoderCore.cs

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using System.Text;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Formats.Png.Filters;
@@ -776,7 +777,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                                 // TODO: Should we use pack from vector here instead?
                                 this.From16BitTo8Bit(scanlineBuffer, compressed.Span, length);
 
-                                Span<Rgb24> rgb24Span = compressed.Span.NonPortableCast<byte, Rgb24>();
+                                Span<Rgb24> rgb24Span = MemoryMarshal.Cast<byte, Rgb24>(compressed.Span);
                                 for (int x = 0; x < this.header.Width; x++)
                                 {
                                     ref Rgb24 rgb24 = ref rgb24Span[x];
@@ -791,7 +792,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                         }
                         else
                         {
-                            ReadOnlySpan<Rgb24> rgb24Span = scanlineBuffer.NonPortableCast<byte, Rgb24>();
+                            ReadOnlySpan<Rgb24> rgb24Span = MemoryMarshal.Cast<byte, Rgb24>(scanlineBuffer);
                             for (int x = 0; x < this.header.Width; x++)
                             {
                                 ref readonly Rgb24 rgb24 = ref rgb24Span[x];

src/ImageSharp/Formats/Png/PngEncoderCore.cs

@@ -559,7 +559,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                 {
                     for (int y = 0; y < this.height; y++)
                     {
-                        IManagedByteBuffer r = this.EncodePixelRow(pixels.GetPixelRowSpan(y).AsReadOnlySpan(), y);
+                        IManagedByteBuffer r = this.EncodePixelRow((ReadOnlySpan<TPixel>)pixels.GetPixelRowSpan(y), y);
                         deflateStream.Write(r.Array, 0, resultLength);
 
                         IManagedByteBuffer temp = this.rawScanline;

src/ImageSharp/Image.LoadPixelData.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 
@@ -71,7 +72,7 @@ namespace SixLabors.ImageSharp
         /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
         public static Image<TPixel> LoadPixelData<TPixel>(Configuration config, byte[] data, int width, int height)
             where TPixel : struct, IPixel<TPixel>
-            => LoadPixelData(config, new Span<byte>(data).NonPortableCast<byte, TPixel>(), width, height);
+            => LoadPixelData(config, MemoryMarshal.Cast<byte, TPixel>(data.AsSpan()), width, height);
 
         /// <summary>
         /// Create a new instance of the <see cref="Image{TPixel}"/> class from the given byte array in <typeparamref name="TPixel"/> format.
@@ -84,7 +85,7 @@ namespace SixLabors.ImageSharp
         /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
         private static Image<TPixel> LoadPixelData<TPixel>(Configuration config, Span<byte> data, int width, int height)
             where TPixel : struct, IPixel<TPixel>
-            => LoadPixelData(config, data.NonPortableCast<byte, TPixel>(), width, height);
+            => LoadPixelData(config, MemoryMarshal.Cast<byte, TPixel>(data), width, height);
 
         /// <summary>
         /// Create a new instance of the <see cref="Image{TPixel}"/> class from the raw <typeparamref name="TPixel"/> data.

src/ImageSharp/ImageExtensions.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using System.Text;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Formats;
@@ -112,7 +113,7 @@ namespace SixLabors.ImageSharp
         }
 
         /// <summary>
-        ///  Saves the raw image pixels to a byte array in row-major order.
+        /// Saves the raw image pixels to a byte array in row-major order.
         /// </summary>
         /// <typeparam name="TPixel">The Pixel format.</typeparam>
         /// <param name="source">The source image</param>
@@ -120,7 +121,7 @@ namespace SixLabors.ImageSharp
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         public static byte[] SavePixelData<TPixel>(this ImageFrame<TPixel> source)
             where TPixel : struct, IPixel<TPixel>
-         => source.GetPixelSpan().AsBytes().ToArray();
+         => MemoryMarshal.AsBytes(source.GetPixelSpan()).ToArray();
 
         /// <summary>
         /// Saves the raw image pixels to the given byte array in row-major order.
@@ -131,7 +132,7 @@ namespace SixLabors.ImageSharp
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         public static void SavePixelData<TPixel>(this ImageFrame<TPixel> source, byte[] buffer)
             where TPixel : struct, IPixel<TPixel>
-            => SavePixelData(source, buffer.AsSpan().NonPortableCast<byte, TPixel>());
+            => SavePixelData(source, MemoryMarshal.Cast<byte, TPixel>(buffer.AsSpan()));
 
         /// <summary>
         /// Saves the raw image pixels to the given TPixel array in row-major order.
@@ -205,7 +206,7 @@ namespace SixLabors.ImageSharp
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         internal static void SavePixelData<TPixel>(this Image<TPixel> source, Span<byte> buffer)
             where TPixel : struct, IPixel<TPixel>
-            => source.Frames.RootFrame.SavePixelData(buffer.NonPortableCast<byte, TPixel>());
+            => source.Frames.RootFrame.SavePixelData(MemoryMarshal.Cast<byte, TPixel>(buffer));
 
         /// <summary>
         /// Saves the raw image to the given bytes.

src/ImageSharp/ImageFrame.LoadPixelData.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
@@ -24,7 +25,7 @@ namespace SixLabors.ImageSharp
         /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
         public static ImageFrame<TPixel> LoadPixelData<TPixel>(MemoryManager memoryManager, Span<byte> data, int width, int height)
             where TPixel : struct, IPixel<TPixel>
-            => LoadPixelData(memoryManager, data.NonPortableCast<byte, TPixel>(), width, height);
+            => LoadPixelData(memoryManager, MemoryMarshal.Cast<byte, TPixel>(data), width, height);
 
         /// <summary>
         /// Create a new instance of the <see cref="Image{TPixel}"/> class from the raw <typeparamref name="TPixel"/> data.

src/ImageSharp/ImageFrameCollection.cs

@@ -77,6 +77,8 @@ namespace SixLabors.ImageSharp
         /// <inheritdoc/>
         public ImageFrame<TPixel> AddFrame(TPixel[] data)
         {
+            Guard.NotNull(data, nameof(data));
+
             var frame = ImageFrame.LoadPixelData(
                 this.parent.GetMemoryManager(),
                 new Span<TPixel>(data),

src/ImageSharp/ImageSharp.csproj

@@ -41,8 +41,8 @@
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="System.Buffers" Version="4.4.0" />
-    <PackageReference Include="System.Memory" Version="4.5.0-preview1-26216-02" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.0-preview1-26216-02" />
+    <PackageReference Include="System.Memory" Version="4.5.0-preview2-26406-04" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.0-preview2-26406-04" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard1.3'">
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />

src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Buffers;
+using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Memory
 {
@@ -44,7 +45,7 @@ namespace SixLabors.ImageSharp.Memory
             protected byte[] Data { get; private set; }
 
             /// <inheritdoc />
-            public Span<T> Span => this.Data.AsSpan().NonPortableCast<byte, T>().Slice(0, this.length);
+            public Span<T> Span => MemoryMarshal.Cast<byte, T>(this.Data.AsSpan()).Slice(0, this.length);
 
             /// <inheritdoc />
             public void Dispose()

src/ImageSharp/PixelFormats/Generated/PixelOperations{TPixel}.Generated.cs

@@ -10,8 +10,8 @@ namespace SixLabors.ImageSharp.PixelFormats
 
     public partial class PixelOperations<TPixel>
     {
-		
-		/// <summary>
+
+        /// <summary>
         /// Converts 'count' elements in 'source` span of <see cref="Rgba32"/> data to a span of <typeparamref name="TPixel"/>-s.
         /// </summary>
         /// <param name="source">The source <see cref="Span{T}"/> of <see cref="Rgba32"/> data.</param>
@@ -19,8 +19,8 @@ namespace SixLabors.ImageSharp.PixelFormats
         /// <param name="count">The number of pixels to convert.</param>
         internal virtual void PackFromRgba32(ReadOnlySpan<Rgba32> source, Span<TPixel> destPixels, int count)
         {
-			GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
-            
+            GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
+
             ref Rgba32 sourceRef = ref MemoryMarshal.GetReference(source);
             ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
 
@@ -30,11 +30,11 @@ namespace SixLabors.ImageSharp.PixelFormats
             {
                 ref TPixel dp = ref Unsafe.Add(ref destRef, i);
                 rgba = Unsafe.Add(ref sourceRef, i);
-				dp.PackFromRgba32(rgba);
+                dp.PackFromRgba32(rgba);
             }
         }
-		
-		/// <summary>
+
+        /// <summary>
         /// A helper for <see cref="PackFromRgba32(ReadOnlySpan{Rgba32}, Span{TPixel}, int)"/> that expects a byte span.
         /// The layout of the data in 'sourceBytes' must be compatible with <see cref="Rgba32"/> layout.
         /// </summary>
@@ -44,10 +44,10 @@ namespace SixLabors.ImageSharp.PixelFormats
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void PackFromRgba32Bytes(ReadOnlySpan<byte> sourceBytes, Span<TPixel> destPixels, int count)
         {
-            this.PackFromRgba32(sourceBytes.NonPortableCast<byte, Rgba32>(), destPixels, count);
+            this.PackFromRgba32(MemoryMarshal.Cast<byte, Rgba32>(sourceBytes), destPixels, count);
         }
-		
-		/// <summary>
+
+        /// <summary>
         /// Converts 'count' pixels in 'sourcePixels` span to a span of <see cref="Rgba32"/>-s.
         /// Bulk version of <see cref="IPixel.ToRgba32(ref Rgba32)"/>.
         /// </summary>
@@ -69,20 +69,20 @@ namespace SixLabors.ImageSharp.PixelFormats
             }
         }
 
-		/// <summary>
+        /// <summary>
         /// A helper for <see cref="ToRgba32(ReadOnlySpan{TPixel}, Span{Rgba32}, int)"/> that expects a byte span as destination.
         /// The layout of the data in 'destBytes' must be compatible with <see cref="Rgba32"/> layout.
         /// </summary>
         /// <param name="sourceColors">The <see cref="Span{T}"/> to the source colors.</param>
         /// <param name="destBytes">The <see cref="Span{T}"/> to the destination bytes.</param>
         /// <param name="count">The number of pixels to convert.</param>
-		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void ToRgba32Bytes(ReadOnlySpan<TPixel> sourceColors, Span<byte> destBytes, int count)
         {
-            this.ToRgba32(sourceColors, destBytes.NonPortableCast<byte, Rgba32>(), count);
+            this.ToRgba32(sourceColors, MemoryMarshal.Cast<byte, Rgba32>(destBytes), count);
         }
-		
-		/// <summary>
+
+        /// <summary>
         /// Converts 'count' elements in 'source` span of <see cref="Bgra32"/> data to a span of <typeparamref name="TPixel"/>-s.
         /// </summary>
         /// <param name="source">The source <see cref="Span{T}"/> of <see cref="Bgra32"/> data.</param>
@@ -90,22 +90,22 @@ namespace SixLabors.ImageSharp.PixelFormats
         /// <param name="count">The number of pixels to convert.</param>
         internal virtual void PackFromBgra32(ReadOnlySpan<Bgra32> source, Span<TPixel> destPixels, int count)
         {
-			GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
-            
+            GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
+
             ref Bgra32 sourceRef = ref MemoryMarshal.GetReference(source);
             ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
 
-            Rgba32 rgba = new Rgba32(0, 0, 0, 255);
+            var rgba = new Rgba32(0, 0, 0, 255);
 
             for (int i = 0; i < count; i++)
             {
                 ref TPixel dp = ref Unsafe.Add(ref destRef, i);
                 rgba = Unsafe.Add(ref sourceRef, i).ToRgba32();
-				dp.PackFromRgba32(rgba);
+                dp.PackFromRgba32(rgba);
             }
         }
-		
-		/// <summary>
+
+        /// <summary>
         /// A helper for <see cref="PackFromBgra32(ReadOnlySpan{Bgra32}, Span{TPixel}, int)"/> that expects a byte span.
         /// The layout of the data in 'sourceBytes' must be compatible with <see cref="Bgra32"/> layout.
         /// </summary>
@@ -115,10 +115,10 @@ namespace SixLabors.ImageSharp.PixelFormats
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void PackFromBgra32Bytes(ReadOnlySpan<byte> sourceBytes, Span<TPixel> destPixels, int count)
         {
-            this.PackFromBgra32(sourceBytes.NonPortableCast<byte, Bgra32>(), destPixels, count);
+            this.PackFromBgra32(MemoryMarshal.Cast<byte, Bgra32>(sourceBytes), destPixels, count);
         }
-		
-		/// <summary>
+
+        /// <summary>
         /// Converts 'count' pixels in 'sourcePixels` span to a span of <see cref="Bgra32"/>-s.
         /// Bulk version of <see cref="IPixel.ToBgra32(ref Bgra32)"/>.
         /// </summary>
@@ -140,20 +140,20 @@ namespace SixLabors.ImageSharp.PixelFormats
             }
         }
 
-		/// <summary>
+        /// <summary>
         /// A helper for <see cref="ToBgra32(ReadOnlySpan{TPixel}, Span{Bgra32}, int)"/> that expects a byte span as destination.
         /// The layout of the data in 'destBytes' must be compatible with <see cref="Bgra32"/> layout.
         /// </summary>
         /// <param name="sourceColors">The <see cref="Span{T}"/> to the source colors.</param>
         /// <param name="destBytes">The <see cref="Span{T}"/> to the destination bytes.</param>
         /// <param name="count">The number of pixels to convert.</param>
-		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void ToBgra32Bytes(ReadOnlySpan<TPixel> sourceColors, Span<byte> destBytes, int count)
         {
-            this.ToBgra32(sourceColors, destBytes.NonPortableCast<byte, Bgra32>(), count);
+            this.ToBgra32(sourceColors, MemoryMarshal.Cast<byte, Bgra32>(destBytes), count);
         }
-		
-		/// <summary>
+
+        /// <summary>
         /// Converts 'count' elements in 'source` span of <see cref="Rgb24"/> data to a span of <typeparamref name="TPixel"/>-s.
         /// </summary>
         /// <param name="source">The source <see cref="Span{T}"/> of <see cref="Rgb24"/> data.</param>
@@ -161,22 +161,22 @@ namespace SixLabors.ImageSharp.PixelFormats
         /// <param name="count">The number of pixels to convert.</param>
         internal virtual void PackFromRgb24(ReadOnlySpan<Rgb24> source, Span<TPixel> destPixels, int count)
         {
-			GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
-            
+            GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
+
             ref Rgb24 sourceRef = ref MemoryMarshal.GetReference(source);
             ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
 
-            Rgba32 rgba = new Rgba32(0, 0, 0, 255);
+            var rgba = new Rgba32(0, 0, 0, 255);
 
             for (int i = 0; i < count; i++)
             {
                 ref TPixel dp = ref Unsafe.Add(ref destRef, i);
                 rgba.Rgb = Unsafe.Add(ref sourceRef, i);
-				dp.PackFromRgba32(rgba);
+                dp.PackFromRgba32(rgba);
             }
         }
-		
-		/// <summary>
+
+        /// <summary>
         /// A helper for <see cref="PackFromRgb24(ReadOnlySpan{Rgb24}, Span{TPixel}, int)"/> that expects a byte span.
         /// The layout of the data in 'sourceBytes' must be compatible with <see cref="Rgb24"/> layout.
         /// </summary>
@@ -186,10 +186,10 @@ namespace SixLabors.ImageSharp.PixelFormats
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void PackFromRgb24Bytes(ReadOnlySpan<byte> sourceBytes, Span<TPixel> destPixels, int count)
         {
-            this.PackFromRgb24(sourceBytes.NonPortableCast<byte, Rgb24>(), destPixels, count);
+            this.PackFromRgb24(MemoryMarshal.Cast<byte, Rgb24>(sourceBytes), destPixels, count);
         }
-		
-		/// <summary>
+
+        /// <summary>
         /// Converts 'count' pixels in 'sourcePixels` span to a span of <see cref="Rgb24"/>-s.
         /// Bulk version of <see cref="IPixel.ToRgb24(ref Rgb24)"/>.
         /// </summary>
@@ -211,20 +211,20 @@ namespace SixLabors.ImageSharp.PixelFormats
             }
         }
 
-		/// <summary>
+        /// <summary>
         /// A helper for <see cref="ToRgb24(ReadOnlySpan{TPixel}, Span{Rgb24}, int)"/> that expects a byte span as destination.
         /// The layout of the data in 'destBytes' must be compatible with <see cref="Rgb24"/> layout.
         /// </summary>
         /// <param name="sourceColors">The <see cref="Span{T}"/> to the source colors.</param>
         /// <param name="destBytes">The <see cref="Span{T}"/> to the destination bytes.</param>
         /// <param name="count">The number of pixels to convert.</param>
-		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void ToRgb24Bytes(ReadOnlySpan<TPixel> sourceColors, Span<byte> destBytes, int count)
         {
-            this.ToRgb24(sourceColors, destBytes.NonPortableCast<byte, Rgb24>(), count);
+            this.ToRgb24(sourceColors, MemoryMarshal.Cast<byte, Rgb24>(destBytes), count);
         }
-		
-		/// <summary>
+
+        /// <summary>
         /// Converts 'count' elements in 'source` span of <see cref="Bgr24"/> data to a span of <typeparamref name="TPixel"/>-s.
         /// </summary>
         /// <param name="source">The source <see cref="Span{T}"/> of <see cref="Bgr24"/> data.</param>
@@ -232,8 +232,8 @@ namespace SixLabors.ImageSharp.PixelFormats
         /// <param name="count">The number of pixels to convert.</param>
         internal virtual void PackFromBgr24(ReadOnlySpan<Bgr24> source, Span<TPixel> destPixels, int count)
         {
-			GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
-            
+            GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
+
             ref Bgr24 sourceRef = ref MemoryMarshal.GetReference(source);
             ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
 
@@ -243,11 +243,11 @@ namespace SixLabors.ImageSharp.PixelFormats
             {
                 ref TPixel dp = ref Unsafe.Add(ref destRef, i);
                 rgba.Bgr = Unsafe.Add(ref sourceRef, i);
-				dp.PackFromRgba32(rgba);
+                dp.PackFromRgba32(rgba);
             }
         }
-		
-		/// <summary>
+
+        /// <summary>
         /// A helper for <see cref="PackFromBgr24(ReadOnlySpan{Bgr24}, Span{TPixel}, int)"/> that expects a byte span.
         /// The layout of the data in 'sourceBytes' must be compatible with <see cref="Bgr24"/> layout.
         /// </summary>
@@ -257,10 +257,10 @@ namespace SixLabors.ImageSharp.PixelFormats
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void PackFromBgr24Bytes(ReadOnlySpan<byte> sourceBytes, Span<TPixel> destPixels, int count)
         {
-            this.PackFromBgr24(sourceBytes.NonPortableCast<byte, Bgr24>(), destPixels, count);
+            this.PackFromBgr24(MemoryMarshal.Cast<byte, Bgr24>(sourceBytes), destPixels, count);
         }
-		
-		/// <summary>
+
+        /// <summary>
         /// Converts 'count' pixels in 'sourcePixels` span to a span of <see cref="Bgr24"/>-s.
         /// Bulk version of <see cref="IPixel.ToBgr24(ref Bgr24)"/>.
         /// </summary>
@@ -282,18 +282,18 @@ namespace SixLabors.ImageSharp.PixelFormats
             }
         }
 
-		/// <summary>
+        /// <summary>
         /// A helper for <see cref="ToBgr24(ReadOnlySpan{TPixel}, Span{Bgr24}, int)"/> that expects a byte span as destination.
         /// The layout of the data in 'destBytes' must be compatible with <see cref="Bgr24"/> layout.
         /// </summary>
         /// <param name="sourceColors">The <see cref="Span{T}"/> to the source colors.</param>
         /// <param name="destBytes">The <see cref="Span{T}"/> to the destination bytes.</param>
         /// <param name="count">The number of pixels to convert.</param>
-		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void ToBgr24Bytes(ReadOnlySpan<TPixel> sourceColors, Span<byte> destBytes, int count)
         {
-            this.ToBgr24(sourceColors, destBytes.NonPortableCast<byte, Bgr24>(), count);
+            this.ToBgr24(sourceColors, MemoryMarshal.Cast<byte, Bgr24>(destBytes), count);
         }
-		
-	}
+
+    }
 }

src/ImageSharp/PixelFormats/NamedColors{TPixel}.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.PixelFormats
 {
@@ -737,7 +738,7 @@ namespace SixLabors.ImageSharp.PixelFormats
             Rgba32[] constants = ColorConstants.WebSafeColors;
             var safe = new TPixel[constants.Length + 1];
 
-            Span<byte> constantsBytes = constants.AsSpan().NonPortableCast<Rgba32, byte>();
+            Span<byte> constantsBytes = MemoryMarshal.Cast<Rgba32, byte>(constants.AsSpan());
             PixelOperations<TPixel>.Instance.PackFromRgba32Bytes(constantsBytes, safe, constants.Length);
             return safe;
         }

src/ImageSharp/PixelFormats/Rgba32.PixelOperations.cs

@@ -131,8 +131,8 @@ namespace SixLabors.ImageSharp.PixelFormats
 
                 if (alignedCount > 0)
                 {
-                    ReadOnlySpan<float> flatSrc = sourceVectors.Slice(0, alignedCount).NonPortableCast<Vector4, float>();
-                    Span<byte> flatDest = destColors.NonPortableCast<Rgba32, byte>();
+                    ReadOnlySpan<float> flatSrc = MemoryMarshal.Cast<Vector4, float>(sourceVectors.Slice(0, alignedCount));
+                    Span<byte> flatDest = MemoryMarshal.Cast<Rgba32, byte>(destColors);
 
                     SimdUtils.BulkConvertNormalizedFloatToByteClampOverflows(flatSrc, flatDest);
                 }

src/ImageSharp/PixelFormats/RgbaVector.PixelOperations.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Numerics;
+using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.PixelFormats
 {
@@ -21,7 +22,7 @@ namespace SixLabors.ImageSharp.PixelFormats
             {
                 GuardSpans(sourceColors, nameof(sourceColors), destVectors, nameof(destVectors), count);
 
-                sourceColors.NonPortableCast<RgbaVector, Vector4>().Slice(0, count).CopyTo(destVectors);
+                MemoryMarshal.Cast<RgbaVector, Vector4>(sourceColors).Slice(0, count).CopyTo(destVectors);
             }
         }
     }

tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj

@@ -5,6 +5,7 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <RootNamespace>SixLabors.ImageSharp.Benchmarks</RootNamespace>
     <AssemblyName>ImageSharp.Benchmarks</AssemblyName>
+    <LangVersion>7.2</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net461'">
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
@@ -18,8 +19,8 @@
     <PackageReference Include="BenchmarkDotNet" Version="0.10.12" />
     <PackageReference Include="Colourful" Version="1.1.2" />
     <PackageReference Include="System.Drawing.Common" Version="4.5.0-preview1-26216-02" />
-    <PackageReference Include="System.Memory" Version="4.5.0-preview1-26216-02" />
-    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0-preview1-26216-02" />
+    <PackageReference Include="System.Memory" Version="4.5.0-preview2-26406-04" />
+    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0-preview2-26406-04" />
   </ItemGroup>
 
   <ItemGroup>

tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj

@@ -11,6 +11,7 @@
     <Authors>James Jackson-South and contributors</Authors>
     <Company>James Jackson-South</Company>
     <RootNamespace>SixLabors.ImageSharp.Sandbox46</RootNamespace>
+    <LangVersion>7.2</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\ImageSharp.Drawing\ImageSharp.Drawing.csproj" />
@@ -20,6 +21,7 @@
     <PackageReference Include="BitMiracle.LibJpeg.NET" Version="1.4.280" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="Moq" Version="4.8.1" />
+    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0-preview2-26406-04" />
     <!--<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />-->
     <!--<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />-->
   </ItemGroup>

tests/ImageSharp.Tests/Common/SimdUtilsTests.cs

@@ -7,7 +7,7 @@ namespace SixLabors.ImageSharp.Tests.Common
 {
     using System.Linq;
     using System.Runtime.CompilerServices;
-
+    using System.Runtime.InteropServices;
     using SixLabors.ImageSharp.Common.Tuples;
 
     using Xunit.Abstractions;
@@ -238,14 +238,14 @@ namespace SixLabors.ImageSharp.Tests.Common
 
         private void MagicConvert(Span<float> source, Span<byte> dest)
         {
-            Vector<float> magick = new Vector<float>(32768.0f);
+            var magick = new Vector<float>(32768.0f);
             Vector<float> scale = new Vector<float>(255f) / new Vector<float>(256f);
 
-            Vector<float> x = source.NonPortableCast<float, Vector<float>>()[0];
+            Vector<float> x = MemoryMarshal.Cast<float, Vector<float>>(source)[0];
             
             x = (x * scale) + magick;
 
-            Tuple8.OfUInt32 ii = default(Tuple8.OfUInt32);
+            Tuple8.OfUInt32 ii = default;
 
             ref Vector<float> iiRef = ref Unsafe.As<Tuple8.OfUInt32, Vector<float>>(ref ii);
 
@@ -253,7 +253,7 @@ namespace SixLabors.ImageSharp.Tests.Common
 
             //Tuple8.OfUInt32 ii = Unsafe.As<Vector<float>, Tuple8.OfUInt32>(ref x);
             
-            ref Tuple8.OfByte d = ref dest.NonPortableCast<byte, Tuple8.OfByte>()[0];
+            ref Tuple8.OfByte d = ref MemoryMarshal.Cast<byte, Tuple8.OfByte>(dest)[0];
             d.LoadFrom(ref ii);
 
             this.Output.WriteLine(ii.ToString());

tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.cs

@@ -1,11 +1,11 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Diagnostics;
+using System.IO;
+using System.Numerics;
+
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
 {
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Numerics;
-    using System.Reflection;
-
     using SixLabors.ImageSharp.Formats.Jpeg.Common;
 
     /// <summary>
@@ -39,7 +39,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
                     totalDiff += diff;
                 }
             }
-            
+
             int count = w * h;
             double total = (double)totalDiff;
             double average = (double)totalDiff / (count * Block8x8.Size);
@@ -85,22 +85,22 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
             try
             {
                 RunDumpJpegCoeffsTool(testFile.FullPath, coeffFileFullPath);
-                
+
                 using (var dumpStream = new FileStream(coeffFileFullPath, FileMode.Open))
                 using (var rdr = new BinaryReader(dumpStream))
                 {
                     int componentCount = rdr.ReadInt16();
-                    ComponentData[] result = new ComponentData[componentCount];
+                    var result = new ComponentData[componentCount];
 
                     for (int i = 0; i < componentCount; i++)
                     {
                         int widthInBlocks = rdr.ReadInt16();
                         int heightInBlocks = rdr.ReadInt16();
-                        ComponentData resultComponent = new ComponentData(widthInBlocks, heightInBlocks, i);
+                        var resultComponent = new ComponentData(widthInBlocks, heightInBlocks, i);
                         result[i] = resultComponent;
                     }
 
-                    byte[] buffer = new byte[64*sizeof(short)];
+                    byte[] buffer = new byte[64 * sizeof(short)];
 
                     for (int i = 0; i < result.Length; i++)
                     {
@@ -112,7 +112,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
                             {
                                 rdr.Read(buffer, 0, buffer.Length);
 
-                                short[] block = buffer.AsSpan().NonPortableCast<byte, short>().ToArray();
+                                short[] block = MemoryMarshal.Cast<byte, short>(buffer.AsSpan()).ToArray();
                                 c.MakeBlock(block, y, x);
                             }
                         }

tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs

@@ -39,7 +39,6 @@ namespace SixLabors.ImageSharp.Tests
         [Fact]
         public void AddNewFrame_Frame_FramesNotBeNull()
         {
-
             ArgumentNullException ex = Assert.Throws<ArgumentNullException>(() =>
             {
                 this.collection.AddFrame((ImageFrame<Rgba32>)null);
@@ -49,12 +48,13 @@ namespace SixLabors.ImageSharp.Tests
         }
 
         [Fact]
-        public void AddNewFrame_PixelBuffer_FramesNotBeNull()
+        public void AddNewFrame_PixelBuffer_DataMustNotBeNull()
         {
+            Rgba32[] data = null;
 
             ArgumentNullException ex = Assert.Throws<ArgumentNullException>(() =>
             {
-                this.collection.AddFrame((Rgba32[])null);
+                this.collection.AddFrame(data);
             });
 
             Assert.StartsWith("Value cannot be null.", ex.Message);
@@ -63,7 +63,6 @@ namespace SixLabors.ImageSharp.Tests
         [Fact]
         public void AddNewFrame_PixelBuffer_BufferIncorrectSize()
         {
-
             ArgumentOutOfRangeException ex = Assert.Throws<ArgumentOutOfRangeException>(() =>
             {
                 this.collection.AddFrame(new Rgba32[0]);
@@ -75,7 +74,6 @@ namespace SixLabors.ImageSharp.Tests
         [Fact]
         public void InsertNewFrame_FramesMustHaveSameSize()
         {
-
             ArgumentException ex = Assert.Throws<ArgumentException>(() =>
             {
                 this.collection.InsertFrame(1, new ImageFrame<Rgba32>(Configuration.Default.MemoryManager, 1, 1));
@@ -87,7 +85,6 @@ namespace SixLabors.ImageSharp.Tests
         [Fact]
         public void InsertNewFrame_FramesNotBeNull()
         {
-
             ArgumentNullException ex = Assert.Throws<ArgumentNullException>(() =>
             {
                 this.collection.InsertFrame(1, null);
@@ -99,7 +96,6 @@ namespace SixLabors.ImageSharp.Tests
         [Fact]
         public void Constructor_FramesMustHaveSameSize()
         {
-
             ArgumentException ex = Assert.Throws<ArgumentException>(() =>
             {
                 var collection = new ImageFrameCollection<Rgba32>(this.image, new[] {
@@ -198,7 +194,7 @@ namespace SixLabors.ImageSharp.Tests
         {
             using (Image<TPixel> img = provider.GetImage())
             {
-                img.Frames.AddFrame(new ImageFrame<TPixel>(Configuration.Default.MemoryManager,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 +212,7 @@ namespace SixLabors.ImageSharp.Tests
             {
                 var sourcePixelData = img.GetPixelSpan().ToArray();
 
-                img.Frames.AddFrame(new ImageFrame<TPixel>(Configuration.Default.MemoryManager,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 +240,7 @@ namespace SixLabors.ImageSharp.Tests
         public void AddFrame_clones_sourceFrame()
         {
             var pixelData = this.image.Frames.RootFrame.GetPixelSpan().ToArray();
-            var otherFRame = new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,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 +250,7 @@ namespace SixLabors.ImageSharp.Tests
         public void InsertFrame_clones_sourceFrame()
         {
             var pixelData = this.image.Frames.RootFrame.GetPixelSpan().ToArray();
-            var otherFRame = new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,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 +304,7 @@ namespace SixLabors.ImageSharp.Tests
                 this.image.Frames.CreateFrame();
             }
 
-            var frame = new ImageFrame<Rgba32>(Configuration.Default.MemoryManager,10, 10);
+            var frame = new ImageFrame<Rgba32>(Configuration.Default.MemoryManager, 10, 10);
             Assert.False(this.image.Frames.Contains(frame));
         }
 

tests/ImageSharp.Tests/Image/ImageSaveTests.cs

@@ -14,6 +14,7 @@ using Xunit;
 namespace SixLabors.ImageSharp.Tests
 {
     using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
 
     /// <summary>
     /// Tests the <see cref="Image"/> class.
@@ -54,7 +55,7 @@ namespace SixLabors.ImageSharp.Tests
         {
             using (Image<TPixel> image = provider.GetImage())
             {
-                TPixel[] buffer = new TPixel[image.Width * image.Height];
+                var buffer = new TPixel[image.Width * image.Height];
                 image.SavePixelData(buffer);
 
                 image.ComparePixelBufferTo(buffer);
@@ -74,7 +75,7 @@ namespace SixLabors.ImageSharp.Tests
 
                 image.SavePixelData(buffer);
 
-                image.ComparePixelBufferTo(buffer.AsSpan().NonPortableCast<byte, TPixel>());
+                image.ComparePixelBufferTo(MemoryMarshal.Cast<byte, TPixel>(buffer.AsSpan()));
             }
         }
 

tests/ImageSharp.Tests/ImageSharp.Tests.csproj

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net471;netcoreapp2.0;net462;net47</TargetFrameworks>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <LangVersion>7.2</LangVersion>
     <DebugType Condition="$(codecov) != ''">full</DebugType>
     <DebugType Condition="$(codecov) == ''">portable</DebugType>
     <DebugSymbols>True</DebugSymbols>
@@ -26,8 +27,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
-    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0-preview1-26216-02" />
-    <PackageReference Include="System.Drawing.Common" Version="4.5.0-preview1-26216-02" />
+    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0-preview2-26406-04" />
+    <PackageReference Include="System.Drawing.Common" Version="4.5.0-preview2-26406-04" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.console" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

tests/ImageSharp.Tests/Memory/Buffer2DTests.cs

@@ -33,11 +33,11 @@ namespace SixLabors.ImageSharp.Tests.Memory
         {
             internal override IBuffer<T> Allocate<T>(int length, bool clear)
             {
-                T[] array = new T[length + 42];
+                var array = new T[length + 42];
 
                 if (!clear)
                 {
-                    Span<byte> data = array.AsSpan().NonPortableCast<T, byte>();
+                    Span<byte> data = MemoryMarshal.Cast<T, byte>(array.AsSpan());
                     for (int i = 0; i < data.Length; i++)
                     {
                         data[i] = 42;

tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs

@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
     using System;
     using System.Numerics;
     using System.Runtime.CompilerServices;
-
+    using System.Runtime.InteropServices;
     using SixLabors.ImageSharp.Memory;
     using SixLabors.ImageSharp.Tests.Common;
 
@@ -84,7 +84,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             public void GenericToOwnType_Aligned(int count)
             {
                 TestStructs.AlignedFoo[] source = TestStructs.AlignedFoo.CreateArray(count + 2);
-                TestStructs.AlignedFoo[] dest = new TestStructs.AlignedFoo[count + 5];
+                var dest = new TestStructs.AlignedFoo[count + 5];
 
                 var apSource = new Span<TestStructs.AlignedFoo>(source, 1, source.Length - 1);
                 var apDest = new Span<TestStructs.AlignedFoo>(dest, 1, dest.Length - 1);
@@ -136,7 +136,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 var apSource = new Span<TestStructs.Foo>(source, 1, source.Length - 1);
                 var apDest = new Span<byte>(dest, sizeof(TestStructs.Foo), dest.Length - sizeof(TestStructs.Foo));
 
-                apSource.AsBytes().Slice(0, (count - 1) * sizeof(TestStructs.Foo)).CopyTo(apDest);
+                MemoryMarshal.AsBytes(apSource).Slice(0, (count - 1) * sizeof(TestStructs.Foo)).CopyTo(apDest);
 
                 AssertNotDefault(source, 1);
 
@@ -159,7 +159,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 var apSource = new Span<TestStructs.AlignedFoo>(source, 1, source.Length - 1);
                 var apDest = new Span<byte>(dest, sizeof(TestStructs.AlignedFoo), dest.Length - sizeof(TestStructs.AlignedFoo));
 
-                apSource.AsBytes().Slice(0, (count - 1) * sizeof(TestStructs.AlignedFoo)).CopyTo(apDest);
+                MemoryMarshal.AsBytes(apSource).Slice(0, (count - 1) * sizeof(TestStructs.AlignedFoo)).CopyTo(apDest);
 
                 AssertNotDefault(source, 1);
 
@@ -182,7 +182,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 var apSource = new Span<int>(source);
                 var apDest = new Span<byte>(dest);
 
-                apSource.AsBytes().Slice(0, count * sizeof(int)).CopyTo(apDest);
+                MemoryMarshal.AsBytes(apSource).Slice(0, count * sizeof(int)).CopyTo(apDest);
 
                 AssertNotDefault(source, 1);
 
@@ -203,7 +203,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 var apSource = new Span<byte>(source);
                 var apDest = new Span<TestStructs.Foo>(dest);
 
-                apSource.Slice(0, count * sizeof(TestStructs.Foo)).CopyTo(apDest.AsBytes());
+                apSource.Slice(0, count * sizeof(TestStructs.Foo)).CopyTo(MemoryMarshal.AsBytes(apDest));
 
                 AssertNotDefault(source, sizeof(TestStructs.Foo) + 1);
                 AssertNotDefault(dest, 1);

tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Numerics;
+using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using Xunit;
@@ -412,8 +413,8 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
                 if (typeof(TDest) == typeof(Vector4))
                 {
 
-                    Span<Vector4> expected = this.ExpectedDestBuffer.AsSpan().NonPortableCast<TDest, Vector4>();
-                    Span<Vector4> actual = this.ActualDestBuffer.Span.NonPortableCast<TDest, Vector4>();
+                    Span<Vector4> expected = MemoryMarshal.Cast<TDest, Vector4>(this.ExpectedDestBuffer.AsSpan());
+                    Span<Vector4> actual = MemoryMarshal.Cast<TDest, Vector4>(this.ActualDestBuffer.Span);
 
                     for (int i = 0; i < count; i++)
                     {