Optimize and cleanup per review

Author: JimBobSquarePants

src/ImageSharp/ColorProfiles/CieLab.cs

@@ -12,12 +12,6 @@ namespace SixLabors.ImageSharp.ColorProfiles;
 /// </summary>
 public readonly struct CieLab : IProfileConnectingSpace<CieLab, CieXyz>
 {
-    /// <summary>
-    /// D50 standard illuminant.
-    /// Used when reference white is not specified explicitly.
-    /// </summary>
-    public static readonly CieXyz DefaultWhitePoint = KnownIlluminants.D50;
-
     /// <summary>
     /// Initializes a new instance of the <see cref="CieLab"/> struct.
     /// </summary>
@@ -50,19 +44,19 @@ public CieLab(Vector3 vector)
     /// Gets the lightness dimension.
     /// <remarks>A value usually ranging between 0 (black), 100 (diffuse white) or higher (specular white).</remarks>
     /// </summary>
-    public readonly float L { get; }
+    public float L { get; }
 
     /// <summary>
     /// Gets the a color component.
     /// <remarks>A value usually ranging from -100 to 100. Negative is green, positive magenta.</remarks>
     /// </summary>
-    public readonly float A { get; }
+    public float A { get; }
 
     /// <summary>
     /// Gets the b color component.
     /// <remarks>A value usually ranging from -100 to 100. Negative is blue, positive is yellow</remarks>
     /// </summary>
-    public readonly float B { get; }
+    public float B { get; }
 
     /// <summary>
     /// Compares two <see cref="CieLab"/> objects for equality.
@@ -97,10 +91,8 @@ public CieLab(Vector3 vector)
 
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool Equals(CieLab other) =>
-        this.L.Equals(other.L)
-        && this.A.Equals(other.A)
-        && this.B.Equals(other.B);
+    public bool Equals(CieLab other)
+        => new Vector3(this.L, this.A, this.B) == new Vector3(other.L, other.A, other.B);
 
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]

src/ImageSharp/ColorProfiles/CieLch.cs

@@ -44,19 +44,19 @@ public CieLch(Vector3 vector)
     /// Gets the lightness dimension.
     /// <remarks>A value ranging between 0 (black), 100 (diffuse white) or higher (specular white).</remarks>
     /// </summary>
-    public readonly float L { get; }
+    public float L { get; }
 
     /// <summary>
     /// Gets the a chroma component.
     /// <remarks>A value ranging from 0 to 200.</remarks>
     /// </summary>
-    public readonly float C { get; }
+    public float C { get; }
 
     /// <summary>
     /// Gets the h° hue component in degrees.
     /// <remarks>A value ranging from 0 to 360.</remarks>
     /// </summary>
-    public readonly float H { get; }
+    public float H { get; }
 
     /// <summary>
     /// Compares two <see cref="CieLch"/> objects for equality.
@@ -94,9 +94,7 @@ public override int GetHashCode()
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public bool Equals(CieLch other)
-        => this.L.Equals(other.L)
-        && this.C.Equals(other.C)
-        && this.H.Equals(other.H);
+        => new Vector3(this.L, this.C, this.H) == new Vector3(other.L, other.C, other.H);
 
     /// <inheritdoc/>
     public static CieLch FromProfileConnectingSpace(ColorConversionOptions options, in CieLab source)

src/ImageSharp/ColorProfiles/CieLchuv.cs

@@ -45,24 +45,19 @@ public CieLchuv(Vector3 vector)
     /// Gets the lightness dimension.
     /// <remarks>A value ranging between 0 (black), 100 (diffuse white) or higher (specular white).</remarks>
     /// </summary>
-    public readonly float L { get; }
+    public float L { get; }
 
     /// <summary>
     /// Gets the a chroma component.
     /// <remarks>A value ranging from 0 to 200.</remarks>
     /// </summary>
-    public readonly float C { get; }
+    public float C { get; }
 
     /// <summary>
     /// Gets the h° hue component in degrees.
     /// <remarks>A value ranging from 0 to 360.</remarks>
     /// </summary>
-    public readonly float H { get; }
-
-    /// <summary>
-    /// Gets the reference white point of this color
-    /// </summary>
-    public readonly CieXyz WhitePoint { get; }
+    public float H { get; }
 
     /// <summary>
     /// Compares two <see cref="CieLchuv"/> objects for equality.
@@ -151,7 +146,7 @@ public static ChromaticAdaptionWhitePointSource GetChromaticAdaptionWhitePointSo
 
     /// <inheritdoc/>
     public override int GetHashCode()
