Merge pull request #1777 from SixLabors/js/v2-builds

Update Infrastructure Files and Base Build Number for V2

.gitignore

@@ -223,3 +223,7 @@ artifacts/
 **/Images/ReferenceOutput
 **/Images/Input/MemoryStress
 .DS_Store
+
+#lfs
+hooks/**
+lfs/**

shared-infrastructure

@@ -1 +1 @@
-Subproject commit f48ab829167c42c69242ed0d303683232fbfccd1
+Subproject commit a042aba176cdb840d800c6ed4cfe41a54fb7b1e3

src/ImageSharp/Advanced/ParallelExecutionSettings.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Threading.Tasks;
-
 using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Advanced

src/ImageSharp/Color/Color.Conversions.cs

@@ -3,7 +3,6 @@
 
 using System.Numerics;
 using System.Runtime.CompilerServices;
-
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp
@@ -95,4 +94,4 @@ namespace SixLabors.ImageSharp
         [MethodImpl(InliningOptions.ShortMethod)]
         internal Vector4 ToVector4() => this.data.ToVector4();
     }
-}
+}

src/ImageSharp/Color/Color.WebSafePalette.cs

@@ -163,4 +163,4 @@ namespace SixLabors.ImageSharp
             YellowGreen
         };
     }
-}
+}

src/ImageSharp/Color/Color.cs

@@ -5,7 +5,6 @@ using System;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp

src/ImageSharp/ColorSpaces/CieLab.cs

@@ -136,4 +136,4 @@ namespace SixLabors.ImageSharp.ColorSpaces
                 && this.WhitePoint.Equals(other.WhitePoint);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/CieLch.cs

@@ -162,4 +162,4 @@ namespace SixLabors.ImageSharp.ColorSpaces
             return result;
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/CieLchuv.cs

@@ -157,4 +157,4 @@ namespace SixLabors.ImageSharp.ColorSpaces
             return result;
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/CieLuv.cs

@@ -137,4 +137,4 @@ namespace SixLabors.ImageSharp.ColorSpaces
                 && this.WhitePoint.Equals(other.WhitePoint);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/CieXyy.cs

@@ -100,4 +100,4 @@ namespace SixLabors.ImageSharp.ColorSpaces
                 && this.Yl.Equals(other.Yl);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/CieXyz.cs

@@ -103,4 +103,4 @@ namespace SixLabors.ImageSharp.ColorSpaces
                 && this.Z.Equals(other.Z);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Cmyk.cs

@@ -108,4 +108,4 @@ namespace SixLabors.ImageSharp.ColorSpaces
                 && this.K.Equals(other.K);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Companding/GammaCompanding.cs

@@ -33,4 +33,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Companding
         [MethodImpl(InliningOptions.ShortMethod)]
         public static float Compress(float channel, float gamma) => MathF.Pow(channel, 1 / gamma);
     }
-}
+}

src/ImageSharp/ColorSpaces/Companding/Rec2020Companding.cs

@@ -38,4 +38,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Companding
         public static float Compress(float channel)
             => channel < Beta ? 4.5F * channel : (Alpha * MathF.Pow(channel, 0.45F)) - AlphaMinusOne;
     }
-}
+}

src/ImageSharp/ColorSpaces/Companding/Rec709Companding.cs

@@ -34,4 +34,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Companding
         public static float Compress(float channel)
             => channel < 0.018F ? 4.5F * channel : (1.099F * MathF.Pow(channel, 0.45F)) - 0.099F;
     }
-}
+}

src/ImageSharp/ColorSpaces/Conversion/CieConstants.cs

@@ -19,4 +19,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         public const float Kappa = 903.2963F;
     }
-}
+}

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.HunterLab.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
@@ -429,4 +429,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
             return this.ToHunterLab(xyzColor);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Lms.cs

@@ -424,4 +424,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
             return this.ToLms(xyzColor);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CIeLchToCieLabConverter.cs

@@ -30,4 +30,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
             return new CieLab(l, a, b, input.WhitePoint);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzAndCieXyyConverter.cs

@@ -51,4 +51,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
             return new CieXyz(x, y, z);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzAndHunterLabConverterBase.cs

@@ -42,4 +42,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
             return 100F * (70F / 218.11F) * (whitePoint.Y + whitePoint.Z);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzAndLmsConverter.cs

@@ -67,4 +67,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
             return new CieXyz(vector);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToCieLabConverter.cs

@@ -54,4 +54,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
             return new CieLab(l, a, b, this.LabWhitePoint);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToCieLuvConverter.cs

@@ -85,4 +85,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         private static float ComputeVp(in CieXyz input)
            => (9 * input.Y) / (input.X + (15 * input.Y) + (3 * input.Z));
     }
-}
+}

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToHunterLabConverter.cs

@@ -64,4 +64,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
             return new HunterLab(l, a, b, this.HunterLabWhitePoint);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToLinearRgbConverter.cs

@@ -53,4 +53,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
             return new LinearRgb(vector, this.TargetWorkingSpace);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CmykAndRgbConverter.cs

@@ -48,4 +48,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
             return new Cmyk(cmy.X, cmy.Y, cmy.Z, k.X);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/YCbCrAndRgbConverter.cs

@@ -54,4 +54,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
             return new YCbCr(y, cb, cr);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Conversion/Implementation/IChromaticAdaptation.cs

@@ -36,4 +36,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
             CieXyz sourceWhitePoint,
             in CieXyz destinationWhitePoint);
     }
-}
+}

src/ImageSharp/ColorSpaces/Hsl.cs

@@ -101,4 +101,4 @@ namespace SixLabors.ImageSharp.ColorSpaces
                 && this.L.Equals(other.L);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Hsv.cs

@@ -99,4 +99,4 @@ namespace SixLabors.ImageSharp.ColorSpaces
                 && this.V.Equals(other.V);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/HunterLab.cs

@@ -135,4 +135,4 @@ namespace SixLabors.ImageSharp.ColorSpaces
                 && this.WhitePoint.Equals(other.WhitePoint);
         }
     }
-}
+}

src/ImageSharp/ColorSpaces/Illuminants.cs

@@ -69,4 +69,4 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// </summary>
         public static readonly CieXyz F11 = new CieXyz(1.00962F, 1F, 0.64350F);
     }
-}
+}

src/ImageSharp/ColorSpaces/Lms.cs

@@ -104,4 +104,4 @@ namespace SixLabors.ImageSharp.ColorSpaces
                 && this.S.Equals(other.S);
         }
     }
-}
+}

src/ImageSharp/Common/Constants.cs

@@ -18,4 +18,4 @@ namespace SixLabors.ImageSharp
         /// </summary>
         public static readonly float EpsilonSquared = Epsilon * Epsilon;
     }
-}
+}

src/ImageSharp/Common/Helpers/SimdUtils.Pack.cs

@@ -5,9 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.PixelFormats;
-
 #if SUPPORTS_RUNTIME_INTRINSICS
-using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 #endif
 
@@ -203,4 +201,4 @@ namespace SixLabors.ImageSharp
             }
         }
     }
-}
+}

src/ImageSharp/Compression/Zlib/Adler32.cs

@@ -91,115 +91,117 @@ namespace SixLabors.ImageSharp.Compression.Zlib
 
             int index = 0;
             fixed (byte* bufferPtr = buffer)
-            fixed (byte* tapPtr = Tap1Tap2)
             {
-                index += (int)blocks * BLOCK_SIZE;
-                var localBufferPtr = bufferPtr;
-
-                // _mm_setr_epi8 on x86
-                Vector128<sbyte> tap1 = Sse2.LoadVector128((sbyte*)tapPtr);
-                Vector128<sbyte> tap2 = Sse2.LoadVector128((sbyte*)(tapPtr + 0x10));
-                Vector128<byte> zero = Vector128<byte>.Zero;
-                var ones = Vector128.Create((short)1);
-
-                while (blocks > 0)
+                fixed (byte* tapPtr = Tap1Tap2)
                 {
-                    uint n = NMAX / BLOCK_SIZE;  /* The NMAX constraint. */
-                    if (n > blocks)
-                    {
-                        n = blocks;
-                    }
+                    index += (int)blocks * BLOCK_SIZE;
+                    var localBufferPtr = bufferPtr;
 
