Fix icc namespaces

tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.Metadata.cs

@@ -7,6 +7,7 @@ using SixLabors.ImageSharp.Metadata.Profiles.Exif;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 using SixLabors.ImageSharp.Metadata.Profiles.Iptc;
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg;
 

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderCurvesTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader;
 

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderLutTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader;
 

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderMatrixTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader;
 
@@ -30,8 +31,5 @@ public class IccDataReaderMatrixTests
         Assert.Equal(expected, output);
     }
 
-    private static IccDataReader CreateReader(byte[] data)
+    private static IccDataReader CreateReader(byte[] data) => new(data);
-    {
-        return new IccDataReader(data);
-    }
 }

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderMultiProcessElementTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader;
 

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderNonPrimitivesTests.cs

@@ -3,6 +3,7 @@
 
 using System.Numerics;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader;
 

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderPrimitivesTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader;
 

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderTagDataEntryTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader;
 

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterCurvesTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter;
 
@@ -80,8 +81,5 @@ public class IccDataWriterCurvesTests
         Assert.Equal(expected, output);
     }
 
-    private static IccDataWriter CreateWriter()
+    private static IccDataWriter CreateWriter() => new IccDataWriter();
-    {
-        return new IccDataWriter();
-    }
 }

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterLutTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter;
 
@@ -80,8 +81,5 @@ public class IccDataWriterLutTests
         Assert.Equal(expected, output);
     }
 
-    private static IccDataWriter CreateWriter()
+    private static IccDataWriter CreateWriter() => new IccDataWriter();
-    {
-        return new IccDataWriter();
-    }
 }

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterLutTests1.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter;
 
@@ -80,8 +81,5 @@ public class IccDataWriterLutTests1
         Assert.Equal(expected, output);
     }
 
-    private static IccDataWriter CreateWriter()
+    private static IccDataWriter CreateWriter() => new();
-    {
-        return new IccDataWriter();
-    }
 }

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterLutTests2.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter;
 
@@ -80,8 +81,5 @@ public class IccDataWriterLutTests2
         Assert.Equal(expected, output);
     }
 
-    private static IccDataWriter CreateWriter()
+    private static IccDataWriter CreateWriter() => new();
-    {
-        return new IccDataWriter();
-    }
 }

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterMatrixTests.cs

@@ -3,6 +3,7 @@
 
 using System.Numerics;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter;
 
@@ -69,8 +70,5 @@ public class IccDataWriterMatrixTests
         Assert.Equal(expected, output);
     }
 
-    private static IccDataWriter CreateWriter()
+    private static IccDataWriter CreateWriter() => new();
-    {
-        return new IccDataWriter();
-    }
 }

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterMultiProcessElementTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter;
 
@@ -56,8 +57,5 @@ public class IccDataWriterMultiProcessElementTests
         Assert.Equal(expected, output);
     }
 
-    private static IccDataWriter CreateWriter()
+    private static IccDataWriter CreateWriter() => new();
-    {
-        return new IccDataWriter();
-    }
 }

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterNonPrimitivesTests.cs

@@ -3,6 +3,7 @@
 
 using System.Numerics;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter;
 
@@ -117,8 +118,5 @@ public class IccDataWriterNonPrimitivesTests
         Assert.Equal(expected, output);
     }
 
-    private static IccDataWriter CreateWriter()
+    private static IccDataWriter CreateWriter() => new();
-    {
-        return new IccDataWriter();
-    }
 }

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterPrimitivesTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter;
 
@@ -112,8 +113,5 @@ public class IccDataWriterPrimitivesTests
         Assert.Equal(expected, output);
     }
 
-    private static IccDataWriter CreateWriter()
+    private static IccDataWriter CreateWriter() => new();
-    {
-        return new IccDataWriter();
-    }
 }

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterTagDataEntryTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter;
 
@@ -404,8 +405,5 @@ public class IccDataWriterTagDataEntryTests
         Assert.Equal(expected, output);
     }
 
-    private static IccDataWriter CreateWriter()
+    private static IccDataWriter CreateWriter() => new();
-    {
-        return new IccDataWriter();
-    }
 }

tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter;
 