-        => HashCode.Combine(this.L, this.C, this.H, this.WhitePoint);
+        => HashCode.Combine(this.L, this.C, this.H);
 
     /// <inheritdoc/>
     public override string ToString()
@@ -164,10 +159,7 @@ public override bool Equals(object? obj)
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public bool Equals(CieLchuv other)
-        => this.L.Equals(other.L)
-        && this.C.Equals(other.C)
-        && this.H.Equals(other.H)
-        && this.WhitePoint.Equals(other.WhitePoint);
+        => new Vector3(this.L, this.C, this.H) == new Vector3(other.L, other.C, other.H);
 
     /// <summary>
     /// Computes the saturation of the color (chroma normalized by lightness)

src/ImageSharp/ColorProfiles/CieLuv.cs

@@ -46,19 +46,19 @@ public CieLuv(Vector3 vector)
     /// Gets the lightness dimension
     /// <remarks>A value usually ranging between 0 and 100.</remarks>
     /// </summary>
-    public readonly float L { get; }
+    public float L { get; }
 
     /// <summary>
     /// Gets the blue-yellow chromaticity coordinate of the given white point.
     /// <remarks>A value usually ranging between -100 and 100.</remarks>
     /// </summary>
-    public readonly float U { get; }
+    public float U { get; }
 
     /// <summary>
     /// Gets the red-green chromaticity coordinate of the given white point.
     /// <remarks>A value usually ranging between -100 and 100.</remarks>
     /// </summary>
-    public readonly float V { get; }
+    public float V { get; }
 
     /// <summary>
     /// Compares two <see cref="CieLuv"/> objects for equality.
@@ -205,9 +205,7 @@ public static ChromaticAdaptionWhitePointSource GetChromaticAdaptionWhitePointSo
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public bool Equals(CieLuv other)
-        => this.L.Equals(other.L)
-        && this.U.Equals(other.U)
-        && this.V.Equals(other.V);
+        => new Vector3(this.L, this.U, this.V) == new Vector3(other.L, other.U, other.V);
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static double ComputeU(in CieXyz source)

src/ImageSharp/ColorProfiles/CieXyChromaticityCoordinates.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using System.Numerics;
 using System.Runtime.CompilerServices;
 
 // ReSharper disable CompareOfFloatsByEqualityOperator
@@ -29,15 +30,15 @@ public CieXyChromaticityCoordinates(float x, float y)
     /// <remarks>
     /// Ranges usually from 0 to 1.
     /// </remarks>
-    public readonly float X { get; }
+    public float X { get; }
 
     /// <summary>
     /// Gets the chromaticity Y-coordinate
     /// </summary>
     /// <remarks>
     /// Ranges usually from 0 to 1.
     /// </remarks>
-    public readonly float Y { get; }
+    public float Y { get; }
 
     /// <summary>
     /// Compares two <see cref="CieXyChromaticityCoordinates"/> objects for equality.
@@ -79,5 +80,5 @@ public override bool Equals(object? obj)
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]
     public bool Equals(CieXyChromaticityCoordinates other)
-        => this.X.Equals(other.X) && this.Y.Equals(other.Y);
+        => new Vector2(this.X, this.Y) == new Vector2(other.X, other.Y);
 }

src/ImageSharp/ColorProfiles/CieXyy.cs

@@ -45,19 +45,19 @@ public CieXyy(Vector3 vector)
     /// Gets the X chrominance component.
     /// <remarks>A value usually ranging between 0 and 1.</remarks>
     /// </summary>
-    public readonly float X { get; }
+    public float X { get; }
 
     /// <summary>
     /// Gets the Y chrominance component.
     /// <remarks>A value usually ranging between 0 and 1.</remarks>
     /// </summary>
-    public readonly float Y { get; }
+    public float Y { get; }
 
     /// <summary>
     /// Gets the Y luminance component.
     /// <remarks>A value usually ranging between 0 and 1.</remarks>
     /// </summary>
-    public readonly float Yl { get; }
+    public float Yl { get; }
 
     /// <summary>
     /// Compares two <see cref="CieXyy"/> objects for equality.
@@ -150,7 +150,5 @@ public override string ToString()
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public bool Equals(CieXyy other)
-        => this.X.Equals(other.X)
-        && this.Y.Equals(other.Y)
-        && this.Yl.Equals(other.Yl);
+        => new Vector3(this.X, this.Y, this.Yl) == new Vector3(other.X, other.Y, other.Yl);
 }

src/ImageSharp/ColorProfiles/CieXyz.cs

@@ -3,7 +3,6 @@
 
 using System.Numerics;
 using System.Runtime.CompilerServices;