-                    blocks -= n;
+                    // _mm_setr_epi8 on x86
+                    Vector128<sbyte> tap1 = Sse2.LoadVector128((sbyte*)tapPtr);
+                    Vector128<sbyte> tap2 = Sse2.LoadVector128((sbyte*)(tapPtr + 0x10));
+                    Vector128<byte> zero = Vector128<byte>.Zero;
+                    var ones = Vector128.Create((short)1);
 
-                    // Process n blocks of data. At most NMAX data bytes can be
-                    // processed before s2 must be reduced modulo BASE.
-                    Vector128<uint> v_ps = Vector128.CreateScalar(s1 * n);
-                    Vector128<uint> v_s2 = Vector128.CreateScalar(s2);
-                    Vector128<uint> v_s1 = Vector128<uint>.Zero;
-
-                    do
+                    while (blocks > 0)
                     {
-                        // Load 32 input bytes.
-                        Vector128<byte> bytes1 = Sse3.LoadDquVector128(localBufferPtr);
-                        Vector128<byte> bytes2 = Sse3.LoadDquVector128(localBufferPtr + 0x10);
+                        uint n = NMAX / BLOCK_SIZE;  /* The NMAX constraint. */
+                        if (n > blocks)
+                        {
+                            n = blocks;
+                        }
 
-                        // Add previous block byte sum to v_ps.
-                        v_ps = Sse2.Add(v_ps, v_s1);
+                        blocks -= n;
 
-                        // Horizontally add the bytes for s1, multiply-adds the
-                        // bytes by [ 32, 31, 30, ... ] for s2.
-                        v_s1 = Sse2.Add(v_s1, Sse2.SumAbsoluteDifferences(bytes1, zero).AsUInt32());
-                        Vector128<short> mad1 = Ssse3.MultiplyAddAdjacent(bytes1, tap1);
-                        v_s2 = Sse2.Add(v_s2, Sse2.MultiplyAddAdjacent(mad1, ones).AsUInt32());
+                        // Process n blocks of data. At most NMAX data bytes can be
+                        // processed before s2 must be reduced modulo BASE.
+                        Vector128<uint> v_ps = Vector128.CreateScalar(s1 * n);
+                        Vector128<uint> v_s2 = Vector128.CreateScalar(s2);
+                        Vector128<uint> v_s1 = Vector128<uint>.Zero;
 
-                        v_s1 = Sse2.Add(v_s1, Sse2.SumAbsoluteDifferences(bytes2, zero).AsUInt32());
-                        Vector128<short> mad2 = Ssse3.MultiplyAddAdjacent(bytes2, tap2);
-                        v_s2 = Sse2.Add(v_s2, Sse2.MultiplyAddAdjacent(mad2, ones).AsUInt32());
+                        do
+                        {
+                            // Load 32 input bytes.
+                            Vector128<byte> bytes1 = Sse3.LoadDquVector128(localBufferPtr);
+                            Vector128<byte> bytes2 = Sse3.LoadDquVector128(localBufferPtr + 0x10);
 
-                        localBufferPtr += BLOCK_SIZE;
-                    }
-                    while (--n > 0);
+                            // Add previous block byte sum to v_ps.
+                            v_ps = Sse2.Add(v_ps, v_s1);
 
-                    v_s2 = Sse2.Add(v_s2, Sse2.ShiftLeftLogical(v_ps, 5));
+                            // Horizontally add the bytes for s1, multiply-adds the
+                            // bytes by [ 32, 31, 30, ... ] for s2.
+                            v_s1 = Sse2.Add(v_s1, Sse2.SumAbsoluteDifferences(bytes1, zero).AsUInt32());
+                            Vector128<short> mad1 = Ssse3.MultiplyAddAdjacent(bytes1, tap1);
+                            v_s2 = Sse2.Add(v_s2, Sse2.MultiplyAddAdjacent(mad1, ones).AsUInt32());
 
-                    // Sum epi32 ints v_s1(s2) and accumulate in s1(s2).
-                    const byte S2301 = 0b1011_0001;  // A B C D -> B A D C
-                    const byte S1032 = 0b0100_1110;  // A B C D -> C D A B
+                            v_s1 = Sse2.Add(v_s1, Sse2.SumAbsoluteDifferences(bytes2, zero).AsUInt32());
+                            Vector128<short> mad2 = Ssse3.MultiplyAddAdjacent(bytes2, tap2);
+                            v_s2 = Sse2.Add(v_s2, Sse2.MultiplyAddAdjacent(mad2, ones).AsUInt32());
 
-                    v_s1 = Sse2.Add(v_s1, Sse2.Shuffle(v_s1, S1032));
+                            localBufferPtr += BLOCK_SIZE;
+                        }
+                        while (--n > 0);
 
