Add luminance color profile type and cleanup

JimBobSquarePants · JimBobSquarePants · commit 1d27038551bc · 2025-05-09T23:00:07.000+10:00
diff --git a/src/ImageSharp/ColorProfiles/CieLab.cs b/src/ImageSharp/ColorProfiles/CieLab.cs
@@ -4,7 +4,6 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.Intrinsics;
 
 namespace SixLabors.ImageSharp.ColorProfiles;
 
@@ -36,7 +35,6 @@ public CieLab(float l, float a, float b)
     /// <param name="vector">The vector representing the l, a, b components.</param>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public CieLab(Vector3 vector)
-        : this()
     {
         this.L = vector.X;
         this.A = vector.Y;
diff --git a/src/ImageSharp/ColorProfiles/CieLch.cs b/src/ImageSharp/ColorProfiles/CieLch.cs
@@ -4,7 +4,6 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.Intrinsics;
 
 namespace SixLabors.ImageSharp.ColorProfiles;
 
@@ -43,6 +42,17 @@ public CieLch(Vector3 vector)
         this.H = vector.Z;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#pragma warning disable SA1313 // Parameter names should begin with lower-case letter
+    private CieLch(Vector3 vector, bool _)
+#pragma warning restore SA1313 // Parameter names should begin with lower-case letter
+    {
+        vector = Vector3.Clamp(vector, Min, Max);
+        this.L = vector.X;
+        this.C = vector.Y;
+        this.H = vector.Z;
+    }
+
     /// <summary>
     /// Gets the lightness dimension.
     /// <remarks>A value ranging between 0 (black), 100 (diffuse white) or higher (specular white).</remarks>
@@ -99,7 +109,7 @@ public static CieLch FromScaledVector4(Vector4 source)
         Vector3 v3 = source.AsVector3();
         v3 *= new Vector3(100, 400, 360);
         v3 -= new Vector3(0, 200, 0);
-        return new CieLch(v3);
+        return new CieLch(v3, true);
     }
 
     /// <inheritdoc/>
diff --git a/src/ImageSharp/ColorProfiles/CieLchuv.cs b/src/ImageSharp/ColorProfiles/CieLchuv.cs
@@ -4,7 +4,6 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.Intrinsics;
 
 namespace SixLabors.ImageSharp.ColorProfiles;
 
@@ -36,14 +35,23 @@ public CieLchuv(float l, float c, float h)
     /// <param name="vector">The vector representing the l, c, h components.</param>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public CieLchuv(Vector3 vector)
-        : this()
     {
         vector = Vector3.Clamp(vector, Min, Max);
         this.L = vector.X;
         this.C = vector.Y;
         this.H = vector.Z;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#pragma warning disable SA1313 // Parameter names should begin with lower-case letter
+    private CieLchuv(Vector3 vector, bool _)
+#pragma warning restore SA1313 // Parameter names should begin with lower-case letter
+    {
+        this.L = vector.X;
+        this.C = vector.Y;
+        this.H = vector.Z;
+    }
+
     /// <summary>
     /// Gets the lightness dimension.
     /// <remarks>A value ranging between 0 (black), 100 (diffuse white) or higher (specular white).</remarks>
@@ -98,7 +106,7 @@ public static CieLchuv FromScaledVector4(Vector4 source)
         Vector3 v3 = source.AsVector3();
         v3 *= new Vector3(100, 400, 360);
         v3 -= new Vector3(0, 200, 0);
-        return new CieLchuv(v3);
+        return new CieLchuv(v3, true);
     }
 
     /// <inheritdoc/>
diff --git a/src/ImageSharp/ColorProfiles/CieLuv.cs b/src/ImageSharp/ColorProfiles/CieLuv.cs
@@ -37,7 +37,6 @@ public CieLuv(float l, float u, float v)
     /// <param name="vector">The vector representing the l, u, v components.</param>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public CieLuv(Vector3 vector)
