Cleanup + obvious perf improvements

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

@@ -3,7 +3,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {

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

@@ -3,7 +3,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {

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

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Numerics;
 using System.Runtime.CompilerServices;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
@@ -30,18 +31,13 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
             float yr = l > CieConstants.Kappa * CieConstants.Epsilon ? MathF.Pow((l + 16F) / 116F, 3F) : l / CieConstants.Kappa;
             float zr = fz3 > CieConstants.Epsilon ? fz3 : ((116F * fz) - 16F) / CieConstants.Kappa;
 
-            float wx = input.WhitePoint.X, wy = input.WhitePoint.Y, wz = input.WhitePoint.Z;
+            var wxyz = new Vector3(input.WhitePoint.X, input.WhitePoint.Y, input.WhitePoint.Z);
 
             // Avoids XYZ coordinates out range (restricted by 0 and XYZ reference white)
-            xr = xr.Clamp(0, 1F);
-            yr = yr.Clamp(0, 1F);
-            zr = zr.Clamp(0, 1F);
+            var xyzr = Vector3.Clamp(new Vector3(xr, yr, zr), Vector3.Zero, Vector3.One);
 
-            float x = xr * wx;
-            float y = yr * wy;
-            float z = zr * wz;
-
-            return new CieXyz(x, y, z);
+            Vector3 xyz = xyzr * wxyz;
+            return new CieXyz(xyz);
         }
     }
 }

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

@@ -3,7 +3,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {

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

@@ -3,7 +3,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {

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

@@ -3,7 +3,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {

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

@@ -3,7 +3,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {

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

@@ -3,7 +3,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {

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

@@ -3,7 +3,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {

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

@@ -3,7 +3,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {

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

@@ -41,7 +41,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
             DebugGuard.NotNull(input, nameof(input));
 
             Matrix4x4.Invert(this.conversionMatrix, out Matrix4x4 inverted);
-            Vector3 vector = Vector3.Transform(input.Vector, inverted);
+            var vector = Vector3.Transform(input.Vector, inverted);
             return new LinearRgb(vector, this.TargetWorkingSpace);
         }
     }

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

@@ -3,7 +3,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {

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

@@ -3,7 +3,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {

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

@@ -40,7 +40,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
             const float Yb = 1;
             float mZb = (1 - xb - yb) / yb;
 
-            Matrix4x4 xyzMatrix = new Matrix4x4
+            var xyzMatrix = new Matrix4x4
             {
                 M11 = mXr, M21 = mXg, M31 = mXb,
                 M12 = Yr,  M22 = Yg,  M32 = Yb,
@@ -48,10 +48,9 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
                 M44 = 1F
             };
 
-            Matrix4x4 inverseXyzMatrix;
-            Matrix4x4.Invert(xyzMatrix, out inverseXyzMatrix);
+            Matrix4x4.Invert(xyzMatrix, out var inverseXyzMatrix);
 
-            Vector3 vector = Vector3.Transform(workingSpace.WhitePoint.Vector, inverseXyzMatrix);
+            var vector = Vector3.Transform(workingSpace.WhitePoint.Vector, inverseXyzMatrix);
 
             // Use transposed Rows/Coloumns
             // TODO: Is there a built in method for this multiplication?

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

@@ -41,7 +41,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
             DebugGuard.NotNull(input, nameof(input));
             Guard.IsTrue(input.WorkingSpace.Equals(this.SourceWorkingSpace), nameof(input.WorkingSpace), "Input and source working spaces must be equal.");
 
-            Vector3 vector = Vector3.Transform(input.Vector, this.conversionMatrix);
+            var vector = Vector3.Transform(input.Vector, this.conversionMatrix);
             return new CieXyz(vector);
         }
     }

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

@@ -40,13 +40,13 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
         public CieXyChromaticityCoordinates B { get; }
 
         /// <summary>
-        /// Compares two <see cref="CieLab"/> objects for equality.
+        /// Compares two <see cref="RgbPrimariesChromaticityCoordinates"/> objects for equality.
         /// </summary>
         /// <param name="left">
-        /// The <see cref="CieLab"/> on the left side of the operand.
+        /// The <see cref="RgbPrimariesChromaticityCoordinates"/> on the left side of the operand.
         /// </param>
         /// <param name="right">
-        /// The <see cref="CieLab"/> on the right side of the operand.
+        /// The <see cref="RgbPrimariesChromaticityCoordinates"/> on the right side of the operand.
         /// </param>
         /// <returns>
         /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
@@ -57,13 +57,13 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
         }
 
         /// <summary>
-        /// Compares two <see cref="CieLab"/> objects for inequality
+        /// Compares two <see cref="RgbPrimariesChromaticityCoordinates"/> objects for inequality
         /// </summary>
         /// <param name="left">
-        /// The <see cref="CieLab"/> on the left side of the operand.
+        /// The <see cref="RgbPrimariesChromaticityCoordinates"/> on the left side of the operand.
         /// </param>
         /// <param name="right">
-        /// The <see cref="CieLab"/> on the right side of the operand.
+        /// The <see cref="RgbPrimariesChromaticityCoordinates"/> on the right side of the operand.
         /// </param>
         /// <returns>
         /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
@@ -76,9 +76,9 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (obj is RgbPrimariesChromaticityCoordinates)
+            if (obj is RgbPrimariesChromaticityCoordinates coordinates)
             {
-                return this.Equals((RgbPrimariesChromaticityCoordinates)obj);
+                return this.Equals(coordinates);
             }
 
             return false;

tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLabConversionTest.cs

@@ -34,11 +34,11 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces
         public void Convert_Lab_to_Xyz(float l, float a, float b, float x, float y, float z)
         {
             // Arrange
-            CieLab input = new CieLab(l, a, b, Illuminants.D65);
-            ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
+            var input = new CieLab(l, a, b, Illuminants.D65);
+            var converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
 
             // Act
-            CieXyz output = converter.ToCieXyz(input);
+            var output = converter.ToCieXyz(input);
 
             // Assert
             Assert.Equal(x, output.X, FloatRoundingComparer);
@@ -59,11 +59,11 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces
         public void Convert_Xyz_to_Lab(float x, float y, float z, float l, float a, float b)
         {
             // Arrange
-            CieXyz input = new CieXyz(x, y, z);
-            ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
+            var input = new CieXyz(x, y, z);
+            var converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
 
             // Act
-            CieLab output = converter.ToCieLab(input);
+            var output = converter.ToCieLab(input);
 
             // Assert
             Assert.Equal(l, output.L, FloatRoundingComparer);