-                    s1 += v_s1.ToScalar();
+                        v_s2 = Sse2.Add(v_s2, Sse2.ShiftLeftLogical(v_ps, 5));
 
-                    v_s2 = Sse2.Add(v_s2, Sse2.Shuffle(v_s2, S2301));
-                    v_s2 = Sse2.Add(v_s2, Sse2.Shuffle(v_s2, S1032));
+                        // Sum epi32 ints v_s1(s2) and accumulate in s1(s2).
+                        const byte S2301 = 0b1011_0001;  // A B C D -> B A D C
+                        const byte S1032 = 0b0100_1110;  // A B C D -> C D A B
 
-                    s2 = v_s2.ToScalar();
+                        v_s1 = Sse2.Add(v_s1, Sse2.Shuffle(v_s1, S1032));
 
-                    // Reduce.
-                    s1 %= BASE;
-                    s2 %= BASE;
-                }
+                        s1 += v_s1.ToScalar();
 
-                if (length > 0)
-                {
-                    if (length >= 16)
-                    {
-                        s2 += s1 += localBufferPtr[0];
-                        s2 += s1 += localBufferPtr[1];
-                        s2 += s1 += localBufferPtr[2];
-                        s2 += s1 += localBufferPtr[3];
-                        s2 += s1 += localBufferPtr[4];
-                        s2 += s1 += localBufferPtr[5];
-                        s2 += s1 += localBufferPtr[6];
-                        s2 += s1 += localBufferPtr[7];
-                        s2 += s1 += localBufferPtr[8];
-                        s2 += s1 += localBufferPtr[9];
-                        s2 += s1 += localBufferPtr[10];
-                        s2 += s1 += localBufferPtr[11];
-                        s2 += s1 += localBufferPtr[12];
-                        s2 += s1 += localBufferPtr[13];
-                        s2 += s1 += localBufferPtr[14];
-                        s2 += s1 += localBufferPtr[15];
+                        v_s2 = Sse2.Add(v_s2, Sse2.Shuffle(v_s2, S2301));
+                        v_s2 = Sse2.Add(v_s2, Sse2.Shuffle(v_s2, S1032));
 
-                        localBufferPtr += 16;
-                        length -= 16;
-                    }
+                        s2 = v_s2.ToScalar();
 
-                    while (length-- > 0)
-                    {
-                        s2 += s1 += *localBufferPtr++;
+                        // Reduce.
+                        s1 %= BASE;
+                        s2 %= BASE;
                     }
 
-                    if (s1 >= BASE)
+                    if (length > 0)
                     {
-                        s1 -= BASE;
+                        if (length >= 16)
+                        {
+                            s2 += s1 += localBufferPtr[0];
+                            s2 += s1 += localBufferPtr[1];
+                            s2 += s1 += localBufferPtr[2];
+                            s2 += s1 += localBufferPtr[3];
+                            s2 += s1 += localBufferPtr[4];
+                            s2 += s1 += localBufferPtr[5];
+                            s2 += s1 += localBufferPtr[6];
+                            s2 += s1 += localBufferPtr[7];
+                            s2 += s1 += localBufferPtr[8];
+                            s2 += s1 += localBufferPtr[9];
+                            s2 += s1 += localBufferPtr[10];
+                            s2 += s1 += localBufferPtr[11];
+                            s2 += s1 += localBufferPtr[12];
+                            s2 += s1 += localBufferPtr[13];
+                            s2 += s1 += localBufferPtr[14];
+                            s2 += s1 += localBufferPtr[15];
+
+                            localBufferPtr += 16;
+                            length -= 16;
+                        }
+
+                        while (length-- > 0)
+                        {
+                            s2 += s1 += *localBufferPtr++;
+                        }
+
+                        if (s1 >= BASE)
+                        {
+                            s1 -= BASE;
+                        }
+
+                        s2 %= BASE;
                     }
 
-                    s2 %= BASE;
+                    return s1 | (s2 << 16);
                 }
