Use stylecop in Test project

.editorconfig

@@ -339,6 +339,7 @@ csharp_space_between_square_brackets = false
 #   warn when using var for built-in types,
 #   warn when using var when the type is not apparent, and
 #   warn when not using var when the type is apparent
+#   warn when using simplified "using" declaration
 ###############################################################################
 [*.cs]
 csharp_prefer_braces = true:silent
@@ -367,6 +368,8 @@ csharp_style_throw_expression = true:suggestion
 csharp_style_unused_value_expression_statement_preference = discard_variable:silent
 csharp_style_unused_value_assignment_preference = discard_variable:suggestion
 
-csharp_style_var_for_built_in_types = false:warning
-csharp_style_var_elsewhere = false:warning
+csharp_style_var_for_built_in_types = false:silent
 csharp_style_var_when_type_is_apparent = true:warning
+csharp_style_var_elsewhere = false:warning
+
+csharp_prefer_simple_using_statement = false:silent

.gitattributes

@@ -96,22 +96,22 @@
 *.gif               binary
 *.jpg               binary
 *.ktx               binary
+*.otf               binary
 *.pbm               binary
 *.pdf               binary
 *.png               binary
 *.ppt               binary
 *.pptx              binary
 *.pvr               binary
-*.ttf               binary
 *.snk               binary
 *.tga               binary
+*.ttc               binary
 *.ttf               binary
 *.woff              binary
 *.woff2             binary
 *.xls               binary
 *.xlsx              binary
 
-
 ###############################################################################
 # Set explicit file behavior to:
 #   diff as plain text

Directory.Build.props

@@ -103,8 +103,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Net.Compilers.Toolset" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" IsImplicitlyDefined="true"  />
-    <!--TODO: Enable this once tests Stylecop issues are fixed-->
-    <!--<PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true"  />-->
+    <PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true"  />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)shared-infrastructure\stylecop.json" />
     <!--NuGet package icon source-->
     <None Include="$(MSBuildThisFileDirectory)shared-infrastructure\branding\icons\imagesharp\sixlabors.imagesharp.128.png" Pack="true" PackagePath="\icon.png" />

src/Directory.Build.props

@@ -27,9 +27,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!--TODO: Delete this once tests Stylecop issues are fixed-->
-    <PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true"  />
-
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" PublicKey="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2, PublicKeyToken=null" />
     <InternalsVisibleTo Include="ImageSharp.Benchmarks" />

src/ImageSharp/Advanced/ParallelUtils/ParallelHelper.cs

@@ -26,7 +26,7 @@ public static class ParallelHelper
         /// <param name="body">The method body defining the iteration logic on a single <see cref="RowInterval"/>.</param>
         public static void IterateRows(Rectangle rectangle, Configuration configuration, Action<RowInterval> body)
         {
-            ParallelExecutionSettings parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration);
+            var parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration);
 
             IterateRows(rectangle, parallelSettings, body);
         }

src/ImageSharp/Metadata/Profiles/ICC/DataReader/IccDataReader.TagDataEntry.cs

