Update individual pixel implementations

Author: JimBobSquarePants

src/ImageSharp/Color/Color.cs

@@ -98,10 +98,8 @@ public static Color FromPixel<TPixel>(TPixel pixel)
         {
             return new(pixel.ToScaledVector4());
         }
-        else
-        {
-            return new(pixel);
-        }
+
+        return new(pixel);
     }
 
     /// <summary>

src/ImageSharp/Common/Helpers/ColorNumerics.cs

@@ -41,6 +41,34 @@ public static int GetBT709Luminance(ref Vector4 vector, int luminanceLevels)
     public static byte Get8BitBT709Luminance(byte r, byte g, byte b)
         => (byte)((r * .2126F) + (g * .7152F) + (b * .0722F) + 0.5F);
 
+    /// <summary>
+    /// Gets the luminance from the rgb components using the formula
+    /// as specified by ITU-R Recommendation BT.709.
+    /// </summary>
+    /// <param name="r">The red component.</param>
+    /// <param name="g">The green component.</param>
+    /// <param name="b">The blue component.</param>
+    /// <returns>The <see cref="byte"/>.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static byte Get8BitBT709Luminance(ushort r, ushort g, ushort b)
+        => (byte)((From16BitTo8Bit(r) * .2126F) +
+                  (From16BitTo8Bit(g) * .7152F) +
+                  (From16BitTo8Bit(b) * .0722F) + 0.5F);
+
+    /// <summary>
+    /// Gets the luminance from the rgb components using the formula as
+    /// specified by ITU-R Recommendation BT.709.
+    /// </summary>
+    /// <param name="r">The red component.</param>
+    /// <param name="g">The green component.</param>
+    /// <param name="b">The blue component.</param>
+    /// <returns>The <see cref="ushort"/>.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static ushort Get16BitBT709Luminance(byte r, byte g, byte b)
+        => (ushort)((From8BitTo16Bit(r) * .2126F) +
+                    (From8BitTo16Bit(g) * .7152F) +
+                    (From8BitTo16Bit(b) * .0722F) + 0.5F);
+
     /// <summary>
     /// Gets the luminance from the rgb components using the formula as
     /// specified by ITU-R Recommendation BT.709.
@@ -72,8 +100,8 @@ public static ushort Get16BitBT709Luminance(float r, float g, float b)
     /// <param name="component">The 8 bit component value.</param>
     /// <returns>The <see cref="byte"/></returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static byte DownScaleFrom16BitTo8Bit(ushort component)
-    {
+    public static byte From16BitTo8Bit(ushort component) =>
+
         // To scale to 8 bits From a 16-bit value V the required value (from the PNG specification) is:
         //
         //    (V * 255) / 65535
@@ -102,8 +130,7 @@ public static byte DownScaleFrom16BitTo8Bit(ushort component)
         // An alternative arithmetic calculation which also gives no errors is:
         //
         //    (V * 255 + 32895) >> 16
-        return (byte)(((component * 255) + 32895) >> 16);
-    }
+        (byte)(((component * 255) + 32895) >> 16);
 
     /// <summary>
     /// Scales a value from an 8 bit <see cref="byte"/> to
@@ -112,7 +139,7 @@ public static byte DownScaleFrom16BitTo8Bit(ushort component)
     /// <param name="component">The 8 bit component value.</param>
     /// <returns>The <see cref="ushort"/></returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static ushort UpscaleFrom8BitTo16Bit(byte component)
+    public static ushort From8BitTo16Bit(byte component)
         => (ushort)(component * 257);
 
     /// <summary>

src/ImageSharp/PixelFormats/IPackedVector{TPacked}.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
 namespace SixLabors.ImageSharp.PixelFormats;

src/ImageSharp/PixelFormats/IPixel.cs

@@ -14,135 +14,151 @@ namespace SixLabors.ImageSharp.PixelFormats;
 public interface IPixel<TSelf> : IPixel, IEquatable<TSelf>
     where TSelf : unmanaged, IPixel<TSelf>
 {
-    /// <summary>
-    /// Gets the pixel type information.
-    /// </summary>
-    /// <returns>The <see cref="PixelTypeInfo"/>.</returns>
-#pragma warning disable CA1000
-    static abstract PixelTypeInfo GetPixelTypeInfo();
-#pragma warning restore CA1000
-
     /// <summary>
     /// Creates a <see cref="PixelOperations{TPixel}"/> instance for this pixel type.
     /// This method is not intended to be consumed directly. Use <see cref="PixelOperations{TPixel}.Instance"/> instead.
     /// </summary>
     /// <returns>The <see cref="PixelOperations{TPixel}"/> instance.</returns>
     PixelOperations<TSelf> CreatePixelOperations();
-}
 