-
-                return s1 | (s2 << 16);
             }
         }
 #endif

src/ImageSharp/Compression/Zlib/Crc32.cs

@@ -83,117 +83,119 @@ namespace SixLabors.ImageSharp.Compression.Zlib
             int length = chunksize;
 
             fixed (byte* bufferPtr = buffer)
-            fixed (ulong* k05PolyPtr = K05Poly)
             {
-                byte* localBufferPtr = bufferPtr;
-                ulong* localK05PolyPtr = k05PolyPtr;
-
-                // There's at least one block of 64.
-                Vector128<ulong> x1 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x00));
-                Vector128<ulong> x2 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x10));
-                Vector128<ulong> x3 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x20));
-                Vector128<ulong> x4 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x30));
-                Vector128<ulong> x5;
-
-                x1 = Sse2.Xor(x1, Sse2.ConvertScalarToVector128UInt32(crc).AsUInt64());
-
-                // k1, k2
-                Vector128<ulong> x0 = Sse2.LoadVector128(localK05PolyPtr + 0x0);
-
-                localBufferPtr += 64;
-                length -= 64;
-
-                // Parallel fold blocks of 64, if any.
-                while (length >= 64)
+                fixed (ulong* k05PolyPtr = K05Poly)
                 {
-                    x5 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00);
-                    Vector128<ulong> x6 = Pclmulqdq.CarrylessMultiply(x2, x0, 0x00);
-                    Vector128<ulong> x7 = Pclmulqdq.CarrylessMultiply(x3, x0, 0x00);
-                    Vector128<ulong> x8 = Pclmulqdq.CarrylessMultiply(x4, x0, 0x00);
-
-                    x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x11);
-                    x2 = Pclmulqdq.CarrylessMultiply(x2, x0, 0x11);
-                    x3 = Pclmulqdq.CarrylessMultiply(x3, x0, 0x11);
-                    x4 = Pclmulqdq.CarrylessMultiply(x4, x0, 0x11);
+                    byte* localBufferPtr = bufferPtr;
+                    ulong* localK05PolyPtr = k05PolyPtr;
 
-                    Vector128<ulong> y5 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x00));
-                    Vector128<ulong> y6 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x10));
-                    Vector128<ulong> y7 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x20));
-                    Vector128<ulong> y8 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x30));
+                    // There's at least one block of 64.
+                    Vector128<ulong> x1 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x00));
+                    Vector128<ulong> x2 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x10));
+                    Vector128<ulong> x3 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x20));
+                    Vector128<ulong> x4 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x30));
+                    Vector128<ulong> x5;
 