@@ -153,7 +153,7 @@ public IccChromaticityTagDataEntry ReadChromaticityTagDataEntry()
             else
             {
                 // The type is not know, so the values need be read
-                var values = new double[channelCount][];
+                double[][] values = new double[channelCount][];
                 for (int i = 0; i < channelCount; i++)
                 {
                     values[i] = new double[] { this.ReadUFix16(), this.ReadUFix16() };
@@ -208,7 +208,7 @@ public IccCurveTagDataEntry ReadCurveTagDataEntry()
                 return new IccCurveTagDataEntry(this.ReadUFix8());
             }
 
-            var cdata = new float[pointCount];
+            float[] cdata = new float[pointCount];
             for (int i = 0; i < pointCount; i++)
             {
                 cdata[i] = this.ReadUInt16() / 65535f;
@@ -264,7 +264,7 @@ public IccLut16TagDataEntry ReadLut16TagDataEntry()
 
             // Input LUT
             var inValues = new IccLut[inChCount];
-            var gridPointCount = new byte[inChCount];
+            byte[] gridPointCount = new byte[inChCount];
             for (int i = 0; i < inChCount; i++)
             {
                 inValues[i] = this.ReadLut16(inTableCount);
@@ -299,7 +299,7 @@ public IccLut8TagDataEntry ReadLut8TagDataEntry()
 
             // Input LUT
             var inValues = new IccLut[inChCount];
-            var gridPointCount = new byte[inChCount];
+            byte[] gridPointCount = new byte[inChCount];
             for (int i = 0; i < inChCount; i++)
             {
                 inValues[i] = this.ReadLut8();
@@ -464,8 +464,8 @@ public IccMultiLocalizedUnicodeTagDataEntry ReadMultiLocalizedUnicodeTagDataEntr
             var text = new IccLocalizedString[recordCount];
 
             var culture = new CultureInfo[recordCount];
-            var length = new uint[recordCount];
-            var offset = new uint[recordCount];
+            uint[] length = new uint[recordCount];
+            uint[] offset = new uint[recordCount];
 
             for (int i = 0; i < recordCount; i++)
             {
@@ -627,7 +627,7 @@ public IccResponseCurveSet16TagDataEntry ReadResponseCurveSet16TagDataEntry()
             ushort channelCount = this.ReadUInt16();
             ushort measurementCount = this.ReadUInt16();
 
-            var offset = new uint[measurementCount];
+            uint[] offset = new uint[measurementCount];
             for (int i = 0; i < measurementCount; i++)
             {
                 offset[i] = this.ReadUInt32();
@@ -651,7 +651,7 @@ public IccResponseCurveSet16TagDataEntry ReadResponseCurveSet16TagDataEntry()
         public IccFix16ArrayTagDataEntry ReadFix16ArrayTagDataEntry(uint size)
         {
             uint count = (size - 8) / 4;
-            var arrayData = new float[count];
+            float[] arrayData = new float[count];
             for (int i = 0; i < count; i++)
             {
                 arrayData[i] = this.ReadFix16() / 256f;
@@ -687,7 +687,7 @@ public IccTextTagDataEntry ReadTextTagDataEntry(uint size)
         public IccUFix16ArrayTagDataEntry ReadUFix16ArrayTagDataEntry(uint size)
         {
             uint count = (size - 8) / 4;
-            var arrayData = new float[count];
+            float[] arrayData = new float[count];
             for (int i = 0; i < count; i++)
             {
                 arrayData[i] = this.ReadUFix16();
@@ -704,7 +704,7 @@ public IccUFix16ArrayTagDataEntry ReadUFix16ArrayTagDataEntry(uint size)
         public IccUInt16ArrayTagDataEntry ReadUInt16ArrayTagDataEntry(uint size)
         {
             uint count = (size - 8) / 2;
-            var arrayData = new ushort[count];
+            ushort[] arrayData = new ushort[count];
             for (int i = 0; i < count; i++)
             {
                 arrayData[i] = this.ReadUInt16();
@@ -721,7 +721,7 @@ public IccUInt16ArrayTagDataEntry ReadUInt16ArrayTagDataEntry(uint size)
         public IccUInt32ArrayTagDataEntry ReadUInt32ArrayTagDataEntry(uint size)
         {
             uint count = (size - 8) / 4;
-            var arrayData = new uint[count];
+            uint[] arrayData = new uint[count];
             for (int i = 0; i < count; i++)
             {
                 arrayData[i] = this.ReadUInt32();
@@ -738,7 +738,7 @@ public IccUInt32ArrayTagDataEntry ReadUInt32ArrayTagDataEntry(uint size)
         public IccUInt64ArrayTagDataEntry ReadUInt64ArrayTagDataEntry(uint size)
         {
             uint count = (size - 8) / 8;
-            var arrayData = new ulong[count];
+            ulong[] arrayData = new ulong[count];
             for (int i = 0; i < count; i++)
             {
                 arrayData[i] = this.ReadUInt64();
@@ -878,14 +878,14 @@ public IccScreeningTagDataEntry ReadScreeningTagDataEntry()
         public IccUcrBgTagDataEntry ReadUcrBgTagDataEntry(uint size)
         {
             uint ucrCount = this.ReadUInt32();
-            var ucrCurve = new ushort[ucrCount];
+            ushort[] ucrCurve = new ushort[ucrCount];
             for (int i = 0; i < ucrCurve.Length; i++)
             {
                 ucrCurve[i] = this.ReadUInt16();
             }
 
             uint bgCount = this.ReadUInt32();
-            var bgCurve = new ushort[bgCount];
+            ushort[] bgCurve = new ushort[bgCount];
             for (int i = 0; i < bgCurve.Length; i++)
             {
                 bgCurve[i] = this.ReadUInt16();

src/ImageSharp/Metadata/Profiles/ICC/TagDataEntries/IccLutAToBTagDataEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;

src/ImageSharp/Metadata/Profiles/ICC/TagDataEntries/IccLutBToATagDataEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;

src/ImageSharp/Metadata/Profiles/ICC/TagDataEntries/IccXyzTagDataEntry.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Numerics;
+using System.Runtime.CompilerServices;
 
 namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
 {
@@ -53,4 +54,4 @@ public bool Equals(IccXyzTagDataEntry other)
             return this.Equals((IccTagDataEntry)other);
         }
     }
-}
+}

src/ImageSharp/Primitives/ColorMatrix.cs

@@ -204,7 +204,7 @@ public bool IsIdentity
         /// <returns>The resulting matrix.</returns>
         public static ColorMatrix operator +(ColorMatrix value1, ColorMatrix value2)
         {
-            ColorMatrix m;
+            var m = default(ColorMatrix);
 
             m.M11 = value1.M11 + value2.M11;
             m.M12 = value1.M12 + value2.M12;
@@ -238,7 +238,7 @@ public bool IsIdentity
         /// <returns>The result of the subtraction.</returns>
         public static ColorMatrix operator -(ColorMatrix value1, ColorMatrix value2)
         {
-            ColorMatrix m;
+            var m = default(ColorMatrix);
 
             m.M11 = value1.M11 - value2.M11;
             m.M12 = value1.M12 - value2.M12;
@@ -271,7 +271,7 @@ public bool IsIdentity
         /// <returns>The negated matrix.</returns>
         public static ColorMatrix operator -(ColorMatrix value)
         {
-            ColorMatrix m;
+            var m = default(ColorMatrix);
 
             m.M11 = -value.M11;
             m.M12 = -value.M12;
@@ -305,7 +305,7 @@ public bool IsIdentity
         /// <returns>The result of the multiplication.</returns>
         public static ColorMatrix operator *(ColorMatrix value1, ColorMatrix value2)
         {
-            ColorMatrix m;
+            var m = default(ColorMatrix);
 
             // First row
             m.M11 = (value1.M11 * value2.M11) + (value1.M12 * value2.M21) + (value1.M13 * value2.M31) + (value1.M14 * value2.M41);
@@ -348,7 +348,7 @@ public bool IsIdentity
         /// <returns>The scaled matrix.</returns>
         public static ColorMatrix operator *(ColorMatrix value1, float value2)
         {
-            ColorMatrix m;
+            var m = default(ColorMatrix);
 
             m.M11 = value1.M11 * value2;
             m.M12 = value1.M12 * value2;

tests/ImageSharp.Benchmarks/Codecs/DecodeTga.cs

@@ -18,7 +18,9 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs
     public class DecodeTga : BenchmarkBase
     {
         private string TestImageFullPath => Path.Combine(TestEnvironment.InputImagesDirectoryFullPath, this.TestImage);
+
         private readonly PfimConfig pfimConfig = new PfimConfig(allocator: new PfimAllocator());
+
         private byte[] data;
 
         [Params(TestImages.Tga.Bit24)]
@@ -77,15 +79,16 @@ public void Return(byte[] data)
             public int Rented => this.rented;
         }
 
-        // RESULTS (07/01/2020)
-        //|            Method |       Runtime |           TestImage |         Mean |        Error |     StdDev | Ratio |  Gen 0 | Gen 1 | Gen 2 | Allocated |
-        //|------------------ |-------------- |-------------------- |-------------:|-------------:|-----------:|------:|-------:|------:|------:|----------:|
-        //| 'ImageMagick Tga' |    .NET 4.7.2 | Tga/targa_24bit.tga | 1,778.965 us | 1,711.088 us | 93.7905 us | 1.000 | 1.9531 |     - |     - |   13668 B |
-        //|  'ImageSharp Tga' |    .NET 4.7.2 | Tga/targa_24bit.tga |    38.659 us |     6.886 us |  0.3774 us | 0.022 | 0.3052 |     - |     - |    1316 B |
-        //|        'Pfim Tga' |    .NET 4.7.2 | Tga/targa_24bit.tga |     6.752 us |    10.268 us |  0.5628 us | 0.004 | 0.0687 |     - |     - |     313 B |
-        //|                   |               |                     |              |              |            |       |        |       |       |           |
-        //| 'ImageMagick Tga' | .NET Core 2.1 | Tga/targa_24bit.tga | 1,407.585 us |   124.215 us |  6.8087 us | 1.000 | 1.9531 |     - |     - |   13307 B |
-        //|  'ImageSharp Tga' | .NET Core 2.1 | Tga/targa_24bit.tga |    17.958 us |     9.352 us |  0.5126 us | 0.013 | 0.2747 |     - |     - |    1256 B |
-        //|        'Pfim Tga' | .NET Core 2.1 | Tga/targa_24bit.tga |     5.645 us |     2.279 us |  0.1249 us | 0.004 | 0.0610 |     - |     - |     280 B |
+        /* RESULTS (07/01/2020)
+        |            Method |       Runtime |           TestImage |         Mean |        Error |     StdDev | Ratio |  Gen 0 | Gen 1 | Gen 2 | Allocated |
+        |------------------ |-------------- |-------------------- |-------------:|-------------:|-----------:|------:|-------:|------:|------:|----------:|
+        | 'ImageMagick Tga' |    .NET 4.7.2 | Tga/targa_24bit.tga | 1,778.965 us | 1,711.088 us | 93.7905 us | 1.000 | 1.9531 |     - |     - |   13668 B |
+        |  'ImageSharp Tga' |    .NET 4.7.2 | Tga/targa_24bit.tga |    38.659 us |     6.886 us |  0.3774 us | 0.022 | 0.3052 |     - |     - |    1316 B |
+        |        'Pfim Tga' |    .NET 4.7.2 | Tga/targa_24bit.tga |     6.752 us |    10.268 us |  0.5628 us | 0.004 | 0.0687 |     - |     - |     313 B |
+        |                   |               |                     |              |              |            |       |        |       |       |           |
+        | 'ImageMagick Tga' | .NET Core 2.1 | Tga/targa_24bit.tga | 1,407.585 us |   124.215 us |  6.8087 us | 1.000 | 1.9531 |     - |     - |   13307 B |
+        |  'ImageSharp Tga' | .NET Core 2.1 | Tga/targa_24bit.tga |    17.958 us |     9.352 us |  0.5126 us | 0.013 | 0.2747 |     - |     - |    1256 B |
+        |        'Pfim Tga' | .NET Core 2.1 | Tga/targa_24bit.tga |     5.645 us |     2.279 us |  0.1249 us | 0.004 | 0.0610 |     - |     - |     280 B |
+        */
     }
 }

tests/ImageSharp.Benchmarks/Codecs/EncodeBmpMultiple.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
@@ -16,13 +16,21 @@ public class EncodeBmpMultiple : MultiImageBenchmarkBase.WithImagesPreloaded
         [Benchmark(Description = "EncodeBmpMultiple - ImageSharp")]
         public void EncodeBmpImageSharp()
         {
-            this.ForEachImageSharpImage((img, ms) => { img.Save(ms, new BmpEncoder()); return null; });
+            this.ForEachImageSharpImage((img, ms) =>
+            {
+                img.Save(ms, new BmpEncoder());
+                return null;
+            });
         }
 
         [Benchmark(Baseline = true, Description = "EncodeBmpMultiple - System.Drawing")]
         public void EncodeBmpSystemDrawing()
         {
-            this.ForEachSystemDrawingImage((img, ms) => { img.Save(ms, ImageFormat.Bmp); return null; });
+            this.ForEachSystemDrawingImage((img, ms) =>
+            {
+                img.Save(ms, ImageFormat.Bmp);
+                return null;
+            });
         }
     }
-}
+}

tests/ImageSharp.Benchmarks/Codecs/EncodeGifMultiple.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
@@ -24,14 +24,19 @@ public void EncodeGifImageSharp()
             {
                 // Try to get as close to System.Drawing's output as possible
                 var options = new GifEncoder { Quantizer = new WebSafePaletteQuantizer(false) };
-                img.Save(ms, options); return null;
+                img.Save(ms, options);
+                return null;
             });
         }
 
         [Benchmark(Baseline = true, Description = "EncodeGifMultiple - System.Drawing")]
         public void EncodeGifSystemDrawing()
         {
-            this.ForEachSystemDrawingImage((img, ms) => { img.Save(ms, ImageFormat.Gif); return null; });
+            this.ForEachSystemDrawingImage((img, ms) =>
+            {
+                img.Save(ms, ImageFormat.Gif);
+                return null;
+            });
         }
     }
-}
+}

tests/ImageSharp.Benchmarks/Codecs/EncodeTga.cs

@@ -28,7 +28,7 @@ public void ReadImages()
         {
             if (this.tgaCore == null)
             {
-                this.tgaCore = Image.Load<Rgba32>(TestImageFullPath);
+                this.tgaCore = Image.Load<Rgba32>(this.TestImageFullPath);
                 this.tgaMagick = new MagickImage(this.TestImageFullPath);
             }
         }

tests/ImageSharp.Benchmarks/Codecs/ImageBenchmarkTests.cs

@@ -1,12 +1,11 @@
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 // This file contains small, cheap and "unit test" benchmarks to test MultiImageBenchmarkBase.
 // Need this because there are no real test cases for the common benchmark utility stuff.
 
 // Uncomment this to enable benchmark testing
 // #define TEST
-
 #if TEST
 
 // ReSharper disable InconsistentNaming
@@ -76,4 +75,4 @@ public void Run()
     }
 }
 
-#endif
+#endif