@@ -105,8 +106,5 @@ public class IccDataWriterTests
         Assert.Equal(expected, output);
     }
 
-    private static IccDataWriter CreateWriter()
+    private static IccDataWriter CreateWriter() => new();
-    {
-        return new IccDataWriter();
-    }
 }

tests/ImageSharp.Tests/Metadata/Profiles/ICC/IccProfileTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.Icc;
 

tests/ImageSharp.Tests/Metadata/Profiles/ICC/IccReaderTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.Icc;
 

tests/ImageSharp.Tests/Metadata/Profiles/ICC/IccWriterTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Tests.TestDataIcc;
 
 namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.Icc;
 

tests/ImageSharp.Tests/TestDataIcc/Conversion/IccConversionDataClut.cs

@@ -4,11 +4,11 @@
 using System.Numerics;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
+namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion;
-{
+
 public class IccConversionDataClut
 {
-        internal static IccClut Clut3x2 = new IccClut(
+    internal static IccClut Clut3x2 = new(
         new[]
         {
             new[] { 0.1f, 0.1f },
@@ -50,7 +50,7 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
         new byte[] { 3, 3, 3 },
         IccClutDataType.Float);
 
-        internal static IccClut Clut3x1 = new IccClut(
+    internal static IccClut Clut3x1 = new(
         new[]
         {
             new[] { 0.10f },
@@ -92,7 +92,7 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
         new byte[] { 3, 3, 3 },
         IccClutDataType.Float);
 
-        internal static IccClut Clut2x2 = new IccClut(
+    internal static IccClut Clut2x2 = new(
         new[]
         {
             new[] { 0.1f, 0.9f },
@@ -110,7 +110,7 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
         new byte[] { 3, 3 },
         IccClutDataType.Float);
 
-        internal static IccClut Clut2x1 = new IccClut(
+    internal static IccClut Clut2x1 = new(
         new[]
         {
             new[] { 0.1f },
@@ -128,7 +128,7 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
         new byte[] { 3, 3 },
         IccClutDataType.Float);
 
-        internal static IccClut Clut1x2 = new IccClut(
+    internal static IccClut Clut1x2 = new(
         new[]
         {
             new[] { 0f, 0.5f },
@@ -138,7 +138,7 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
         new byte[] { 3 },
         IccClutDataType.Float);
 
-        internal static IccClut Clut1x1 = new IccClut(
+    internal static IccClut Clut1x1 = new(
         new[]
         {
             new[] { 0f },
@@ -160,4 +160,3 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
         new object[] { Clut1x1, new Vector4(0.25f, 0, 0, 0), new Vector4(0.25f, 0, 0, 0) },
     };
 }
-}

tests/ImageSharp.Tests/TestDataIcc/Conversion/IccConversionDataLut.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
+namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion;
-{
+
 public class IccConversionDataLut
 {
     private static readonly float[] LutEven = { 0, 0.5f, 1 };
@@ -28,4 +28,3 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
         new object[] { LutUneven, true, 0.85, 0.75 },
     };
 }
-}

tests/ImageSharp.Tests/TestDataIcc/Conversion/IccConversionDataLutAB.cs

@@ -4,11 +4,11 @@
 using System.Numerics;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
+namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion;
-{
+
 public class IccConversionDataLutAB
 {
-        private static readonly IccLutAToBTagDataEntry LutAtoBSingleCurve = new IccLutAToBTagDataEntry(
+    private static readonly IccLutAToBTagDataEntry LutAtoBSingleCurve = new(
        new IccTagDataEntry[]
        {
            IccConversionDataTrc.IdentityCurve,
@@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
     // # CurveM + matrix
     // # CurveA + CLUT + CurveB
     // # CurveA + CLUT + CurveM + Matrix + CurveB
-        private static readonly IccLutBToATagDataEntry LutBtoASingleCurve = new IccLutBToATagDataEntry(
+    private static readonly IccLutBToATagDataEntry LutBtoASingleCurve = new(
        new IccTagDataEntry[]
        {
            IccConversionDataTrc.IdentityCurve,
@@ -48,4 +48,3 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
         new object[] { LutBtoASingleCurve, new Vector4(0.2f, 0.3f, 0.4f, 0), new Vector4(0.2f, 0.3f, 0.4f, 0) },
     };
 }
-}

tests/ImageSharp.Tests/TestDataIcc/Conversion/IccConversionDataLutEntry.cs

@@ -4,31 +4,31 @@
 using System.Numerics;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
+namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion;
-{
+
 public class IccConversionDataLutEntry
 {
     private static readonly IccLut Lut256 = CreateLut(256);
     private static readonly IccLut Lut32 = CreateLut(32);
     private static readonly IccLut LutIdentity = CreateIdentityLut(0, 1);
 
-        private static readonly IccLut8TagDataEntry Lut8 = new IccLut8TagDataEntry(
+    private static readonly IccLut8TagDataEntry Lut8 = new(
         new[] { Lut256, Lut256 },
         IccConversionDataClut.Clut2x1,
         new[] { Lut256 });
 
-        private static readonly IccLut16TagDataEntry Lut16 = new IccLut16TagDataEntry(
+    private static readonly IccLut16TagDataEntry Lut16 = new(
         new[] { Lut32, Lut32 },
         IccConversionDataClut.Clut2x1,
         new[] { LutIdentity });
 
-        private static readonly IccLut8TagDataEntry Lut8Matrix = new IccLut8TagDataEntry(
+    private static readonly IccLut8TagDataEntry Lut8Matrix = new(
         IccConversionDataMatrix.Matrix3x3Random,
         new[] { Lut256, Lut256, Lut256 },
         IccConversionDataClut.Clut3x1,
         new[] { Lut256 });
 
-        private static readonly IccLut16TagDataEntry Lut16Matrix = new IccLut16TagDataEntry(
+    private static readonly IccLut16TagDataEntry Lut16Matrix = new(
         IccConversionDataMatrix.Matrix3x3Random,
         new[] { Lut32, Lut32, Lut32 },
         IccConversionDataClut.Clut3x1,
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
         return new IccLut(values);
     }
 
-        private static IccLut CreateIdentityLut(float min, float max) => new IccLut(new[] { min, max });
+    private static IccLut CreateIdentityLut(float min, float max) => new(new[] { min, max });
 
     public static object[][] Lut8ConversionTestData =
     {
@@ -59,4 +59,3 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
         new object[] { Lut16Matrix, new Vector4(0.21f, 0.31f, 0.41f, 0), new Vector4(0.336980581f, 0, 0, 0) },
     };
 }
-}

tests/ImageSharp.Tests/TestDataIcc/Conversion/IccConversionDataMatrix.cs

@@ -3,11 +3,11 @@
 
 using System.Numerics;
 
-namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
+namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion;
-{
+
 public class IccConversionDataMatrix
 {
-        private static readonly Vector3 Vector3Zero = new Vector3(0.0f, 0.0f, 0.0f);
+    private static readonly Vector3 Vector3Zero = new(0.0f, 0.0f, 0.0f);
 
     public static float[,] Matrix3x3Random =
     {
@@ -33,7 +33,7 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
         new object[] { CreateMatrix(Matrix3x3Random), new Vector3(0.1f, 0.2f, 0.3f), new Vector4(0.2f, 0.4f, 0.7f, 0), new Vector4(0.77f, 1, 1.23f, 0) },
     };
 
-        private static Matrix4x4 CreateMatrix(float[,] matrix) => new Matrix4x4(
+    private static Matrix4x4 CreateMatrix(float[,] matrix) => new(
             matrix[0, 0],
             matrix[0, 1],
             matrix[0, 2],
@@ -51,4 +51,3 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
             0,
             1);
 }
-}

tests/ImageSharp.Tests/TestDataIcc/Conversion/IccConversionDataMultiProcessElement.cs

@@ -3,18 +3,19 @@
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
+namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion;
-{
+
 public class IccConversionDataMultiProcessElement
 {
-        private static readonly IccMatrixProcessElement Matrix = new IccMatrixProcessElement(
+    private static readonly IccMatrixProcessElement Matrix = new(
         new float[,]
     {
         { 2, 4, 6 },
         { 3, 5, 7 },
-        }, new float[] { 3, 4, 5 });
+    },
+        new float[] { 3, 4, 5 });
 
-        private static readonly IccClut Clut = new IccClut(
+    private static readonly IccClut Clut = new(
         new[]
         {
         new[] { 0.2f, 0.3f },
@@ -28,12 +29,13 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
 
         new[] { 0.23f, 0.33f },
         new[] { 0.43f, 0.53f },
-            }, new byte[] { 2, 2, 2 },
+        },
+        new byte[] { 2, 2, 2 },
         IccClutDataType.Float);
 
-        private static readonly IccFormulaCurveElement FormulaCurveElement1 = new IccFormulaCurveElement(IccFormulaCurveType.Type1, 2.2f, 0.7f, 0.2f, 0.3f, 0, 0);
+    private static readonly IccFormulaCurveElement FormulaCurveElement1 = new(IccFormulaCurveType.Type1, 2.2f, 0.7f, 0.2f, 0.3f, 0, 0);
-        private static readonly IccFormulaCurveElement FormulaCurveElement2 = new IccFormulaCurveElement(IccFormulaCurveType.Type2, 2.2f, 0.9f, 0.9f, 0.02f, 0.1f, 0);
+    private static readonly IccFormulaCurveElement FormulaCurveElement2 = new(IccFormulaCurveType.Type2, 2.2f, 0.9f, 0.9f, 0.02f, 0.1f, 0);
-        private static readonly IccFormulaCurveElement FormulaCurveElement3 = new IccFormulaCurveElement(IccFormulaCurveType.Type3, 0, 0.9f, 0.9f, 1.02f, 0.1f, 0.02f);
+    private static readonly IccFormulaCurveElement FormulaCurveElement3 = new(IccFormulaCurveType.Type3, 0, 0.9f, 0.9f, 1.02f, 0.1f, 0.02f);
 
     private static readonly IccCurveSetProcessElement CurveSet1DFormula1 = Create1DSingleCurveSet(FormulaCurveElement1);
     private static readonly IccCurveSetProcessElement CurveSet1DFormula2 = Create1DSingleCurveSet(FormulaCurveElement2);
@@ -41,7 +43,7 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
 
     private static readonly IccCurveSetProcessElement CurveSet1DFormula1And2 = Create1DMultiCurveSet(new[] { 0.5f }, FormulaCurveElement1, FormulaCurveElement2);
 
-        private static readonly IccClutProcessElement ClutElement = new IccClutProcessElement(Clut);
+    private static readonly IccClutProcessElement ClutElement = new(Clut);
 
     private static IccCurveSetProcessElement Create1DSingleCurveSet(IccCurveSegment segment)
     {
@@ -75,4 +77,3 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
         new object[] { ClutElement, new[] { 0.5f, 0.5f, 0.5f }, new[] { 0.5f, 0.5f } }
     };
 }
-}

tests/ImageSharp.Tests/TestDataIcc/Conversion/IccConversionDataTrc.cs

@@ -4,19 +4,19 @@
 using System.Numerics;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
+namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion;
-{
+
 public class IccConversionDataTrc
 {
-        internal static IccCurveTagDataEntry IdentityCurve = new IccCurveTagDataEntry();
+    internal static IccCurveTagDataEntry IdentityCurve = new();
-        internal static IccCurveTagDataEntry Gamma2Curve = new IccCurveTagDataEntry(2);
+    internal static IccCurveTagDataEntry Gamma2Curve = new(2);
-        internal static IccCurveTagDataEntry LutCurve = new IccCurveTagDataEntry(new float[] { 0, 0.7f, 1 });
+    internal static IccCurveTagDataEntry LutCurve = new(new float[] { 0, 0.7f, 1 });
 
-        internal static IccParametricCurveTagDataEntry ParamCurve1 = new IccParametricCurveTagDataEntry(new IccParametricCurve(2.2f));
+    internal static IccParametricCurveTagDataEntry ParamCurve1 = new(new IccParametricCurve(2.2f));
-        internal static IccParametricCurveTagDataEntry ParamCurve2 = new IccParametricCurveTagDataEntry(new IccParametricCurve(2.2f, 1.5f, -0.5f));
+    internal static IccParametricCurveTagDataEntry ParamCurve2 = new(new IccParametricCurve(2.2f, 1.5f, -0.5f));
-        internal static IccParametricCurveTagDataEntry ParamCurve3 = new IccParametricCurveTagDataEntry(new IccParametricCurve(2.2f, 1.5f, -0.5f, 0.3f));
+    internal static IccParametricCurveTagDataEntry ParamCurve3 = new(new IccParametricCurve(2.2f, 1.5f, -0.5f, 0.3f));
-        internal static IccParametricCurveTagDataEntry ParamCurve4 = new IccParametricCurveTagDataEntry(new IccParametricCurve(2.4f, 1 / 1.055f, 0.055f / 1.055f, 1 / 12.92f, 0.04045f));
+    internal static IccParametricCurveTagDataEntry ParamCurve4 = new(new IccParametricCurve(2.4f, 1 / 1.055f, 0.055f / 1.055f, 1 / 12.92f, 0.04045f));
-        internal static IccParametricCurveTagDataEntry ParamCurve5 = new IccParametricCurveTagDataEntry(new IccParametricCurve(2.2f, 0.7f, 0.2f, 0.3f, 0.1f, 0.5f, 0.2f));
+    internal static IccParametricCurveTagDataEntry ParamCurve5 = new(new IccParametricCurve(2.2f, 0.7f, 0.2f, 0.3f, 0.1f, 0.5f, 0.2f));
 
     public static object[][] TrcArrayConversionTestData =
     {
@@ -74,4 +74,3 @@ namespace SixLabors.ImageSharp.Tests.TestDataIcc.Conversion
         new object[] { ParamCurve5, true, 0.215f, 0.05f },
     };
 }
-}

tests/ImageSharp.Tests/TestDataIcc/IccTestDataArray.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Tests;
+namespace SixLabors.ImageSharp.Tests.TestDataIcc;
 
 internal static class IccTestDataArray
 {

tests/ImageSharp.Tests/TestDataIcc/IccTestDataCurves.cs

@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.Tests;
+namespace SixLabors.ImageSharp.Tests.TestDataIcc;
 
 internal static class IccTestDataCurves
 {

tests/ImageSharp.Tests/TestDataIcc/IccTestDataLut.cs

@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.Tests;
+namespace SixLabors.ImageSharp.Tests.TestDataIcc;
 
 internal static class IccTestDataLut
 {

tests/ImageSharp.Tests/TestDataIcc/IccTestDataMatrix.cs

@@ -3,9 +3,7 @@
 
 using System.Numerics;
 
-namespace SixLabors.ImageSharp.Tests;
+namespace SixLabors.ImageSharp.Tests.TestDataIcc;
-
-using SixLabors.ImageSharp;
 
 internal static class IccTestDataMatrix
 {

tests/ImageSharp.Tests/TestDataIcc/IccTestDataMultiProcessElements.cs

@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.Tests;
+namespace SixLabors.ImageSharp.Tests.TestDataIcc;
 
 internal static class IccTestDataMultiProcessElements
 {

tests/ImageSharp.Tests/TestDataIcc/IccTestDataNonPrimitives.cs

@@ -5,7 +5,7 @@ using System.Globalization;
 using System.Numerics;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.Tests;
+namespace SixLabors.ImageSharp.Tests.TestDataIcc;
 
 internal static class IccTestDataNonPrimitives
 {

tests/ImageSharp.Tests/TestDataIcc/IccTestDataPrimitives.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Tests;
+namespace SixLabors.ImageSharp.Tests.TestDataIcc;
 
 internal static class IccTestDataPrimitives
 {

tests/ImageSharp.Tests/TestDataIcc/IccTestDataProfiles.cs

@@ -4,7 +4,7 @@
 using System.Numerics;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.Tests;
+namespace SixLabors.ImageSharp.Tests.TestDataIcc;
 
 internal static class IccTestDataProfiles
 {

tests/ImageSharp.Tests/TestDataIcc/IccTestDataTagDataEntry.cs

@@ -2,10 +2,9 @@
 // Licensed under the Six Labors Split License.
 
 using System.Globalization;
-using System.Numerics;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.Tests;
+namespace SixLabors.ImageSharp.Tests.TestDataIcc;
 
 internal static class IccTestDataTagDataEntry
 {