-                    x1 = Sse2.Xor(x1, x5);
-                    x2 = Sse2.Xor(x2, x6);
-                    x3 = Sse2.Xor(x3, x7);
-                    x4 = Sse2.Xor(x4, x8);
+                    x1 = Sse2.Xor(x1, Sse2.ConvertScalarToVector128UInt32(crc).AsUInt64());
 
-                    x1 = Sse2.Xor(x1, y5);
-                    x2 = Sse2.Xor(x2, y6);
-                    x3 = Sse2.Xor(x3, y7);
-                    x4 = Sse2.Xor(x4, y8);
+                    // k1, k2
+                    Vector128<ulong> x0 = Sse2.LoadVector128(localK05PolyPtr + 0x0);
 
                     localBufferPtr += 64;
                     length -= 64;
-                }
-
-                // Fold into 128-bits.
-                // k3, k4
-                x0 = Sse2.LoadVector128(k05PolyPtr + 0x2);
 
-                x5 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00);
-                x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x11);
-                x1 = Sse2.Xor(x1, x2);
-                x1 = Sse2.Xor(x1, x5);
+                    // Parallel fold blocks of 64, if any.
+                    while (length >= 64)
+                    {
+                        x5 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00);
+                        Vector128<ulong> x6 = Pclmulqdq.CarrylessMultiply(x2, x0, 0x00);
+                        Vector128<ulong> x7 = Pclmulqdq.CarrylessMultiply(x3, x0, 0x00);
+                        Vector128<ulong> x8 = Pclmulqdq.CarrylessMultiply(x4, x0, 0x00);
+
+                        x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x11);
+                        x2 = Pclmulqdq.CarrylessMultiply(x2, x0, 0x11);
+                        x3 = Pclmulqdq.CarrylessMultiply(x3, x0, 0x11);
+                        x4 = Pclmulqdq.CarrylessMultiply(x4, x0, 0x11);
+
+                        Vector128<ulong> y5 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x00));
+                        Vector128<ulong> y6 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x10));
+                        Vector128<ulong> y7 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x20));
+                        Vector128<ulong> y8 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x30));
+
+                        x1 = Sse2.Xor(x1, x5);
+                        x2 = Sse2.Xor(x2, x6);
+                        x3 = Sse2.Xor(x3, x7);
+                        x4 = Sse2.Xor(x4, x8);
+
+                        x1 = Sse2.Xor(x1, y5);
+                        x2 = Sse2.Xor(x2, y6);
+                        x3 = Sse2.Xor(x3, y7);
+                        x4 = Sse2.Xor(x4, y8);
+
+                        localBufferPtr += 64;
+                        length -= 64;
+                    }
+
+                    // Fold into 128-bits.
+                    // k3, k4
+                    x0 = Sse2.LoadVector128(k05PolyPtr + 0x2);
 
-                x5 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00);
-                x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x11);
-                x1 = Sse2.Xor(x1, x3);
-                x1 = Sse2.Xor(x1, x5);
-
-                x5 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00);
-                x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x11);
-                x1 = Sse2.Xor(x1, x4);
-                x1 = Sse2.Xor(x1, x5);
+                    x5 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00);
+                    x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x11);
+                    x1 = Sse2.Xor(x1, x2);
+                    x1 = Sse2.Xor(x1, x5);
 
-                // Single fold blocks of 16, if any.
-                while (length >= 16)
-                {
-                    x2 = Sse2.LoadVector128((ulong*)localBufferPtr);
+                    x5 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00);
+                    x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x11);
+                    x1 = Sse2.Xor(x1, x3);
+                    x1 = Sse2.Xor(x1, x5);
 
                     x5 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00);
                     x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x11);
-                    x1 = Sse2.Xor(x1, x2);
+                    x1 = Sse2.Xor(x1, x4);
                     x1 = Sse2.Xor(x1, x5);
 
-                    localBufferPtr += 16;
-                    length -= 16;
-                }
+                    // Single fold blocks of 16, if any.
+                    while (length >= 16)
+                    {
+                        x2 = Sse2.LoadVector128((ulong*)localBufferPtr);
+
+                        x5 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00);
+                        x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x11);
+                        x1 = Sse2.Xor(x1, x2);
+                        x1 = Sse2.Xor(x1, x5);
 
-                // Fold 128 - bits to 64 - bits.
-                x2 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x10);
-                x3 = Vector128.Create(~0, 0, ~0, 0).AsUInt64(); // _mm_setr_epi32 on x86
-                x1 = Sse2.ShiftRightLogical128BitLane(x1, 8);
-                x1 = Sse2.Xor(x1, x2);
+                        localBufferPtr += 16;
+                        length -= 16;
+                    }
 
-                // k5, k0
-                x0 = Sse2.LoadScalarVector128(localK05PolyPtr + 0x4);
+                    // Fold 128 - bits to 64 - bits.
+                    x2 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x10);
+                    x3 = Vector128.Create(~0, 0, ~0, 0).AsUInt64(); // _mm_setr_epi32 on x86
+                    x1 = Sse2.ShiftRightLogical128BitLane(x1, 8);
+                    x1 = Sse2.Xor(x1, x2);
 