-using System.Runtime.Intrinsics;
 
 namespace SixLabors.ImageSharp.ColorProfiles;
 
@@ -99,9 +98,7 @@ public CieXyz(Vector3 vector)
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public bool Equals(CieXyz other)
-        => this.X.Equals(other.X)
-        && this.Y.Equals(other.Y)
-        && this.Z.Equals(other.Z);
+        => new Vector3(this.X, this.Y, this.Z) == new Vector3(other.X, other.Y, other.Z);
 
     /// <inheritdoc/>
     public static CieXyz FromProfileConnectingSpace(ColorConversionOptions options, in CieXyz source)

src/ImageSharp/ColorProfiles/Cmyk.cs

@@ -45,25 +45,25 @@ public Cmyk(Vector4 vector)
     /// Gets the cyan color component.
     /// <remarks>A value ranging between 0 and 1.</remarks>
     /// </summary>
-    public readonly float C { get; }
+    public float C { get; }
 
     /// <summary>
     /// Gets the magenta color component.
     /// <remarks>A value ranging between 0 and 1.</remarks>
     /// </summary>
-    public readonly float M { get; }
+    public float M { get; }
 
     /// <summary>
     /// Gets the yellow color component.
     /// <remarks>A value ranging between 0 and 1.</remarks>
     /// </summary>
-    public readonly float Y { get; }
+    public float Y { get; }
 
     /// <summary>
     /// Gets the keyline black color component.
     /// <remarks>A value ranging between 0 and 1.</remarks>
     /// </summary>
-    public readonly float K { get; }
+    public float K { get; }
 
     /// <summary>
     /// Compares two <see cref="Cmyk"/> objects for equality.
@@ -157,8 +157,5 @@ public override bool Equals(object? obj)
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public bool Equals(Cmyk other)
-        => this.C.Equals(other.C)
-        && this.M.Equals(other.M)
-        && this.Y.Equals(other.Y)
-        && this.K.Equals(other.K);
+        => new Vector4(this.C, this.M, this.Y, this.K) == new Vector4(other.C, other.M, other.Y, other.K);
 }

src/ImageSharp/ColorProfiles/Hsl.cs

@@ -43,19 +43,19 @@ public Hsl(Vector3 vector)
     /// Gets the hue component.
     /// <remarks>A value ranging between 0 and 360.</remarks>
     /// </summary>
-    public readonly float H { get; }
+    public float H { get; }
 
     /// <summary>
     /// Gets the saturation component.
     /// <remarks>A value ranging between 0 and 1.</remarks>
     /// </summary>
-    public readonly float S { get; }
+    public float S { get; }
 
     /// <summary>
     /// Gets the lightness component.
     /// <remarks>A value ranging between 0 and 1.</remarks>
     /// </summary>
-    public readonly float L { get; }
+    public float L { get; }
 
     /// <summary>
     /// Compares two <see cref="Hsl"/> objects for equality.
@@ -200,9 +200,7 @@ public static ChromaticAdaptionWhitePointSource GetChromaticAdaptionWhitePointSo
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public bool Equals(Hsl other)
-        => this.H.Equals(other.H)
-        && this.S.Equals(other.S)
-        && this.L.Equals(other.L);
+        => new Vector3(this.H, this.S, this.L) == new Vector3(other.H, other.S, other.L);
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static float GetColorComponent(float first, float second, float third)

src/ImageSharp/ColorProfiles/Hsv.cs

@@ -43,19 +43,19 @@ public Hsv(Vector3 vector)
     /// Gets the hue component.
     /// <remarks>A value ranging between 0 and 360.</remarks>
     /// </summary>
-    public readonly float H { get; }
+    public float H { get; }
 
     /// <summary>
     /// Gets the saturation component.
     /// <remarks>A value ranging between 0 and 1.</remarks>
     /// </summary>
-    public readonly float S { get; }
+    public float S { get; }
 
     /// <summary>
     /// Gets the value (brightness) component.
     /// <remarks>A value ranging between 0 and 1.</remarks>
     /// </summary>
-    public readonly float V { get; }
+    public float V { get; }
 
     /// <summary>
     /// Compares two <see cref="Hsv"/> objects for equality.
@@ -223,7 +223,5 @@ public static ChromaticAdaptionWhitePointSource GetChromaticAdaptionWhitePointSo
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public bool Equals(Hsv other)
-        => this.H.Equals(other.H)
-        && this.S.Equals(other.S)
-        && this.V.Equals(other.V);
+        => new Vector3(this.H, this.S, this.V) == new Vector3(other.H, other.S, other.V);
 }