-        : this()
     {
         this.L = vector.X;
         this.U = vector.Y;
diff --git a/src/ImageSharp/ColorProfiles/CieXyy.cs b/src/ImageSharp/ColorProfiles/CieXyy.cs
@@ -4,7 +4,6 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.Intrinsics;
 
 namespace SixLabors.ImageSharp.ColorProfiles;
 
@@ -36,7 +35,6 @@ public CieXyy(float x, float y, float yl)
     /// <param name="vector">The vector representing the x, y, Y components.</param>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public CieXyy(Vector3 vector)
-        : this()
     {
         // Not clamping as documentation about this space only indicates "usual" ranges
         this.X = vector.X;
diff --git a/src/ImageSharp/ColorProfiles/CieXyz.cs b/src/ImageSharp/ColorProfiles/CieXyz.cs
@@ -34,7 +34,6 @@ public CieXyz(float x, float y, float z)
     /// </summary>
     /// <param name="vector">The vector representing the x, y, z components.</param>
     public CieXyz(Vector3 vector)
-        : this()
     {
         this.X = vector.X;
         this.Y = vector.Y;
diff --git a/src/ImageSharp/ColorProfiles/Cmyk.cs b/src/ImageSharp/ColorProfiles/Cmyk.cs
@@ -36,7 +36,18 @@ public Cmyk(float c, float m, float y, float k)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public Cmyk(Vector4 vector)
     {
-        vector = Numerics.Clamp(vector, Min, Max);
+        vector = Vector4.Clamp(vector, Min, Max);
+        this.C = vector.X;
+        this.M = vector.Y;
+        this.Y = vector.Z;
+        this.K = vector.W;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#pragma warning disable SA1313 // Parameter names should begin with lower-case letter
+    private Cmyk(Vector4 vector, bool _)
+#pragma warning restore SA1313 // Parameter names should begin with lower-case letter
+    {
         this.C = vector.X;
         this.M = vector.Y;
         this.Y = vector.Z;
@@ -99,7 +110,7 @@ public Vector4 ToScaledVector4()
 
     /// <inheritdoc/>
     public static Cmyk FromScaledVector4(Vector4 source)
-        => new(source);
+        => new(source, true);
 
     /// <inheritdoc/>
     public static void ToScaledVector4(ReadOnlySpan<Cmyk> source, Span<Vector4> destination)
diff --git a/src/ImageSharp/ColorProfiles/ColorConversionOptions.cs b/src/ImageSharp/ColorProfiles/ColorConversionOptions.cs
@@ -45,6 +45,11 @@ public class ColorConversionOptions
     /// </summary>
     public RgbWorkingSpace TargetRgbWorkingSpace { get; init; } = KnownRgbWorkingSpaces.SRgb;
 
+    /// <summary>
+    /// Gets the Y (luma) coefficients to use in conversions from RGB.
+    /// </summary>
+    public Vector3 YCoefficients { get; init; } = KnownYCoefficients.BT709;
+
     /// <summary>
     /// Gets the source ICC profile.
     /// </summary>
diff --git a/src/ImageSharp/ColorProfiles/Hsl.cs b/src/ImageSharp/ColorProfiles/Hsl.cs
@@ -4,7 +4,6 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.Intrinsics;
 
 namespace SixLabors.ImageSharp.ColorProfiles;
 
@@ -42,6 +41,16 @@ public Hsl(Vector3 vector)
         this.L = vector.Z;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#pragma warning disable SA1313 // Parameter names should begin with lower-case letter
+    private Hsl(Vector3 vector, bool _)
+#pragma warning restore SA1313 // Parameter names should begin with lower-case letter
+    {
+        this.H = vector.X;
+        this.S = vector.Y;
+        this.L = vector.Z;
+    }
+
     /// <summary>
     /// Gets the hue component.
     /// <remarks>A value ranging between 0 and 360.</remarks>
@@ -90,7 +99,7 @@ public Vector4 ToScaledVector4()
 
     /// <inheritdoc/>
     public static Hsl FromScaledVector4(Vector4 source)
-        => new(source.AsVector3() * 360F);
+        => new(source.AsVector3() * 360F, true);
 
     /// <inheritdoc/>
     public static void ToScaledVector4(ReadOnlySpan<Hsl> source, Span<Vector4> destination)
diff --git a/src/ImageSharp/ColorProfiles/Hsv.cs b/src/ImageSharp/ColorProfiles/Hsv.cs
@@ -4,7 +4,6 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.Intrinsics;
 
 namespace SixLabors.ImageSharp.ColorProfiles;
 
@@ -42,6 +41,16 @@ public Hsv(Vector3 vector)
         this.V = vector.Z;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#pragma warning disable SA1313 // Parameter names should begin with lower-case letter
+    private Hsv(Vector3 vector, bool _)
+#pragma warning restore SA1313 // Parameter names should begin with lower-case letter
+    {
+        this.H = vector.X;
+        this.S = vector.Y;
+        this.V = vector.Z;
+    }
+
     /// <summary>
     /// Gets the hue component.
     /// <remarks>A value ranging between 0 and 360.</remarks>
@@ -88,7 +97,7 @@ public Vector4 ToScaledVector4()
 
     /// <inheritdoc/>
     public static Hsv FromScaledVector4(Vector4 source)
-        => new(source.AsVector3() * 360F);
+        => new(source.AsVector3() * 360F, true);
 
     /// <inheritdoc/>
     public static void ToScaledVector4(ReadOnlySpan<Hsv> source, Span<Vector4> destination)
diff --git a/src/ImageSharp/ColorProfiles/HunterLab.cs b/src/ImageSharp/ColorProfiles/HunterLab.cs
@@ -4,7 +4,6 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.Intrinsics;
 
 namespace SixLabors.ImageSharp.ColorProfiles;
 
diff --git a/src/ImageSharp/ColorProfiles/IColorProfile.cs b/src/ImageSharp/ColorProfiles/IColorProfile.cs
@@ -30,7 +30,7 @@ public interface IColorProfile<TSelf> : IColorProfile, IEquatable<TSelf>
     /// The vector components are typically expanded in least to greatest significance order.
     /// </summary>
     /// <returns>The <see cref="Vector4"/>.</returns>
-    Vector4 ToScaledVector4();
+    public Vector4 ToScaledVector4();
 
 #pragma warning disable CA1000 // Do not declare static members on generic types
     /// <summary>
diff --git a/src/ImageSharp/ColorProfiles/KnownYCoefficients.cs b/src/ImageSharp/ColorProfiles/KnownYCoefficients.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using System.Numerics;
+
+namespace SixLabors.ImageSharp.ColorProfiles;
+
+/// <summary>
+/// Provides standard Y (luma) coefficient sets for weighted RGB conversions.
+/// </summary>
+public static class KnownYCoefficients
+{
+    /// <summary>
+    /// ITU-R BT.601 (SD video standard).
+    /// </summary>
+    public static readonly Vector3 BT601 = new(0.299F, 0.587F, 0.114F);
+
+    /// <summary>
+    /// ITU-R BT.709 (HD video, sRGB standard).
+    /// </summary>
+    public static readonly Vector3 BT709 = new(0.2126F, 0.7152F, 0.0722F);
+
+    /// <summary>
+    /// ITU-R BT.2020 (UHD/4K video standard).
+    /// </summary>
+    public static readonly Vector3 BT2020 = new(0.2627F, 0.6780F, 0.0593F);
+}
diff --git a/src/ImageSharp/ColorProfiles/Lms.cs b/src/ImageSharp/ColorProfiles/Lms.cs
@@ -4,7 +4,6 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.Intrinsics;
 
 namespace SixLabors.ImageSharp.ColorProfiles;
 
diff --git a/src/ImageSharp/ColorProfiles/Rgb.cs b/src/ImageSharp/ColorProfiles/Rgb.cs
@@ -4,7 +4,6 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.Intrinsics;
 using SixLabors.ImageSharp.ColorProfiles.WorkingSpaces;
 
 namespace SixLabors.ImageSharp.ColorProfiles;
diff --git a/src/ImageSharp/ColorProfiles/Y.cs b/src/ImageSharp/ColorProfiles/Y.cs
diff --git a/src/ImageSharp/ColorProfiles/YCbCr.cs b/src/ImageSharp/ColorProfiles/YCbCr.cs
diff --git a/tests/ImageSharp.Tests/ColorProfiles/ApproximateColorProfileComparer.cs b/tests/ImageSharp.Tests/ColorProfiles/ApproximateColorProfileComparer.cs
diff --git a/tests/ImageSharp.Tests/ColorProfiles/RbgAndYConversionTests.cs b/tests/ImageSharp.Tests/ColorProfiles/RbgAndYConversionTests.cs
diff --git a/tests/ImageSharp.Tests/ColorProfiles/YTests.cs b/tests/ImageSharp.Tests/ColorProfiles/YTests.cs

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ public CieLuv(float l, float u, float v)`
`37`	`37`	`/// <param name="vector">The vector representing the l, u, v components.</param>`
`38`	`38`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`39`	`39`	`public CieLuv(Vector3 vector)`
`40`		`- : this()`
`41`	`40`	`{`
`42`	`41`	`this.L = vector.X;`
`43`	`42`	`this.U = vector.Y;`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ public CieXyz(float x, float y, float z)`
`34`	`34`	`/// </summary>`
`35`	`35`	`/// <param name="vector">The vector representing the x, y, z components.</param>`
`36`	`36`	`public CieXyz(Vector3 vector)`
`37`		`- : this()`
`38`	`37`	`{`
`39`	`38`	`this.X = vector.X;`
`40`	`39`	`this.Y = vector.Y;`