-                x2 = Sse2.ShiftRightLogical128BitLane(x1, 4);
-                x1 = Sse2.And(x1, x3);
-                x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00);
-                x1 = Sse2.Xor(x1, x2);
+                    // k5, k0
+                    x0 = Sse2.LoadScalarVector128(localK05PolyPtr + 0x4);
 
-                // Barret reduce to 32-bits.
-                // polynomial
-                x0 = Sse2.LoadVector128(localK05PolyPtr + 0x6);
+                    x2 = Sse2.ShiftRightLogical128BitLane(x1, 4);
+                    x1 = Sse2.And(x1, x3);
+                    x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00);
+                    x1 = Sse2.Xor(x1, x2);
 
-                x2 = Sse2.And(x1, x3);
-                x2 = Pclmulqdq.CarrylessMultiply(x2, x0, 0x10);
-                x2 = Sse2.And(x2, x3);
-                x2 = Pclmulqdq.CarrylessMultiply(x2, x0, 0x00);
-                x1 = Sse2.Xor(x1, x2);
+                    // Barret reduce to 32-bits.
+                    // polynomial
+                    x0 = Sse2.LoadVector128(localK05PolyPtr + 0x6);
 
-                crc = (uint)Sse41.Extract(x1.AsInt32(), 1);
-                return buffer.Length - chunksize == 0 ? crc : CalculateScalar(crc, buffer.Slice(chunksize));
+                    x2 = Sse2.And(x1, x3);
+                    x2 = Pclmulqdq.CarrylessMultiply(x2, x0, 0x10);
+                    x2 = Sse2.And(x2, x3);
+                    x2 = Pclmulqdq.CarrylessMultiply(x2, x0, 0x00);
+                    x1 = Sse2.Xor(x1, x2);
+
+                    crc = (uint)Sse41.Extract(x1.AsInt32(), 1);
+                    return buffer.Length - chunksize == 0 ? crc : CalculateScalar(crc, buffer.Slice(chunksize));
+                }
             }
         }
 #endif

src/ImageSharp/Formats/Bmp/BmpConfigurationModule.cs

@@ -16,4 +16,4 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             configuration.ImageFormatsManager.AddImageFormatDetector(new BmpImageFormatDetector());
         }
     }
-}
+}

src/ImageSharp/Formats/Bmp/BmpConstants.cs

@@ -56,4 +56,4 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             public const int Pointer = 0x5450;
         }
     }
-}
+}

src/ImageSharp/Formats/Bmp/BmpFormat.cs

@@ -34,4 +34,4 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         /// <inheritdoc/>
         public BmpMetadata CreateDefaultFormatMetadata() => new BmpMetadata();
     }
-}
+}

src/ImageSharp/Formats/Bmp/BmpMetadata.cs

@@ -40,4 +40,4 @@ namespace SixLabors.ImageSharp.Formats.Bmp
 
         // TODO: Colors used once we support encoding palette bmps.
     }
-}
+}

src/ImageSharp/Formats/Bmp/IBmpDecoderOptions.cs

@@ -13,4 +13,4 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         /// </summary>
         RleSkippedPixelHandling RleSkippedPixelHandling { get; }
     }
-}
+}

src/ImageSharp/Formats/Gif/GifConfigurationModule.cs

@@ -16,4 +16,4 @@ namespace SixLabors.ImageSharp.Formats.Gif
             configuration.ImageFormatsManager.AddImageFormatDetector(new GifImageFormatDetector());
         }
     }
-}
+}

src/ImageSharp/Formats/Gif/GifDecoderCore.cs

@@ -8,7 +8,6 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
-
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Metadata;

src/ImageSharp/Formats/Gif/GifDisposalMethod.cs

@@ -35,4 +35,4 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// </summary>
         RestoreToPrevious = 3
     }
-}
+}

src/ImageSharp/Formats/Gif/GifFormat.cs

@@ -37,4 +37,4 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <inheritdoc/>
         public GifFrameMetadata CreateDefaultFormatFrameMetadata() => new GifFrameMetadata();
     }
-}
+}

src/ImageSharp/Formats/Gif/GifImageFormatDetector.cs

@@ -30,4 +30,4 @@ namespace SixLabors.ImageSharp.Formats.Gif
                    header[5] == 0x61;   // a
         }
     }
-}
+}

src/ImageSharp/Formats/Gif/LzwEncoder.cs

@@ -6,7 +6,6 @@ using System.Buffers;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Formats.Gif

src/ImageSharp/Formats/Gif/Sections/GifGraphicControlExtension.cs

@@ -103,4 +103,4 @@ namespace SixLabors.ImageSharp.Formats.Gif
             return value;
         }
     }
-}
+}

src/ImageSharp/Formats/Gif/Sections/GifImageDescriptor.cs

@@ -113,4 +113,4 @@ namespace SixLabors.ImageSharp.Formats.Gif
             return value;
         }
     }