-/// <summary>
-/// A base interface for all pixels, defining the mandatory operations to be implemented by a pixel type.
-/// </summary>
-public interface IPixel
-{
-    /// <summary>
-    /// Initializes the pixel instance from a generic ("scaled") <see cref="Vector4"/>.
-    /// </summary>
-    /// <param name="vector">The vector to load the pixel from.</param>
-    void FromScaledVector4(Vector4 vector);
+#pragma warning disable CA1000 // Do not declare static members on generic types
 
     /// <summary>
-    /// Expands the pixel into a generic ("scaled") <see cref="Vector4"/> representation
-    /// with values scaled and clamped between <value>0</value> and <value>1</value>.
-    /// The vector components are typically expanded in least to greatest significance order.
+    /// Gets the pixel type information.
     /// </summary>
-    /// <returns>The <see cref="Vector4"/>.</returns>
-    Vector4 ToScaledVector4();
+    /// <returns>The <see cref="PixelTypeInfo"/>.</returns>
+    static abstract PixelTypeInfo GetPixelTypeInfo();
 
     /// <summary>
-    /// Initializes the pixel instance from a <see cref="Vector4"/> which is specific to the current pixel type.
+    /// Initializes the pixel instance from a generic scaled <see cref="Vector4"/>.
     /// </summary>
-    /// <param name="vector">The vector to load the pixel from.</param>
-    void FromVector4(Vector4 vector);
+    /// <param name="source">The vector to load the pixel from.</param>
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static abstract TSelf FromScaledVector4(Vector4 source);
 
     /// <summary>
-    /// Expands the pixel into a <see cref="Vector4"/> which is specific to the current pixel type.
-    /// The vector components are typically expanded in least to greatest significance order.
+    /// Initializes the pixel instance from a <see cref="Vector4"/> which is specific to the current pixel type.
     /// </summary>
-    /// <returns>The <see cref="Vector4"/>.</returns>
-    Vector4 ToVector4();
+    /// <param name="source">The vector to load the pixel from.</param>
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static abstract TSelf FromVector4(Vector4 source);
 
     /// <summary>
     /// Initializes the pixel instance from an <see cref="Argb32"/> value.
     /// </summary>
     /// <param name="source">The <see cref="Argb32"/> value.</param>
-    void FromArgb32(Argb32 source);
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static virtual TSelf FromArgb32(Argb32 source) => TSelf.FromScaledVector4(source.ToScaledVector4());
 
     /// <summary>
     /// Initializes the pixel instance from an <see cref="Bgra5551"/> value.
     /// </summary>
     /// <param name="source">The <see cref="Bgra5551"/> value.</param>
-    void FromBgra5551(Bgra5551 source);
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static virtual TSelf FromBgra5551(Bgra5551 source) => TSelf.FromScaledVector4(source.ToScaledVector4());
 
     /// <summary>
     /// Initializes the pixel instance from an <see cref="Bgr24"/> value.
     /// </summary>
     /// <param name="source">The <see cref="Bgr24"/> value.</param>
-    void FromBgr24(Bgr24 source);
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static virtual TSelf FromBgr24(Bgr24 source) => TSelf.FromScaledVector4(source.ToScaledVector4());
 
     /// <summary>
     /// Initializes the pixel instance from an <see cref="Bgra32"/> value.
     /// </summary>
     /// <param name="source">The <see cref="Bgra32"/> value.</param>
-    void FromBgra32(Bgra32 source);
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static virtual TSelf FromBgra32(Bgra32 source) => TSelf.FromScaledVector4(source.ToScaledVector4());
 
     /// <summary>
     /// Initializes the pixel instance from an <see cref="Abgr32"/> value.
     /// </summary>
     /// <param name="source">The <see cref="Abgr32"/> value.</param>
-    void FromAbgr32(Abgr32 source);
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static virtual TSelf FromAbgr32(Abgr32 source) => TSelf.FromScaledVector4(source.ToScaledVector4());
 
     /// <summary>
     /// Initializes the pixel instance from an <see cref="L8"/> value.
     /// </summary>
     /// <param name="source">The <see cref="L8"/> value.</param>
-    void FromL8(L8 source);
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static virtual TSelf FromL8(L8 source) => TSelf.FromScaledVector4(source.ToScaledVector4());
 
     /// <summary>
     /// Initializes the pixel instance from an <see cref="L16"/> value.
     /// </summary>
     /// <param name="source">The <see cref="L16"/> value.</param>
-    void FromL16(L16 source);
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static virtual TSelf FromL16(L16 source) => TSelf.FromScaledVector4(source.ToScaledVector4());
 
     /// <summary>
     /// Initializes the pixel instance from an <see cref="La16"/> value.
     /// </summary>
     /// <param name="source">The <see cref="La16"/> value.</param>
-    void FromLa16(La16 source);
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static virtual TSelf FromLa16(La16 source) => TSelf.FromScaledVector4(source.ToScaledVector4());
 
     /// <summary>
     /// Initializes the pixel instance from an <see cref="La32"/> value.
     /// </summary>
     /// <param name="source">The <see cref="La32"/> value.</param>
-    void FromLa32(La32 source);
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static virtual TSelf FromLa32(La32 source) => TSelf.FromScaledVector4(source.ToScaledVector4());
 
     /// <summary>
     /// Initializes the pixel instance from an <see cref="Rgb24"/> value.
     /// </summary>
     /// <param name="source">The <see cref="Rgb24"/> value.</param>
-    void FromRgb24(Rgb24 source);
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static virtual TSelf FromRgb24(Rgb24 source) => TSelf.FromScaledVector4(source.ToScaledVector4());
 
     /// <summary>
     /// Initializes the pixel instance from an <see cref="Rgba32"/> value.
     /// </summary>
     /// <param name="source">The <see cref="Rgba32"/> value.</param>
-    void FromRgba32(Rgba32 source);
-
-    /// <summary>
-    /// Convert the pixel instance into <see cref="Rgba32"/> representation.
-    /// </summary>
-    /// <param name="dest">The reference to the destination <see cref="Rgba32"/> pixel</param>
-    void ToRgba32(ref Rgba32 dest);
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static virtual TSelf FromRgba32(Rgba32 source) => TSelf.FromScaledVector4(source.ToScaledVector4());
 
     /// <summary>
     /// Initializes the pixel instance from an <see cref="Rgb48"/> value.
     /// </summary>
     /// <param name="source">The <see cref="Rgb48"/> value.</param>
-    void FromRgb48(Rgb48 source);
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static virtual TSelf FromRgb48(Rgb48 source) => TSelf.FromScaledVector4(source.ToScaledVector4());
 
     /// <summary>
     /// Initializes the pixel instance from an <see cref="Rgba64"/> value.
     /// </summary>
     /// <param name="source">The <see cref="Rgba64"/> value.</param>
-    void FromRgba64(Rgba64 source);
+    /// <returns>The <typeparamref name="TSelf"/>.</returns>
+    static virtual TSelf FromRgba64(Rgba64 source) => TSelf.FromScaledVector4(source.ToScaledVector4());
+#pragma warning restore CA1000 // Do not declare static members on generic types
+}
+
+/// <summary>
+/// A base interface for all pixels, defining the mandatory operations to be implemented by a pixel type.
+/// </summary>
+public interface IPixel
+{
+    /// <summary>
+    /// Convert the pixel instance into <see cref="Rgba32"/> representation.
+    /// </summary>
+    /// <returns>The <see cref="Rgba32"/></returns>
+    virtual Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToVector4());
+
+    /// <summary>
+    /// Expands the pixel into a generic ("scaled") <see cref="Vector4"/> representation
+    /// with values scaled and clamped between <value>0</value> and <value>1</value>.
+    /// The vector components are typically expanded in least to greatest significance order.
+    /// </summary>
+    /// <returns>The <see cref="Vector4"/>.</returns>
+    Vector4 ToScaledVector4();
+
+    /// <summary>
+    /// Expands the pixel into a <see cref="Vector4"/> which is specific to the current pixel type.
+    /// The vector components are typically expanded in least to greatest significance order.
+    /// </summary>
+    /// <returns>The <see cref="Vector4"/>.</returns>
+    Vector4 ToVector4();
 }