-}
+}

src/ImageSharp/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs

@@ -130,4 +130,4 @@ namespace SixLabors.ImageSharp.Formats.Gif
             return value;
         }
     }
-}
+}

src/ImageSharp/Formats/Gif/Sections/IGifExtension.cs

@@ -22,4 +22,4 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <returns>The number of bytes written to the buffer.</returns>
         int WriteTo(Span<byte> buffer);
     }
-}
+}

src/ImageSharp/Formats/IImageFormat.cs

@@ -60,4 +60,4 @@ namespace SixLabors.ImageSharp.Formats
         /// <returns>The <typeparamref name="TFormatFrameMetadata"/>.</returns>
         TFormatFrameMetadata CreateDefaultFormatFrameMetadata();
     }
-}
+}

src/ImageSharp/Formats/Jpeg/Components/Decoder/AdobeMarker.cs

@@ -107,4 +107,4 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
                 this.ColorTransform);
         }
     }
-}
+}

src/ImageSharp/Formats/Jpeg/Components/Decoder/IJpegComponent.cs

@@ -45,4 +45,4 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
         /// </summary>
         Buffer2D<Block8x8> SpectralBlocks { get; }
     }
-}
+}

src/ImageSharp/Formats/Jpeg/Components/Decoder/JFifMarker.cs

@@ -125,4 +125,4 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
                 this.YDensity);
         }
     }
-}
+}

src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegColorSpace.cs

@@ -20,4 +20,4 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 
         YCbCr
     }
-}
+}

src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegComponent.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-
 using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder

src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegFileMarker.cs

@@ -66,4 +66,4 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
             return this.Marker.ToString("X");
         }
     }
-}
+}

src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffIndex.cs

@@ -32,4 +32,4 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Encoder
 
         // ReSharper restore UnusedMember.Local
     }
-}
+}

src/ImageSharp/Formats/Jpeg/Components/SizeExtensions.cs

@@ -48,4 +48,4 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
         public static Size DivideRoundUp(this Size originalSize, Size divisor) =>
             DivideRoundUp(originalSize, divisor.Width, divisor.Height);
     }
-}
+}

src/ImageSharp/Formats/Jpeg/IJpegDecoderOptions.cs

@@ -13,4 +13,4 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
         /// </summary>
         bool IgnoreMetadata { get; }
     }
-}
+}

src/ImageSharp/Formats/Jpeg/JpegConfigurationModule.cs

@@ -16,4 +16,4 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
             configuration.ImageFormatsManager.AddImageFormatDetector(new JpegImageFormatDetector());
         }
     }
-}
+}

src/ImageSharp/Formats/Jpeg/JpegFormat.cs

@@ -34,4 +34,4 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
         /// <inheritdoc/>
         public JpegMetadata CreateDefaultFormatMetadata() => new JpegMetadata();
     }
-}
+}

src/ImageSharp/Formats/Jpeg/JpegImageFormatDetector.cs

@@ -59,4 +59,4 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
             header[0] == 0xFF && // 255
             header[1] == 0xD8; // 216
     }
-}
+}

src/ImageSharp/Formats/Png/Filters/NoneFilter.cs

@@ -27,4 +27,4 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
             scanline.Slice(0, Math.Min(scanline.Length, result.Length)).CopyTo(result);
         }
     }
-}
+}

src/ImageSharp/Formats/Png/PngColorType.cs

@@ -33,4 +33,4 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// </summary>
         RgbWithAlpha = 6
     }
-}
+}

src/ImageSharp/Formats/Png/PngConfigurationModule.cs

@@ -16,4 +16,4 @@ namespace SixLabors.ImageSharp.Formats.Png
             configuration.ImageFormatsManager.AddImageFormatDetector(new PngImageFormatDetector());
         }
     }
-}
+}

src/ImageSharp/Formats/Png/PngFilterMethod.cs

@@ -43,4 +43,4 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// </summary>
         Adaptive,
     }
-}
+}

src/ImageSharp/Formats/Png/PngFormat.cs

@@ -34,4 +34,4 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// <inheritdoc/>
         public PngMetadata CreateDefaultFormatMetadata() => new PngMetadata();
     }
-}
+}

src/ImageSharp/Formats/Png/PngImageFormatDetector.cs

@@ -25,4 +25,4 @@ namespace SixLabors.ImageSharp.Formats.Png
             return header.Length >= this.HeaderSize && BinaryPrimitives.ReadUInt64BigEndian(header) == PngConstants.HeaderValue;
         }
     }
-}
+}

src/ImageSharp/Formats/Png/PngInterlaceMode.cs

@@ -18,4 +18,4 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// </summary>
         Adam7 = 1
     }
-}
+}

src/ImageSharp/Formats/Tiff/Compression/Decompressors/DeflateTiffCompression.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.IO.Compression;
-
 using SixLabors.ImageSharp.Compression.Zlib;
 using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.Formats.Tiff.PhotometricInterpretation;

src/ImageSharp/Formats/Tiff/Compression/Decompressors/ModifiedHuffmanTiffCompression.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-
 using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;

src/ImageSharp/Formats/Tiff/Compression/Decompressors/NoneTiffCompression.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;
 

src/ImageSharp/Formats/Tiff/Compression/Decompressors/PackBitsTiffCompression.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Buffers;
-
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;
 

src/ImageSharp/Formats/Tiff/Compression/Decompressors/T4TiffCompression.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-
 using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;

src/ImageSharp/Formats/Tiff/Compression/Decompressors/T6BitReader.cs

@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.IO;
-
 using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.Memory;
 

src/ImageSharp/Formats/Tiff/Compression/TiffBaseDecompressor.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.IO;
-
 using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;

src/ImageSharp/Formats/Tiff/Ifd/EntryReader.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-
 using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
 

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

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 

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

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 

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

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 

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

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 

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

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 

src/ImageSharp/Formats/Tiff/TiffConfigurationModule.cs

@@ -16,4 +16,4 @@ namespace SixLabors.ImageSharp.Formats.Tiff
             configuration.ImageFormatsManager.AddImageFormatDetector(new TiffImageFormatDetector());
         }
     }
-}
+}

src/ImageSharp/Formats/Tiff/TiffEncoder.cs

@@ -4,7 +4,6 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Compression.Zlib;
 using SixLabors.ImageSharp.Formats.Tiff.Constants;

src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
-
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Compression.Zlib;
 using SixLabors.ImageSharp.Formats.Tiff.Compression;

src/ImageSharp/Formats/Tiff/TiffFormat.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
-
 using SixLabors.ImageSharp.Formats.Tiff.Constants;
 
 namespace SixLabors.ImageSharp.Formats.Tiff

src/ImageSharp/Formats/Tiff/TiffImageFormatDetector.cs

@@ -31,4 +31,4 @@ namespace SixLabors.ImageSharp.Formats.Tiff
                     (header[0] == 0x4D && header[1] == 0x4D && header[2] == 0x00 && header[3] == 0x2A)); // Big-endian
         }
     }
-}
+}

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

@@ -3,7 +3,6 @@
 
 using System;
 using System.Buffers;
-
 using SixLabors.ImageSharp.Formats.Tiff.Compression;
 using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.Memory;

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

@@ -4,7 +4,6 @@
 using System;
 using System.Buffers;
 using System.Runtime.InteropServices;
-
 using SixLabors.ImageSharp.Formats.Tiff.Compression;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;

src/ImageSharp/IConfigurationModule.cs

@@ -14,4 +14,4 @@ namespace SixLabors.ImageSharp
         /// <param name="configuration">The configuration that will retain the encoders, decodes and mime type detectors.</param>
         void Configure(Configuration configuration);
     }
-}
+}

src/ImageSharp/IDeepCloneable.cs

@@ -28,4 +28,4 @@ namespace SixLabors.ImageSharp
         /// <returns>The <see cref="IDeepCloneable"/>.</returns>
         IDeepCloneable DeepClone();
     }
-}
+}

src/ImageSharp/IImageInfo.cs

@@ -32,4 +32,4 @@ namespace SixLabors.ImageSharp
         /// </summary>
         ImageMetadata Metadata { get; }
     }
-}
+}

src/ImageSharp/IO/LocalFileSystem.cs

@@ -16,4 +16,4 @@ namespace SixLabors.ImageSharp.IO
         /// <inheritdoc/>
         public Stream Create(string path) => File.Create(path);
     }
-}
+}

src/ImageSharp/Image.Decode.cs

@@ -121,7 +121,7 @@ namespace SixLabors.ImageSharp
         /// <param name="stream">The image stream to read the header from.</param>
         /// <param name="config">The configuration.</param>
         /// <returns>The decoder and the image format or null if none found.</returns>
-        private static async Task<(IImageDecoder decoder, IImageFormat format)> DiscoverDecoderAsync(Stream stream, Configuration config)
+        private static async Task<(IImageDecoder Decoder, IImageFormat Format)> DiscoverDecoderAsync(Stream stream, Configuration config)
         {
             IImageFormat format = await InternalDetectFormatAsync(stream, config).ConfigureAwait(false);
 

src/ImageSharp/Image.FromStream.cs

@@ -679,13 +679,13 @@ namespace SixLabors.ImageSharp
         /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
         public static Image Load(Configuration configuration, Stream stream, out IImageFormat format)
         {
-            (Image img, IImageFormat format) data = WithSeekableStream(configuration, stream, s => Decode(s, configuration));
+            (Image Img, IImageFormat Format) data = WithSeekableStream(configuration, stream, s => Decode(s, configuration));
 
-            format = data.format;
+            format = data.Format;
 
-            if (data.img != null)
+            if (data.Img != null)
             {
-                return data.img;
+                return data.Img;
             }
 
             var sb = new StringBuilder();