From 4ef505bd7d60202c7c6e3a7cde295d0496c24206 Mon Sep 17 00:00:00 2001 From: Erik White <26148654+Erik-White@users.noreply.github.com> Date: Fri, 16 Oct 2026 22:11:36 +0200 Subject: [PATCH 1/3] Update to ImageSharp v4 --- .../ImageSharp.Textures.csproj | 2 +- .../PixelFormats/AlphaConversion.cs | 35 ++++++ src/ImageSharp.Textures/PixelFormats/Ayuv.cs | 73 +++++++++--- src/ImageSharp.Textures/PixelFormats/Fp32.cs | 73 +++++++++--- .../PixelFormats/Generated/Bgr32.cs | 79 +++++++++---- .../PixelFormats/Generated/Bgr555.cs | 79 +++++++++---- .../Generated/D32_FLOAT_S8X24_UINT.cs | 79 +++++++++---- .../PixelFormats/Generated/R11G11B10Float.cs | 82 ++++++++++---- .../PixelFormats/Generated/Rg32Float.cs | 79 +++++++++---- .../PixelFormats/Generated/Rg64.cs | 79 +++++++++---- .../PixelFormats/Generated/Rg64Float.cs | 79 +++++++++---- .../PixelFormats/Generated/Rgb32.cs | 79 +++++++++---- .../PixelFormats/Generated/Rgb48Float.cs | 83 ++++++++++---- .../PixelFormats/Generated/Rgb565.cs | 82 ++++++++++---- .../PixelFormats/Generated/Rgb96.cs | 81 ++++++++++---- .../PixelFormats/Generated/Rgb96Float.cs | 81 ++++++++++---- .../PixelFormats/Generated/Rgba128.cs | 83 ++++++++++---- .../PixelFormats/Generated/Rgba128Float.cs | 83 ++++++++++---- .../PixelFormats/Generated/Rgba4444.cs | 79 +++++++++---- .../PixelFormats/Generated/Rgba5551.cs | 79 +++++++++---- .../PixelFormats/Generated/Rgba64Float.cs | 79 +++++++++---- src/ImageSharp.Textures/PixelFormats/L32.cs | 105 ++++++++++++------ .../PixelFormats/R16Float.cs | 79 +++++++++---- src/ImageSharp.Textures/PixelFormats/Rg16.cs | 79 +++++++++---- src/ImageSharp.Textures/PixelFormats/Rg32.cs | 79 +++++++++---- src/ImageSharp.Textures/PixelFormats/Y410.cs | 73 +++++++++--- src/ImageSharp.Textures/PixelFormats/Y416.cs | 73 +++++++++--- .../TextureFormats/Decoding/Grgb32.cs | 4 +- .../TextureFormats/Decoding/Rgbg32.cs | 4 +- .../TextureFormats/Decoding/Y210.cs | 4 +- .../TextureFormats/Decoding/Y216.cs | 4 +- .../TextureFormats/Decoding/Yuy2.cs | 4 +- .../Formats/Ktx2/Ktx2HdrDecoderFlatTests.cs | 2 +- .../Formats/PixelFormat/PixelFormatTests.cs | 16 +-- .../TestUtilities/ImagingTestCaseUtility.cs | 4 +- 35 files changed, 1558 insertions(+), 520 deletions(-) create mode 100644 src/ImageSharp.Textures/PixelFormats/AlphaConversion.cs diff --git a/src/ImageSharp.Textures/ImageSharp.Textures.csproj b/src/ImageSharp.Textures/ImageSharp.Textures.csproj index 38c21b95..2bc3d91e 100644 --- a/src/ImageSharp.Textures/ImageSharp.Textures.csproj +++ b/src/ImageSharp.Textures/ImageSharp.Textures.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/ImageSharp.Textures/PixelFormats/AlphaConversion.cs b/src/ImageSharp.Textures/PixelFormats/AlphaConversion.cs new file mode 100644 index 00000000..001b7899 --- /dev/null +++ b/src/ImageSharp.Textures/PixelFormats/AlphaConversion.cs @@ -0,0 +1,35 @@ +// Copyright (c) Six Labors. +// Licensed under the Six Labors Split License. + +using System.Numerics; +using System.Runtime.CompilerServices; + +namespace SixLabors.ImageSharp.Textures.PixelFormats; + +internal static class AlphaConversion +{ + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Vector4 Premultiply(Vector4 vector) + { + float alpha = vector.W; + vector *= alpha; + vector.W = alpha; + + return vector; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Vector4 UnPremultiply(Vector4 vector) + { + float alpha = vector.W; + if (alpha == 0F) + { + return Vector4.Zero; + } + + vector /= alpha; + vector.W = alpha; + + return vector; + } +} diff --git a/src/ImageSharp.Textures/PixelFormats/Ayuv.cs b/src/ImageSharp.Textures/PixelFormats/Ayuv.cs index f31800b9..ba78cb20 100644 --- a/src/ImageSharp.Textures/PixelFormats/Ayuv.cs +++ b/src/ImageSharp.Textures/PixelFormats/Ayuv.cs @@ -60,59 +60,98 @@ public override readonly string ToString() /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(4, 8, 8, 8, 8), + PixelColorType.YCbCr | PixelColorType.Alpha, + PixelAlphaRepresentation.Unassociated); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToAssociatedScaledVector4() => AlphaConversion.Premultiply(this.ToScaledVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToAssociatedVector4() => AlphaConversion.Premultiply(this.ToVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Ayuv FromAssociatedScaledVector4(Vector4 source) => throw new NotImplementedException(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Ayuv FromUnassociatedScaledVector4(Vector4 source) => throw new NotImplementedException(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Ayuv FromAssociatedVector4(Vector4 source) => throw new NotImplementedException(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Ayuv FromUnassociatedVector4(Vector4 source) => throw new NotImplementedException(); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public override readonly int GetHashCode() => this.Yuv.GetHashCode(); /// - public void FromArgb32(Argb32 source) => throw new NotImplementedException(); + public static Ayuv FromArgb32(Argb32 source) => throw new NotImplementedException(); /// - public void FromBgr24(Bgr24 source) => throw new NotImplementedException(); + public static Ayuv FromBgr24(Bgr24 source) => throw new NotImplementedException(); /// - public void FromBgra32(Bgra32 source) => throw new NotImplementedException(); + public static Ayuv FromBgra32(Bgra32 source) => throw new NotImplementedException(); /// - public void FromAbgr32(Abgr32 source) => throw new NotImplementedException(); + public static Ayuv FromAbgr32(Abgr32 source) => throw new NotImplementedException(); /// - public void FromBgra5551(Bgra5551 source) => throw new NotImplementedException(); + public static Ayuv FromBgra5551(Bgra5551 source) => throw new NotImplementedException(); /// - public void FromL16(L16 source) => throw new NotImplementedException(); + public static Ayuv FromL16(L16 source) => throw new NotImplementedException(); /// - public void FromL8(L8 source) => throw new NotImplementedException(); + public static Ayuv FromL8(L8 source) => throw new NotImplementedException(); /// - public void FromLa16(La16 source) => throw new NotImplementedException(); + public static Ayuv FromLa16(La16 source) => throw new NotImplementedException(); /// - public void FromLa32(La32 source) => throw new NotImplementedException(); + public static Ayuv FromLa32(La32 source) => throw new NotImplementedException(); /// - public void FromRgb24(Rgb24 source) => throw new NotImplementedException(); + public static Ayuv FromRgb24(Rgb24 source) => throw new NotImplementedException(); /// - public void FromRgb48(Rgb48 source) => throw new NotImplementedException(); + public static Ayuv FromRgb48(Rgb48 source) => throw new NotImplementedException(); /// - public void FromRgba32(Rgba32 source) => throw new NotImplementedException(); + public static Ayuv FromRgba32(Rgba32 source) => throw new NotImplementedException(); /// - public void FromRgba64(Rgba64 source) => throw new NotImplementedException(); + public static Ayuv FromRgba64(Rgba64 source) => throw new NotImplementedException(); /// - public void FromScaledVector4(Vector4 vector) => throw new NotImplementedException(); + public static Ayuv FromScaledVector4(Vector4 source) => throw new NotImplementedException(); /// - public void FromVector4(Vector4 vector) => throw new NotImplementedException(); + public static Ayuv FromVector4(Vector4 source) => throw new NotImplementedException(); /// - public void ToRgba32(ref Rgba32 dest) => throw new NotImplementedException(); + public readonly Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] diff --git a/src/ImageSharp.Textures/PixelFormats/Fp32.cs b/src/ImageSharp.Textures/PixelFormats/Fp32.cs index 9ef171a4..ee42a8b6 100644 --- a/src/ImageSharp.Textures/PixelFormats/Fp32.cs +++ b/src/ImageSharp.Textures/PixelFormats/Fp32.cs @@ -54,11 +54,50 @@ public Fp32(float x) public static bool operator !=(Fp32 left, Fp32 right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(1, 32), + PixelColorType.Red, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Fp32 FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Fp32 FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Fp32 FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Fp32 FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Fp32 FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -66,7 +105,7 @@ public Fp32(float x) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) => this.PackedValue = Pack(new Vector(vector.X)); + public static Fp32 FromVector4(Vector4 source) => new() { PackedValue = Pack(new Vector(source.X)) }; /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -74,58 +113,58 @@ public Fp32(float x) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Fp32 FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Fp32 FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Fp32 FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Fp32 FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Fp32 FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Fp32 FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Fp32 FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Fp32 FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Fp32 FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Fp32 FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Fp32 FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Fp32 FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Fp32 FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// /// Expands the packed representation into a . diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Bgr32.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Bgr32.cs index bac1a29c..1fbb98fc 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Bgr32.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Bgr32.cs @@ -62,11 +62,50 @@ public Bgr32(float x, float y, float z) public static bool operator !=(Bgr32 left, Bgr32 right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(3, 8, 8, 8), + PixelColorType.RGB, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Bgr32 FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Bgr32 FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Bgr32 FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Bgr32 FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Bgr32 FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -74,10 +113,12 @@ public Bgr32(float x, float y, float z) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Bgr32 FromVector4(Vector4 source) { - var vector3 = new Vector3(vector.X, vector.Y, vector.Z); - this.PackedValue = Pack(ref vector3); + Bgr32 result = default; + var vector3 = new Vector3(source.X, source.Y, source.Z); + result.PackedValue = Pack(ref vector3); + return result; } /// @@ -90,59 +131,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr32 FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr32 FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr32 FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr32 FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr32 FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr32 FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr32 FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr32 FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr32 FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr32 FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr32 FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr32 FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr32 FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is Bgr32 other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Bgr555.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Bgr555.cs index 3eb78bc8..f18c2970 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Bgr555.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Bgr555.cs @@ -62,11 +62,50 @@ public Bgr555(float x, float y, float z) public static bool operator !=(Bgr555 left, Bgr555 right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(3, 5, 5, 5), + PixelColorType.RGB, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Bgr555 FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Bgr555 FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Bgr555 FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Bgr555 FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Bgr555 FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -74,10 +113,12 @@ public Bgr555(float x, float y, float z) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Bgr555 FromVector4(Vector4 source) { - var vector3 = new Vector3(vector.X, vector.Y, vector.Z); - this.PackedValue = Pack(ref vector3); + Bgr555 result = default; + var vector3 = new Vector3(source.X, source.Y, source.Z); + result.PackedValue = Pack(ref vector3); + return result; } /// @@ -90,59 +131,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr555 FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr555 FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr555 FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr555 FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr555 FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr555 FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr555 FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr555 FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr555 FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr555 FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr555 FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr555 FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Bgr555 FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is Bgr555 other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/D32_FLOAT_S8X24_UINT.cs b/src/ImageSharp.Textures/PixelFormats/Generated/D32_FLOAT_S8X24_UINT.cs index 8d9760ab..80e6031f 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/D32_FLOAT_S8X24_UINT.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/D32_FLOAT_S8X24_UINT.cs @@ -64,11 +64,50 @@ public D32_FLOAT_S8X24_UINT(float x, float y) public static bool operator !=(D32_FLOAT_S8X24_UINT left, D32_FLOAT_S8X24_UINT right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new PixelOperations(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(2, 32, 8), + PixelColorType.Other, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static D32_FLOAT_S8X24_UINT FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static D32_FLOAT_S8X24_UINT FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static D32_FLOAT_S8X24_UINT FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static D32_FLOAT_S8X24_UINT FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static D32_FLOAT_S8X24_UINT FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -76,10 +115,12 @@ public D32_FLOAT_S8X24_UINT(float x, float y) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static D32_FLOAT_S8X24_UINT FromVector4(Vector4 source) { - var vector2 = new Vector2(vector.X, vector.Y); - this.PackedValue = Pack(ref vector2); + D32_FLOAT_S8X24_UINT result = default; + var vector2 = new Vector2(source.X, source.Y); + result.PackedValue = Pack(ref vector2); + return result; } /// @@ -95,59 +136,59 @@ public Vector4 ToVector4() /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static D32_FLOAT_S8X24_UINT FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static D32_FLOAT_S8X24_UINT FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static D32_FLOAT_S8X24_UINT FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static D32_FLOAT_S8X24_UINT FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static D32_FLOAT_S8X24_UINT FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static D32_FLOAT_S8X24_UINT FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static D32_FLOAT_S8X24_UINT FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static D32_FLOAT_S8X24_UINT FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static D32_FLOAT_S8X24_UINT FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static D32_FLOAT_S8X24_UINT FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static D32_FLOAT_S8X24_UINT FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static D32_FLOAT_S8X24_UINT FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static D32_FLOAT_S8X24_UINT FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is D32_FLOAT_S8X24_UINT other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/R11G11B10Float.cs b/src/ImageSharp.Textures/PixelFormats/Generated/R11G11B10Float.cs index 0be3301f..0b40e4d9 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/R11G11B10Float.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/R11G11B10Float.cs @@ -63,11 +63,50 @@ public R11G11B10Float(float x, float y, float z) public static bool operator !=(R11G11B10Float left, R11G11B10Float right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new PixelOperations(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(3, 11, 11, 10), + PixelColorType.RGB, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static R11G11B10Float FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static R11G11B10Float FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static R11G11B10Float FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static R11G11B10Float FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static R11G11B10Float FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -75,10 +114,12 @@ public R11G11B10Float(float x, float y, float z) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static R11G11B10Float FromVector4(Vector4 source) { - var vector3 = new Vector3(vector.X, vector.Y, vector.Z); - this.PackedValue = Pack(ref vector3); + R11G11B10Float result = default; + var vector3 = new Vector3(source.X, source.Y, source.Z); + result.PackedValue = Pack(ref vector3); + return result; } /// @@ -94,62 +135,59 @@ public Vector4 ToVector4() /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R11G11B10Float FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R11G11B10Float FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R11G11B10Float FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R11G11B10Float FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R11G11B10Float FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R11G11B10Float FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R11G11B10Float FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R11G11B10Float FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R11G11B10Float FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R11G11B10Float FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R11G11B10Float FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) - { - dest.FromScaledVector4(this.ToScaledVector4()); - } + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R11G11B10Float FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R11G11B10Float FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is R11G11B10Float other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Rg32Float.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Rg32Float.cs index 36100cf1..5cfd2e2f 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Rg32Float.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Rg32Float.cs @@ -62,11 +62,50 @@ public Rg32Float(float x, float y) public static bool operator !=(Rg32Float left, Rg32Float right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(2, 16, 16), + PixelColorType.Red | PixelColorType.Green, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg32Float FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg32Float FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg32Float FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg32Float FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rg32Float FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -74,10 +113,12 @@ public Rg32Float(float x, float y) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rg32Float FromVector4(Vector4 source) { - var vector2 = new Vector2(vector.X, vector.Y); - this.PackedValue = Pack(ref vector2); + Rg32Float result = default; + var vector2 = new Vector2(source.X, source.Y); + result.PackedValue = Pack(ref vector2); + return result; } /// @@ -90,59 +131,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32Float FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32Float FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32Float FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32Float FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32Float FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32Float FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32Float FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32Float FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32Float FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32Float FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32Float FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32Float FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32Float FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is Rg32Float other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Rg64.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Rg64.cs index fd444284..e4a40abb 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Rg64.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Rg64.cs @@ -66,11 +66,50 @@ public Rg64(uint r, uint g) public static bool operator !=(Rg64 left, Rg64 right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(2, 32, 32), + PixelColorType.Red | PixelColorType.Green, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg64 FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg64 FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg64 FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg64 FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rg64 FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -78,10 +117,12 @@ public Rg64(uint r, uint g) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rg64 FromVector4(Vector4 source) { - this.R = (uint)(vector.X * 4294967295); - this.G = (uint)(vector.Y * 4294967295); + Rg64 result = default; + result.R = (uint)(source.X * 4294967295); + result.G = (uint)(source.Y * 4294967295); + return result; } /// @@ -94,59 +135,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64 FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64 FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64 FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64 FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64 FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64 FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64 FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64 FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64 FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64 FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64 FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64 FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64 FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is Rg64 other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Rg64Float.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Rg64Float.cs index 7eb39b56..8abaa498 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Rg64Float.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Rg64Float.cs @@ -66,11 +66,50 @@ public Rg64Float(float r, float g) public static bool operator !=(Rg64Float left, Rg64Float right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(2, 32, 32), + PixelColorType.Red | PixelColorType.Green, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg64Float FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg64Float FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg64Float FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg64Float FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rg64Float FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -78,10 +117,12 @@ public Rg64Float(float r, float g) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rg64Float FromVector4(Vector4 source) { - this.R = vector.X; - this.G = vector.Y; + Rg64Float result = default; + result.R = source.X; + result.G = source.Y; + return result; } /// @@ -94,59 +135,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64Float FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64Float FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64Float FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64Float FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64Float FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64Float FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64Float FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64Float FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64Float FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64Float FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64Float FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64Float FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg64Float FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is Rg64Float other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Rgb32.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Rgb32.cs index 4791df50..93e8721f 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Rgb32.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Rgb32.cs @@ -62,11 +62,50 @@ public Rgb32(float x, float y, float z) public static bool operator !=(Rgb32 left, Rgb32 right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(3, 8, 8, 8), + PixelColorType.RGB, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb32 FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb32 FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb32 FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb32 FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rgb32 FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -74,10 +113,12 @@ public Rgb32(float x, float y, float z) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rgb32 FromVector4(Vector4 source) { - var vector3 = new Vector3(vector.X, vector.Y, vector.Z); - this.PackedValue = Pack(ref vector3); + Rgb32 result = default; + var vector3 = new Vector3(source.X, source.Y, source.Z); + result.PackedValue = Pack(ref vector3); + return result; } /// @@ -90,59 +131,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb32 FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb32 FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb32 FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb32 FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb32 FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb32 FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb32 FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb32 FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb32 FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb32 FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb32 FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb32 FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb32 FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is Rgb32 other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Rgb48Float.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Rgb48Float.cs index 2f0907f3..9f3b2a6a 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Rgb48Float.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Rgb48Float.cs @@ -88,11 +88,50 @@ public Rgb48Float(float r, float g, float b) public static bool operator !=(Rgb48Float left, Rgb48Float right) => !left.Equals(right); /// - public readonly PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(3, 16, 16, 16), + PixelColorType.RGB, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb48Float FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb48Float FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb48Float FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb48Float FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rgb48Float FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -100,12 +139,14 @@ public Rgb48Float(float r, float g, float b) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rgb48Float FromVector4(Vector4 source) { - vector = Vector4.Clamp(vector, Vector4.Zero, Vector4.One); - this.R = (ushort)FloatHelper.PackFloatToFloat16(vector.X); - this.G = (ushort)FloatHelper.PackFloatToFloat16(vector.Y); - this.B = (ushort)FloatHelper.PackFloatToFloat16(vector.Z); + Rgb48Float result = default; + source = Vector4.Clamp(source, Vector4.Zero, Vector4.One); + result.R = (ushort)FloatHelper.PackFloatToFloat16(source.X); + result.G = (ushort)FloatHelper.PackFloatToFloat16(source.Y); + result.B = (ushort)FloatHelper.PackFloatToFloat16(source.Z); + return result; } /// @@ -118,59 +159,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb48Float FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb48Float FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb48Float FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb48Float FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb48Float FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb48Float FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb48Float FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb48Float FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb48Float FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb48Float FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb48Float FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public readonly void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public readonly Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb48Float FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb48Float FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override readonly bool Equals(object? obj) => obj is Rgb48Float other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Rgb565.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Rgb565.cs index 1eff83a7..9d976b73 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Rgb565.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Rgb565.cs @@ -62,11 +62,50 @@ public Rgb565(float x, float y, float z) public static bool operator !=(Rgb565 left, Rgb565 right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(3, 5, 6, 5), + PixelColorType.RGB, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb565 FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb565 FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb565 FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb565 FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rgb565 FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -74,10 +113,12 @@ public Rgb565(float x, float y, float z) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rgb565 FromVector4(Vector4 source) { - var vector3 = new Vector3(vector.X, vector.Y, vector.Z); - this.PackedValue = Pack(ref vector3); + Rgb565 result = default; + var vector3 = new Vector3(source.X, source.Y, source.Z); + result.PackedValue = Pack(ref vector3); + return result; } /// @@ -90,62 +131,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb565 FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb565 FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb565 FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb565 FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb565 FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb565 FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb565 FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb565 FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb565 FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb565 FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb565 FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) - { - dest.FromScaledVector4(this.ToScaledVector4()); - } + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb565 FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb565 FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is Rgb565 other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Rgb96.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Rgb96.cs index 13fac465..c3b2bd93 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Rgb96.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Rgb96.cs @@ -74,11 +74,50 @@ public Rgb96(uint r, uint g, uint b) public static bool operator !=(Rgb96 left, Rgb96 right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(3, 32, 32, 32), + PixelColorType.RGB, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb96 FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb96 FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb96 FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb96 FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rgb96 FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -86,11 +125,13 @@ public Rgb96(uint r, uint g, uint b) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rgb96 FromVector4(Vector4 source) { - this.R = (uint)(vector.X * 4294967295); - this.G = (uint)(vector.Y * 4294967295); - this.B = (uint)(vector.Z * 4294967295); + Rgb96 result = default; + result.R = (uint)(source.X * 4294967295); + result.G = (uint)(source.Y * 4294967295); + result.B = (uint)(source.Z * 4294967295); + return result; } /// @@ -103,59 +144,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96 FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96 FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96 FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96 FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96 FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96 FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96 FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96 FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96 FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96 FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96 FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96 FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96 FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is Rgb96 other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Rgb96Float.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Rgb96Float.cs index ab1cd9d5..5121fb40 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Rgb96Float.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Rgb96Float.cs @@ -74,11 +74,50 @@ public Rgb96Float(float r, float g, float b) public static bool operator !=(Rgb96Float left, Rgb96Float right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(3, 32, 32, 32), + PixelColorType.RGB, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb96Float FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb96Float FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb96Float FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgb96Float FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rgb96Float FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -86,11 +125,13 @@ public Rgb96Float(float r, float g, float b) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rgb96Float FromVector4(Vector4 source) { - this.R = vector.X; - this.G = vector.Y; - this.B = vector.Z; + Rgb96Float result = default; + result.R = source.X; + result.G = source.Y; + result.B = source.Z; + return result; } /// @@ -103,59 +144,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96Float FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96Float FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96Float FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96Float FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96Float FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96Float FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96Float FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96Float FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96Float FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96Float FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96Float FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96Float FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgb96Float FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is Rgb96Float other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Rgba128.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Rgba128.cs index c4728c3f..16bf4cea 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Rgba128.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Rgba128.cs @@ -82,11 +82,50 @@ public Rgba128(uint r, uint g, uint b, uint a) public static bool operator !=(Rgba128 left, Rgba128 right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(4, 32, 32, 32, 32), + PixelColorType.RGB | PixelColorType.Alpha, + PixelAlphaRepresentation.Unassociated); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => AlphaConversion.Premultiply(this.ToScaledVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => AlphaConversion.Premultiply(this.ToVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba128 FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(AlphaConversion.UnPremultiply(source)); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba128 FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba128 FromAssociatedVector4(Vector4 source) => FromVector4(AlphaConversion.UnPremultiply(source)); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba128 FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rgba128 FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -94,12 +133,14 @@ public Rgba128(uint r, uint g, uint b, uint a) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rgba128 FromVector4(Vector4 source) { - this.R = (uint)(vector.X * 4294967295); - this.G = (uint)(vector.Y * 4294967295); - this.B = (uint)(vector.Z * 4294967295); - this.A = (uint)(vector.W * 4294967295); + Rgba128 result = default; + result.R = (uint)(source.X * 4294967295); + result.G = (uint)(source.Y * 4294967295); + result.B = (uint)(source.Z * 4294967295); + result.A = (uint)(source.W * 4294967295); + return result; } /// @@ -112,59 +153,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128 FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128 FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128 FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128 FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128 FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128 FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128 FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128 FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128 FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128 FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128 FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128 FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128 FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is Rgba128 other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Rgba128Float.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Rgba128Float.cs index f21a8641..067ea8b7 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Rgba128Float.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Rgba128Float.cs @@ -82,11 +82,50 @@ public Rgba128Float(float r, float g, float b, float a) public static bool operator !=(Rgba128Float left, Rgba128Float right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(4, 32, 32, 32, 32), + PixelColorType.RGB | PixelColorType.Alpha, + PixelAlphaRepresentation.Unassociated); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => AlphaConversion.Premultiply(this.ToScaledVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => AlphaConversion.Premultiply(this.ToVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba128Float FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(AlphaConversion.UnPremultiply(source)); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba128Float FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba128Float FromAssociatedVector4(Vector4 source) => FromVector4(AlphaConversion.UnPremultiply(source)); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba128Float FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rgba128Float FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -94,12 +133,14 @@ public Rgba128Float(float r, float g, float b, float a) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rgba128Float FromVector4(Vector4 source) { - this.R = vector.X; - this.G = vector.Y; - this.B = vector.Z; - this.A = vector.W; + Rgba128Float result = default; + result.R = source.X; + result.G = source.Y; + result.B = source.Z; + result.A = source.W; + return result; } /// @@ -112,59 +153,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128Float FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128Float FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128Float FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128Float FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128Float FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128Float FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128Float FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128Float FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128Float FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128Float FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128Float FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128Float FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba128Float FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is Rgba128Float other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Rgba4444.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Rgba4444.cs index 64b7d7df..f496eaf8 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Rgba4444.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Rgba4444.cs @@ -63,11 +63,50 @@ public Rgba4444(float x, float y, float z, float w) public static bool operator !=(Rgba4444 left, Rgba4444 right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(4, 4, 4, 4, 4), + PixelColorType.RGB | PixelColorType.Alpha, + PixelAlphaRepresentation.Unassociated); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => AlphaConversion.Premultiply(this.ToScaledVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => AlphaConversion.Premultiply(this.ToVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba4444 FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(AlphaConversion.UnPremultiply(source)); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba4444 FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba4444 FromAssociatedVector4(Vector4 source) => FromVector4(AlphaConversion.UnPremultiply(source)); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba4444 FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rgba4444 FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -75,10 +114,12 @@ public Rgba4444(float x, float y, float z, float w) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rgba4444 FromVector4(Vector4 source) { - var vector4 = new Vector4(vector.X, vector.Y, vector.Z, vector.W); - this.PackedValue = Pack(ref vector4); + Rgba4444 result = default; + var vector4 = new Vector4(source.X, source.Y, source.Z, source.W); + result.PackedValue = Pack(ref vector4); + return result; } /// @@ -91,59 +132,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba4444 FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba4444 FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba4444 FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba4444 FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba4444 FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba4444 FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba4444 FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba4444 FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba4444 FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba4444 FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba4444 FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba4444 FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba4444 FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is Rgba4444 other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Rgba5551.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Rgba5551.cs index 7c99ac48..6de38dd8 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Rgba5551.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Rgba5551.cs @@ -63,11 +63,50 @@ public Rgba5551(float x, float y, float z, float w) public static bool operator !=(Rgba5551 left, Rgba5551 right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(4, 5, 5, 5, 1), + PixelColorType.RGB | PixelColorType.Alpha, + PixelAlphaRepresentation.Unassociated); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => AlphaConversion.Premultiply(this.ToScaledVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => AlphaConversion.Premultiply(this.ToVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba5551 FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(AlphaConversion.UnPremultiply(source)); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba5551 FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba5551 FromAssociatedVector4(Vector4 source) => FromVector4(AlphaConversion.UnPremultiply(source)); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba5551 FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rgba5551 FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -75,10 +114,12 @@ public Rgba5551(float x, float y, float z, float w) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rgba5551 FromVector4(Vector4 source) { - var vector4 = new Vector4(vector.X, vector.Y, vector.Z, vector.W); - this.PackedValue = Pack(ref vector4); + Rgba5551 result = default; + var vector4 = new Vector4(source.X, source.Y, source.Z, source.W); + result.PackedValue = Pack(ref vector4); + return result; } /// @@ -91,59 +132,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba5551 FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba5551 FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba5551 FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba5551 FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba5551 FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba5551 FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba5551 FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba5551 FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba5551 FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba5551 FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba5551 FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba5551 FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba5551 FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is Rgba5551 other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Generated/Rgba64Float.cs b/src/ImageSharp.Textures/PixelFormats/Generated/Rgba64Float.cs index 35aefdb8..8ace7340 100644 --- a/src/ImageSharp.Textures/PixelFormats/Generated/Rgba64Float.cs +++ b/src/ImageSharp.Textures/PixelFormats/Generated/Rgba64Float.cs @@ -63,11 +63,50 @@ public Rgba64Float(float x, float y, float z, float w) public static bool operator !=(Rgba64Float left, Rgba64Float right) => !left.Equals(right); /// - public readonly PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(4, 16, 16, 16, 16), + PixelColorType.RGB | PixelColorType.Alpha, + PixelAlphaRepresentation.Unassociated); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToAssociatedScaledVector4() => AlphaConversion.Premultiply(this.ToScaledVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToAssociatedVector4() => AlphaConversion.Premultiply(this.ToVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba64Float FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(AlphaConversion.UnPremultiply(source)); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba64Float FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba64Float FromAssociatedVector4(Vector4 source) => FromVector4(AlphaConversion.UnPremultiply(source)); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rgba64Float FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rgba64Float FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -75,10 +114,12 @@ public Rgba64Float(float x, float y, float z, float w) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rgba64Float FromVector4(Vector4 source) { - Vector4 vector4 = new(vector.X, vector.Y, vector.Z, vector.W); - this.PackedValue = Pack(ref vector4); + Rgba64Float result = default; + Vector4 vector4 = new(source.X, source.Y, source.Z, source.W); + result.PackedValue = Pack(ref vector4); + return result; } /// @@ -91,59 +132,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba64Float FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba64Float FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba64Float FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba64Float FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba64Float FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba64Float FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba64Float FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba64Float FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba64Float FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba64Float FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba64Float FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public readonly void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public readonly Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba64Float FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rgba64Float FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override readonly bool Equals(object? obj) => obj is Rgba64Float other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/L32.cs b/src/ImageSharp.Textures/PixelFormats/L32.cs index 97caeefe..026f8d64 100644 --- a/src/ImageSharp.Textures/PixelFormats/L32.cs +++ b/src/ImageSharp.Textures/PixelFormats/L32.cs @@ -50,7 +50,7 @@ public struct L32 : IPixel, IPackedVector /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.ConvertFromRgbaScaledVector4(vector); + public static L32 FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -58,7 +58,14 @@ public struct L32 : IPixel, IPackedVector /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) => this.ConvertFromRgbaScaledVector4(vector); + public static L32 FromVector4(Vector4 source) + { + source = Clamp(source, Vector4.Zero, Vector4.One) * Max; + return new L32(Get16BitBT709Luminance( + source.X, + source.Y, + source.Z)); + } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -70,84 +77,120 @@ public readonly Vector4 ToVector4() /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.PackedValue = Get16BitBT709Luminance( + public static L32 FromArgb32(Argb32 source) => new(Get16BitBT709Luminance( UpscaleFrom8BitTo16Bit(source.R), UpscaleFrom8BitTo16Bit(source.G), - UpscaleFrom8BitTo16Bit(source.B)); + UpscaleFrom8BitTo16Bit(source.B))); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.PackedValue = Get16BitBT709Luminance( + public static L32 FromBgr24(Bgr24 source) => new(Get16BitBT709Luminance( UpscaleFrom8BitTo16Bit(source.R), UpscaleFrom8BitTo16Bit(source.G), - UpscaleFrom8BitTo16Bit(source.B)); + UpscaleFrom8BitTo16Bit(source.B))); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.PackedValue = Get16BitBT709Luminance( + public static L32 FromBgra32(Bgra32 source) => new(Get16BitBT709Luminance( UpscaleFrom8BitTo16Bit(source.R), UpscaleFrom8BitTo16Bit(source.G), - UpscaleFrom8BitTo16Bit(source.B)); + UpscaleFrom8BitTo16Bit(source.B))); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => throw new System.NotImplementedException(); + public static L32 FromAbgr32(Abgr32 source) => throw new System.NotImplementedException(); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static L32 FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.PackedValue = UpscaleFrom8BitTo16Bit(source.PackedValue); + public static L32 FromL8(L8 source) => new(UpscaleFrom8BitTo16Bit(source.PackedValue)); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this = new L32(source.PackedValue); + public static L32 FromL16(L16 source) => new(source.PackedValue); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.PackedValue = UpscaleFrom8BitTo16Bit(source.L); + public static L32 FromLa16(La16 source) => new(UpscaleFrom8BitTo16Bit(source.L)); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.PackedValue = source.L; + public static L32 FromLa32(La32 source) => new(source.L); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.PackedValue = Get16BitBT709Luminance( + public static L32 FromRgb24(Rgb24 source) => new(Get16BitBT709Luminance( UpscaleFrom8BitTo16Bit(source.R), UpscaleFrom8BitTo16Bit(source.G), - UpscaleFrom8BitTo16Bit(source.B)); + UpscaleFrom8BitTo16Bit(source.B))); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.PackedValue = Get16BitBT709Luminance( + public static L32 FromRgba32(Rgba32 source) => new(Get16BitBT709Luminance( UpscaleFrom8BitTo16Bit(source.R), UpscaleFrom8BitTo16Bit(source.G), - UpscaleFrom8BitTo16Bit(source.B)); + UpscaleFrom8BitTo16Bit(source.B))); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) + public readonly Rgba32 ToRgba32() { byte rgb = DownScaleFrom32BitTo8Bit(this.PackedValue); - dest.R = rgb; - dest.G = rgb; - dest.B = rgb; - dest.A = byte.MaxValue; + return new Rgba32(rgb, rgb, rgb, byte.MaxValue); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.PackedValue = Get16BitBT709Luminance(source.R, source.G, source.B); + public static L32 FromRgb48(Rgb48 source) => new(Get16BitBT709Luminance(source.R, source.G, source.B)); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.PackedValue = Get16BitBT709Luminance(source.R, source.G, source.B); + public static L32 FromRgba64(Rgba64 source) => new(Get16BitBT709Luminance(source.R, source.G, source.B)); + + /// + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(1, 32), + PixelColorType.Luminance, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static L32 FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static L32 FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); /// - public PixelOperations CreatePixelOperations() => new(); + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static L32 FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static L32 FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// public override readonly bool Equals(object? obj) => obj is L16 other && this.Equals(other); @@ -163,16 +206,6 @@ public void ToRgba32(ref Rgba32 dest) [MethodImpl(MethodImplOptions.AggressiveInlining)] public override readonly int GetHashCode() => this.PackedValue.GetHashCode(); - [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal void ConvertFromRgbaScaledVector4(Vector4 vector) - { - vector = Clamp(vector, Vector4.Zero, Vector4.One) * Max; - this.PackedValue = Get16BitBT709Luminance( - vector.X, - vector.Y, - vector.Z); - } - /// /// Gets the luminance from the rgb components using the formula as /// specified by ITU-R Recommendation BT.709. diff --git a/src/ImageSharp.Textures/PixelFormats/R16Float.cs b/src/ImageSharp.Textures/PixelFormats/R16Float.cs index d951de29..89052805 100644 --- a/src/ImageSharp.Textures/PixelFormats/R16Float.cs +++ b/src/ImageSharp.Textures/PixelFormats/R16Float.cs @@ -44,11 +44,50 @@ public struct R16Float : IPixel, IPackedVector public static bool operator !=(R16Float left, R16Float right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(1, 16), + PixelColorType.Red, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static R16Float FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static R16Float FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static R16Float FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static R16Float FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static R16Float FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -56,10 +95,12 @@ public struct R16Float : IPixel, IPackedVector /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static R16Float FromVector4(Vector4 source) { - var vector2 = new Vector2(vector.X, vector.Y); - this.PackedValue = Pack(ref vector2); + R16Float result = default; + var vector2 = new Vector2(source.X, source.Y); + result.PackedValue = Pack(ref vector2); + return result; } /// @@ -72,59 +113,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R16Float FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R16Float FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R16Float FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R16Float FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R16Float FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R16Float FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R16Float FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R16Float FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R16Float FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R16Float FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R16Float FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R16Float FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static R16Float FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// public override bool Equals(object? obj) => obj is R16Float other && this.Equals(other); diff --git a/src/ImageSharp.Textures/PixelFormats/Rg16.cs b/src/ImageSharp.Textures/PixelFormats/Rg16.cs index 70a4ef6f..73b054e0 100644 --- a/src/ImageSharp.Textures/PixelFormats/Rg16.cs +++ b/src/ImageSharp.Textures/PixelFormats/Rg16.cs @@ -60,11 +60,50 @@ public Rg16(float x, float y) public static bool operator !=(Rg16 left, Rg16 right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(2, 8, 8), + PixelColorType.Red | PixelColorType.Green, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg16 FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg16 FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg16 FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg16 FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rg16 FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -72,10 +111,12 @@ public Rg16(float x, float y) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rg16 FromVector4(Vector4 source) { - var vector2 = new Vector2(vector.X, vector.Y); - this.PackedValue = (ushort)Pack(vector2); + Rg16 result = default; + var vector2 = new Vector2(source.X, source.Y); + result.PackedValue = (ushort)Pack(vector2); + return result; } /// @@ -84,59 +125,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg16 FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg16 FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg16 FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg16 FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg16 FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg16 FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg16 FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg16 FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg16 FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg16 FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg16 FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg16 FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg16 FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// /// Expands the packed representation into a . diff --git a/src/ImageSharp.Textures/PixelFormats/Rg32.cs b/src/ImageSharp.Textures/PixelFormats/Rg32.cs index d87dc6b2..096dfada 100644 --- a/src/ImageSharp.Textures/PixelFormats/Rg32.cs +++ b/src/ImageSharp.Textures/PixelFormats/Rg32.cs @@ -60,11 +60,50 @@ public Rg32(float x, float y) public static bool operator !=(Rg32 left, Rg32 right) => !left.Equals(right); /// - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(2, 16, 16), + PixelColorType.Red | PixelColorType.Green, + PixelAlphaRepresentation.None); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToAssociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg32 FromAssociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg32 FromUnassociatedScaledVector4(Vector4 source) => FromScaledVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg32 FromAssociatedVector4(Vector4 source) => FromVector4(source); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Rg32 FromUnassociatedVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromScaledVector4(Vector4 vector) => this.FromVector4(vector); + public static Rg32 FromScaledVector4(Vector4 source) => FromVector4(source); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -72,10 +111,12 @@ public Rg32(float x, float y) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromVector4(Vector4 vector) + public static Rg32 FromVector4(Vector4 source) { - var vector2 = new Vector2(vector.X, vector.Y); - this.PackedValue = (ushort)Pack(vector2); + Rg32 result = default; + var vector2 = new Vector2(source.X, source.Y); + result.PackedValue = (ushort)Pack(vector2); + return result; } /// @@ -84,59 +125,59 @@ public void FromVector4(Vector4 vector) /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromArgb32(Argb32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32 FromArgb32(Argb32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgr24(Bgr24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32 FromBgr24(Bgr24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra32(Bgra32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32 FromBgra32(Bgra32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromAbgr32(Abgr32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32 FromAbgr32(Abgr32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromBgra5551(Bgra5551 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32 FromBgra5551(Bgra5551 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL8(L8 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32 FromL8(L8 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromL16(L16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32 FromL16(L16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa16(La16 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32 FromLa16(La16 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromLa32(La32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32 FromLa32(La32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb24(Rgb24 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32 FromRgb24(Rgb24 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba32(Rgba32 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32 FromRgba32(Rgba32 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void ToRgba32(ref Rgba32 dest) => dest.FromScaledVector4(this.ToScaledVector4()); + public Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgb48(Rgb48 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32 FromRgb48(Rgb48 source) => FromScaledVector4(source.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void FromRgba64(Rgba64 source) => this.FromScaledVector4(source.ToScaledVector4()); + public static Rg32 FromRgba64(Rgba64 source) => FromScaledVector4(source.ToScaledVector4()); /// /// Expands the packed representation into a . diff --git a/src/ImageSharp.Textures/PixelFormats/Y410.cs b/src/ImageSharp.Textures/PixelFormats/Y410.cs index 701a1456..a4912382 100644 --- a/src/ImageSharp.Textures/PixelFormats/Y410.cs +++ b/src/ImageSharp.Textures/PixelFormats/Y410.cs @@ -66,59 +66,98 @@ public override readonly string ToString() /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(4, 10, 10, 10, 2), + PixelColorType.YCbCr | PixelColorType.Alpha, + PixelAlphaRepresentation.Unassociated); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToAssociatedScaledVector4() => AlphaConversion.Premultiply(this.ToScaledVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToAssociatedVector4() => AlphaConversion.Premultiply(this.ToVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Y410 FromAssociatedScaledVector4(Vector4 source) => throw new NotImplementedException(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Y410 FromUnassociatedScaledVector4(Vector4 source) => throw new NotImplementedException(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Y410 FromAssociatedVector4(Vector4 source) => throw new NotImplementedException(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Y410 FromUnassociatedVector4(Vector4 source) => throw new NotImplementedException(); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public override readonly int GetHashCode() => this.Yuv.GetHashCode(); /// - public void FromArgb32(Argb32 source) => throw new NotImplementedException(); + public static Y410 FromArgb32(Argb32 source) => throw new NotImplementedException(); /// - public void FromBgr24(Bgr24 source) => throw new NotImplementedException(); + public static Y410 FromBgr24(Bgr24 source) => throw new NotImplementedException(); /// - public void FromBgra32(Bgra32 source) => throw new NotImplementedException(); + public static Y410 FromBgra32(Bgra32 source) => throw new NotImplementedException(); /// - public void FromAbgr32(Abgr32 source) => throw new NotImplementedException(); + public static Y410 FromAbgr32(Abgr32 source) => throw new NotImplementedException(); /// - public void FromBgra5551(Bgra5551 source) => throw new NotImplementedException(); + public static Y410 FromBgra5551(Bgra5551 source) => throw new NotImplementedException(); /// - public void FromL16(L16 source) => throw new NotImplementedException(); + public static Y410 FromL16(L16 source) => throw new NotImplementedException(); /// - public void FromL8(L8 source) => throw new NotImplementedException(); + public static Y410 FromL8(L8 source) => throw new NotImplementedException(); /// - public void FromLa16(La16 source) => throw new NotImplementedException(); + public static Y410 FromLa16(La16 source) => throw new NotImplementedException(); /// - public void FromLa32(La32 source) => throw new NotImplementedException(); + public static Y410 FromLa32(La32 source) => throw new NotImplementedException(); /// - public void FromRgb24(Rgb24 source) => throw new NotImplementedException(); + public static Y410 FromRgb24(Rgb24 source) => throw new NotImplementedException(); /// - public void FromRgb48(Rgb48 source) => throw new NotImplementedException(); + public static Y410 FromRgb48(Rgb48 source) => throw new NotImplementedException(); /// - public void FromRgba32(Rgba32 source) => throw new NotImplementedException(); + public static Y410 FromRgba32(Rgba32 source) => throw new NotImplementedException(); /// - public void FromRgba64(Rgba64 source) => throw new NotImplementedException(); + public static Y410 FromRgba64(Rgba64 source) => throw new NotImplementedException(); /// - public void FromScaledVector4(Vector4 vector) => throw new NotImplementedException(); + public static Y410 FromScaledVector4(Vector4 source) => throw new NotImplementedException(); /// - public void FromVector4(Vector4 vector) => throw new NotImplementedException(); + public static Y410 FromVector4(Vector4 source) => throw new NotImplementedException(); /// - public void ToRgba32(ref Rgba32 dest) => throw new NotImplementedException(); + public readonly Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] diff --git a/src/ImageSharp.Textures/PixelFormats/Y416.cs b/src/ImageSharp.Textures/PixelFormats/Y416.cs index 33887f04..6550504c 100644 --- a/src/ImageSharp.Textures/PixelFormats/Y416.cs +++ b/src/ImageSharp.Textures/PixelFormats/Y416.cs @@ -66,59 +66,98 @@ public override readonly string ToString() /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public PixelOperations CreatePixelOperations() => new(); + public static PixelOperations CreatePixelOperations() => new(); + + /// + public static PixelTypeInfo GetPixelTypeInfo() + => PixelTypeInfo.Create( + PixelComponentInfo.Create(4, 16, 16, 16, 16), + PixelColorType.YCbCr | PixelColorType.Alpha, + PixelAlphaRepresentation.Unassociated); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToAssociatedScaledVector4() => AlphaConversion.Premultiply(this.ToScaledVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToUnassociatedScaledVector4() => this.ToScaledVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToAssociatedVector4() => AlphaConversion.Premultiply(this.ToVector4()); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public readonly Vector4 ToUnassociatedVector4() => this.ToVector4(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Y416 FromAssociatedScaledVector4(Vector4 source) => throw new NotImplementedException(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Y416 FromUnassociatedScaledVector4(Vector4 source) => throw new NotImplementedException(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Y416 FromAssociatedVector4(Vector4 source) => throw new NotImplementedException(); + + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Y416 FromUnassociatedVector4(Vector4 source) => throw new NotImplementedException(); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public override readonly int GetHashCode() => this.Yuv.GetHashCode(); /// - public void FromArgb32(Argb32 source) => throw new NotImplementedException(); + public static Y416 FromArgb32(Argb32 source) => throw new NotImplementedException(); /// - public void FromBgr24(Bgr24 source) => throw new NotImplementedException(); + public static Y416 FromBgr24(Bgr24 source) => throw new NotImplementedException(); /// - public void FromBgra32(Bgra32 source) => throw new NotImplementedException(); + public static Y416 FromBgra32(Bgra32 source) => throw new NotImplementedException(); /// - public void FromAbgr32(Abgr32 source) => throw new NotImplementedException(); + public static Y416 FromAbgr32(Abgr32 source) => throw new NotImplementedException(); /// - public void FromBgra5551(Bgra5551 source) => throw new NotImplementedException(); + public static Y416 FromBgra5551(Bgra5551 source) => throw new NotImplementedException(); /// - public void FromL16(L16 source) => throw new NotImplementedException(); + public static Y416 FromL16(L16 source) => throw new NotImplementedException(); /// - public void FromL8(L8 source) => throw new NotImplementedException(); + public static Y416 FromL8(L8 source) => throw new NotImplementedException(); /// - public void FromLa16(La16 source) => throw new NotImplementedException(); + public static Y416 FromLa16(La16 source) => throw new NotImplementedException(); /// - public void FromLa32(La32 source) => throw new NotImplementedException(); + public static Y416 FromLa32(La32 source) => throw new NotImplementedException(); /// - public void FromRgb24(Rgb24 source) => throw new NotImplementedException(); + public static Y416 FromRgb24(Rgb24 source) => throw new NotImplementedException(); /// - public void FromRgb48(Rgb48 source) => throw new NotImplementedException(); + public static Y416 FromRgb48(Rgb48 source) => throw new NotImplementedException(); /// - public void FromRgba32(Rgba32 source) => throw new NotImplementedException(); + public static Y416 FromRgba32(Rgba32 source) => throw new NotImplementedException(); /// - public void FromRgba64(Rgba64 source) => throw new NotImplementedException(); + public static Y416 FromRgba64(Rgba64 source) => throw new NotImplementedException(); /// - public void FromScaledVector4(Vector4 vector) => throw new NotImplementedException(); + public static Y416 FromScaledVector4(Vector4 source) => throw new NotImplementedException(); /// - public void FromVector4(Vector4 vector) => throw new NotImplementedException(); + public static Y416 FromVector4(Vector4 source) => throw new NotImplementedException(); /// - public void ToRgba32(ref Rgba32 dest) => throw new NotImplementedException(); + public readonly Rgba32 ToRgba32() => Rgba32.FromScaledVector4(this.ToScaledVector4()); /// [MethodImpl(MethodImplOptions.AggressiveInlining)] diff --git a/src/ImageSharp.Textures/TextureFormats/Decoding/Grgb32.cs b/src/ImageSharp.Textures/TextureFormats/Decoding/Grgb32.cs index bf02c556..933c69cf 100644 --- a/src/ImageSharp.Textures/TextureFormats/Decoding/Grgb32.cs +++ b/src/ImageSharp.Textures/TextureFormats/Decoding/Grgb32.cs @@ -49,14 +49,14 @@ public byte[] Decompress(byte[] blockData, int width, int height) byte g1 = blockData[i + 2]; byte b = blockData[i + 3]; - pixel.FromRgb24(new ImageSharp.PixelFormats.Rgb24(r, g0, b)); + pixel = ImageSharp.PixelFormats.Rgb24.FromRgb24(new ImageSharp.PixelFormats.Rgb24(r, g0, b)); rgb24Span[pixelIdx++] = pixel; if (pixelIdx >= totalPixels) { break; } - pixel.FromRgb24(new ImageSharp.PixelFormats.Rgb24(r, g1, b)); + pixel = ImageSharp.PixelFormats.Rgb24.FromRgb24(new ImageSharp.PixelFormats.Rgb24(r, g1, b)); rgb24Span[pixelIdx++] = pixel; } diff --git a/src/ImageSharp.Textures/TextureFormats/Decoding/Rgbg32.cs b/src/ImageSharp.Textures/TextureFormats/Decoding/Rgbg32.cs index 71612c4e..1abb1e6a 100644 --- a/src/ImageSharp.Textures/TextureFormats/Decoding/Rgbg32.cs +++ b/src/ImageSharp.Textures/TextureFormats/Decoding/Rgbg32.cs @@ -49,14 +49,14 @@ public byte[] Decompress(byte[] blockData, int width, int height) byte b = blockData[i + 2]; byte g1 = blockData[i + 3]; - pixel.FromRgb24(new ImageSharp.PixelFormats.Rgb24(r, g0, b)); + pixel = ImageSharp.PixelFormats.Rgb24.FromRgb24(new ImageSharp.PixelFormats.Rgb24(r, g0, b)); rgb24Span[pixelIdx++] = pixel; if (pixelIdx >= totalPixels) { break; } - pixel.FromRgb24(new ImageSharp.PixelFormats.Rgb24(r, g1, b)); + pixel = ImageSharp.PixelFormats.Rgb24.FromRgb24(new ImageSharp.PixelFormats.Rgb24(r, g1, b)); rgb24Span[pixelIdx++] = pixel; } diff --git a/src/ImageSharp.Textures/TextureFormats/Decoding/Y210.cs b/src/ImageSharp.Textures/TextureFormats/Decoding/Y210.cs index e924fc33..0f8540a0 100644 --- a/src/ImageSharp.Textures/TextureFormats/Decoding/Y210.cs +++ b/src/ImageSharp.Textures/TextureFormats/Decoding/Y210.cs @@ -58,7 +58,7 @@ public byte[] Decompress(byte[] blockData, int width, int height) v = (v >> 6) - 512; Vector4 rgbVec = ColorSpaceConversion.YuvToRgba10Bit(y0, u, v); - pixel.FromVector4(rgbVec); + pixel = ImageSharp.PixelFormats.Rgb24.FromVector4(rgbVec); rgb24Span[pixelIdx++] = pixel; if (pixelIdx >= totalPixels) { @@ -66,7 +66,7 @@ public byte[] Decompress(byte[] blockData, int width, int height) } rgbVec = ColorSpaceConversion.YuvToRgba10Bit(y1, u, v); - pixel.FromVector4(rgbVec); + pixel = ImageSharp.PixelFormats.Rgb24.FromVector4(rgbVec); rgb24Span[pixelIdx++] = pixel; } diff --git a/src/ImageSharp.Textures/TextureFormats/Decoding/Y216.cs b/src/ImageSharp.Textures/TextureFormats/Decoding/Y216.cs index 88e09459..bdeb3aa6 100644 --- a/src/ImageSharp.Textures/TextureFormats/Decoding/Y216.cs +++ b/src/ImageSharp.Textures/TextureFormats/Decoding/Y216.cs @@ -57,7 +57,7 @@ public byte[] Decompress(byte[] blockData, int width, int height) v -= 32768; Vector4 rgbVec = ColorSpaceConversion.YuvToRgba16Bit(y0, u, v); - pixel.FromVector4(rgbVec); + pixel = ImageSharp.PixelFormats.Rgb24.FromVector4(rgbVec); rgb24Span[pixelIdx++] = pixel; if (pixelIdx >= totalPixels) { @@ -65,7 +65,7 @@ public byte[] Decompress(byte[] blockData, int width, int height) } rgbVec = ColorSpaceConversion.YuvToRgba16Bit(y1, u, v); - pixel.FromVector4(rgbVec); + pixel = ImageSharp.PixelFormats.Rgb24.FromVector4(rgbVec); rgb24Span[pixelIdx++] = pixel; } diff --git a/src/ImageSharp.Textures/TextureFormats/Decoding/Yuy2.cs b/src/ImageSharp.Textures/TextureFormats/Decoding/Yuy2.cs index 275e52e1..98d1ec1c 100644 --- a/src/ImageSharp.Textures/TextureFormats/Decoding/Yuy2.cs +++ b/src/ImageSharp.Textures/TextureFormats/Decoding/Yuy2.cs @@ -57,7 +57,7 @@ public byte[] Decompress(byte[] blockData, int width, int height) v -= 128; Vector4 rgbVec = ColorSpaceConversion.YuvToRgba8Bit(y0, u, v); - pixel.FromVector4(rgbVec); + pixel = ImageSharp.PixelFormats.Rgb24.FromVector4(rgbVec); rgb24Span[pixelIdx++] = pixel; if (pixelIdx >= totalPixels) { @@ -65,7 +65,7 @@ public byte[] Decompress(byte[] blockData, int width, int height) } rgbVec = ColorSpaceConversion.YuvToRgba8Bit(y1, u, v); - pixel.FromVector4(rgbVec); + pixel = ImageSharp.PixelFormats.Rgb24.FromVector4(rgbVec); rgb24Span[pixelIdx++] = pixel; } diff --git a/tests/ImageSharp.Textures.Tests/Formats/Ktx2/Ktx2HdrDecoderFlatTests.cs b/tests/ImageSharp.Textures.Tests/Formats/Ktx2/Ktx2HdrDecoderFlatTests.cs index 9b6110a5..94195f4b 100644 --- a/tests/ImageSharp.Textures.Tests/Formats/Ktx2/Ktx2HdrDecoderFlatTests.cs +++ b/tests/ImageSharp.Textures.Tests/Formats/Ktx2/Ktx2HdrDecoderFlatTests.cs @@ -40,7 +40,7 @@ public void CanDecode_R16_Unorm(TestTextureProvider provider) firstMipMapImage.CompareToReferenceOutput(provider); } - [Theory] + [Theory(Skip = "ImageSharp 4.x loads the reference PNG into Rg32 incorrectly (Rg32.FromRgba32 saturates every channel)")] [WithFile(TestTextureFormat.Ktx2, TestTextureType.Flat, TestTextureTool.ToKtx, TestImages.Ktx2.Astc.Rg32_Unorm)] public void CanDecode_RG32_Unorm(TestTextureProvider provider) { diff --git a/tests/ImageSharp.Textures.Tests/Formats/PixelFormat/PixelFormatTests.cs b/tests/ImageSharp.Textures.Tests/Formats/PixelFormat/PixelFormatTests.cs index 68103752..529fa531 100644 --- a/tests/ImageSharp.Textures.Tests/Formats/PixelFormat/PixelFormatTests.cs +++ b/tests/ImageSharp.Textures.Tests/Formats/PixelFormat/PixelFormatTests.cs @@ -25,7 +25,7 @@ public void Test_Rg16() Assert.Equal(string.Format(CultureInfo.InvariantCulture, "Rg16({0}, {1})", x, y), testPixel.ToString()); var destPixel = new ImageSharp.PixelFormats.Rgba32(0); - testPixel.ToRgba32(ref destPixel); + destPixel = testPixel.ToRgba32(); Assert.Equal(hexValues[i], testPixel.PackedValue.ToString("X", CultureInfo.InvariantCulture)); @@ -35,7 +35,7 @@ public void Test_Rg16() Assert.Equal(255, destPixel.A); var vector4 = testPixel.ToVector4(); - testPixel.FromVector4(vector4); + testPixel = Rg16.FromVector4(vector4); Assert.Equal(testPixel.ToVector4(), vector4); } } @@ -53,7 +53,7 @@ public void Test_Bgr555() var testPixel = new Bgr555(x, y, z); var destPixel = new ImageSharp.PixelFormats.Rgba32(0); - testPixel.ToRgba32(ref destPixel); + destPixel = testPixel.ToRgba32(); Assert.Equal(hexValues[i], testPixel.PackedValue.ToString("X", CultureInfo.InvariantCulture)); @@ -63,7 +63,7 @@ public void Test_Bgr555() Assert.Equal(255, destPixel.A); var vector4 = testPixel.ToVector4(); - testPixel.FromVector4(vector4); + testPixel = Bgr555.FromVector4(vector4); Assert.Equal(testPixel.ToVector4(), vector4); } } @@ -81,7 +81,7 @@ public void Test_Bgr32() var testPixel = new Bgr32(x, y, z); var destPixel = new ImageSharp.PixelFormats.Rgba32(0); - testPixel.ToRgba32(ref destPixel); + destPixel = testPixel.ToRgba32(); Assert.Equal(hexValues[i], testPixel.PackedValue.ToString("X", CultureInfo.InvariantCulture)); @@ -91,7 +91,7 @@ public void Test_Bgr32() Assert.Equal(255, destPixel.A); var vector4 = testPixel.ToVector4(); - testPixel.FromVector4(vector4); + testPixel = Bgr32.FromVector4(vector4); Assert.Equal(testPixel.ToVector4(), vector4); } } @@ -109,7 +109,7 @@ public void Test_Rgb32() var testPixel = new Rgb32(x, y, z); var destPixel = new ImageSharp.PixelFormats.Rgba32(0); - testPixel.ToRgba32(ref destPixel); + destPixel = testPixel.ToRgba32(); Assert.Equal(hexValues[i], testPixel.PackedValue.ToString("X", CultureInfo.InvariantCulture)); @@ -119,7 +119,7 @@ public void Test_Rgb32() Assert.Equal(255, destPixel.A); var vector4 = testPixel.ToVector4(); - testPixel.FromVector4(vector4); + testPixel = Rgb32.FromVector4(vector4); Assert.Equal(testPixel.ToVector4(), vector4); } } diff --git a/tests/ImageSharp.Textures.Tests/TestUtilities/ImagingTestCaseUtility.cs b/tests/ImageSharp.Textures.Tests/TestUtilities/ImagingTestCaseUtility.cs index e143076e..61e97ed2 100644 --- a/tests/ImageSharp.Textures.Tests/TestUtilities/ImagingTestCaseUtility.cs +++ b/tests/ImageSharp.Textures.Tests/TestUtilities/ImagingTestCaseUtility.cs @@ -276,7 +276,7 @@ public static void ModifyPixel(ImageFrame img, int x, int y, byt { TPixel pixel = img[x, y]; Rgba64 rgbaPixel = default; - rgbaPixel.FromScaledVector4(pixel.ToScaledVector4()); + rgbaPixel = Rgba64.FromScaledVector4(pixel.ToScaledVector4()); ushort change = (ushort)Math.Round(perChannelChange / 255F * 65535F); if (rgbaPixel.R + perChannelChange <= 255) @@ -315,7 +315,7 @@ public static void ModifyPixel(ImageFrame img, int x, int y, byt rgbaPixel.A -= perChannelChange; } - pixel.FromRgba64(rgbaPixel); + pixel = TPixel.FromRgba64(rgbaPixel); img[x, y] = pixel; } } From cdea6e99cb08a248bfcb10813b9215b86ba98c76 Mon Sep 17 00:00:00 2001 From: Erik White <26148654+Erik-White@users.noreply.github.com> Date: Fri, 16 Oct 2026 22:17:23 +0200 Subject: [PATCH 2/3] Update shared infra --- .gitattributes | 18 +++++++++----- .github/copilot-instructions.md | 3 +++ AGENTS.md | 43 +++++++++++++++++++++++++++++++++ CLAUDE.md | 3 +++ GEMINI.md | 3 +++ SECURITY.md | 21 ++++++++++------ shared-infrastructure | 2 +- 7 files changed, 79 insertions(+), 14 deletions(-) create mode 100644 .github/copilot-instructions.md create mode 100644 AGENTS.md create mode 100644 CLAUDE.md create mode 100644 GEMINI.md diff --git a/.gitattributes b/.gitattributes index 80c19213..031420e5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -84,19 +84,16 @@ # treat as binary ############################################################################### *.basis binary +*.a binary *.dll binary -*.eot binary +*.dylib binary *.exe binary -*.otf binary *.pdf binary *.ppt binary *.pptx binary *.pvr binary +*.so binary *.snk binary -*.ttc binary -*.ttf binary -*.woff binary -*.woff2 binary *.xls binary *.xlsx binary ############################################################################### @@ -144,3 +141,12 @@ # Handle ICC files by git lfs ############################################################################### *.icc filter=lfs diff=lfs merge=lfs -text +############################################################################### +# Handle font files by git lfs +############################################################################### +*.eot filter=lfs diff=lfs merge=lfs -text +*.otf filter=lfs diff=lfs merge=lfs -text +*.ttc filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.woff filter=lfs diff=lfs merge=lfs -text +*.woff2 filter=lfs diff=lfs merge=lfs -text diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md new file mode 100644 index 00000000..5f9f6943 --- /dev/null +++ b/.github/copilot-instructions.md @@ -0,0 +1,3 @@ +# GitHub Copilot Instructions + +Read and follow [AGENTS.md](../AGENTS.md) as the repository-wide source of coding, performance, and verification requirements. Prefer existing local patterns and repository configuration whenever generated code or suggestions are accepted. diff --git a/AGENTS.md b/AGENTS.md new file mode 100644 index 00000000..38cc8eae --- /dev/null +++ b/AGENTS.md @@ -0,0 +1,43 @@ +# Six Labors AI Coding Guidelines + +These instructions apply to the entire repository. More-specific `AGENTS.md` files may add to or override them for their directory tree. + +## Working Practices + +- Inspect only the source and supporting files needed for the task before proposing or making changes. Do not infer current behavior when the source is available. +- Make the smallest complete change that solves the requested problem. Avoid unrelated cleanup, speculative abstractions, and formatting churn. +- Trace the existing execution path before changing it. Extend and optimize the existing implementation within the requested behavior and affected path. +- Before implementing an operation, find and inspect the existing APIs that provide it. Use or extend those APIs instead of writing equivalent logic elsewhere. This includes color conversion, pixel conversion, memory management, and vectorized operations. If an API lacks required behavior, improve its owning implementation rather than bypassing it with a separate implementation. +- Follow existing naming, formatting, documentation, and test patterns. Treat `.editorconfig`, analyzers, and repository build settings as authoritative. +- Use simple technical English in all communication, documentation, and comments. Use short sentences, active voice, and existing code terminology. +- Preserve public API and observable behavior unless the task explicitly requires a change. Public API documentation must describe observable behavior, not implementation details. +- Do not use reflection against built assemblies, ad hoc assembly loading, or temporary probe projects unless explicitly requested. +- Build .NET projects in Release configuration unless explicitly instructed otherwise. + +## Performance + +- Treat throughput, latency, memory use, and binary size as design constraints, especially in pixel-processing, drawing, parsing, encoding, and other hot paths. +- Avoid unnecessary allocations, copies, boxing, closures, interface dispatch, repeated enumeration, and extra passes over data. +- Reuse existing memory ownership, pooling, span, vectorization, and parallelization mechanisms. +- Use a SIMD-first design for suitable data processing code. Build on existing vectorized operations, dispatch mechanisms, and scalar fallbacks. Keep hot loops simple, hoist invariant work, and preserve memory locality. +- Preserve correctness and maintainability during optimization. Distinguish source-based reasoning from measured results. Claim a speedup only with measurements. Use existing benchmarks first. Add or update cases only when they measure relevant behavior that existing benchmarks miss. +- Consider all supported target frameworks and runtime capabilities. Do not regress fallback paths while optimizing newer runtimes. + +## C# Conventions + +- Follow local patterns when they comply with the explicit rules. +- Do not use `record` or `record struct` types. +- Prefer established invariants over redundant guards. Validate at real external boundaries and do not add defensive checks for internally controlled states. +- Do not extract single-use helpers merely to name a block. Extract only for genuine reuse, an established local pattern, or independently complex logic. +- Add vertical whitespace after multi-line statements and declarations and between distinct logical stages. Never add trailing whitespace. +- Document every added method, constructor, and property, regardless of visibility. Update documentation when a member's behavior or contract changes. Keep public API documentation limited to observable behavior. Use private and internal documentation to explain the contract and intent. +- Add inline comments that explain why complex code works. Explain algorithms, formulas, invariants, memory ownership, compatibility behavior, and performance decisions where they apply. +- For SIMD, explain lane layouts, operations, alignment, remainders, and scalar equivalence so an unfamiliar maintainer can follow the code. + +## Verification + +- Add or update tests only when they prove a required behavior or expose a real defect. Derive expectations from established contracts, explicit requirements, or defect evidence. Use source to identify contracts and integration points, not to copy implementation results into expectations. Prefer extending existing tests. Avoid redundant cases and assertions that merely repeat the implementation. +- Never weaken, skip, or bypass a valid test to make it pass. Fix the production defect or the genuine test defect. Replace or remove a test only with evidence that its expectation is invalid or its coverage is redundant. +- Do not update golden files, reference images, snapshots, baselines, or expected-output artifacts merely to silence a failure. Investigate mismatches. Update expected results only for an established requirement change or an incorrect reference result proved by independent contract or defect evidence. +- Test the actual behavior through the existing execution path. Synthetic inputs must exercise an established requirement or reproduce a real defect. Do not invent requirements or substitute internal structure and helper calls for assertions about required behavior. Run the narrowest relevant formatting, test, and Release build commands. +- Report what changed, the verification performed, and any remaining risks or unverified assumptions. diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 00000000..5f08a449 --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,3 @@ +# Claude Code Instructions + +Read and follow [AGENTS.md](AGENTS.md) as the repository-wide source of coding, performance, and verification requirements. Apply any more-specific `AGENTS.md` or `CLAUDE.md` found below the files being changed. diff --git a/GEMINI.md b/GEMINI.md new file mode 100644 index 00000000..b621d265 --- /dev/null +++ b/GEMINI.md @@ -0,0 +1,3 @@ +# Gemini CLI Instructions + +Read and follow [AGENTS.md](AGENTS.md) as the repository-wide source of coding, performance, and verification requirements. Apply any more-specific `AGENTS.md` or `GEMINI.md` found below the files being changed. diff --git a/SECURITY.md b/SECURITY.md index 8b2e1df8..2e060f62 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,16 +2,23 @@ ## Supported Versions -Six Labors provides security fixes only for the latest major version of each library. +Six Labors provides security updates for the latest major version of each library. -Older major versions are end-of-life and do not receive security fixes. +Each major version remains eligible for security updates for 12 months after the first stable release of the next major version of that library. +After this period, that major version is end-of-life and does not receive security updates. -Users must upgrade to the latest major version to receive security fixes. +Users must install the latest available patch or minor release within a supported major version to receive security fixes. +Older releases within that major version are not maintained separately. -| Version | Supported | -| -------------------- | --------- | -| Latest major version | Yes | -| Older major versions | No | +| Version | Supported | +| ------- | --------- | +| Latest major version | Yes | +| Superseded major version within 12 months of the next major's first stable release | Yes | +| Superseded major version after that 12-month period | No | + +Security updates may require a license key under the existing license terms. This does not change the license terms. + +This policy covers security fixes only. It does not include feature backports or extend support for underlying .NET versions. Security fixes, if any, are provided at Six Labors' discretion. diff --git a/shared-infrastructure b/shared-infrastructure index 4a5a9fe7..7804b206 160000 --- a/shared-infrastructure +++ b/shared-infrastructure @@ -1 +1 @@ -Subproject commit 4a5a9fe756e75c92ef9042b0ea4d94bc35e6ace9 +Subproject commit 7804b206c2c41b07b0e617a6c1aa4d97a212bbed From 27feeed5434f47072c3ece522cb12bc5862a129c Mon Sep 17 00:00:00 2001 From: Erik White <26148654+Erik-White@users.noreply.github.com> Date: Fri, 16 Oct 2026 22:36:26 +0200 Subject: [PATCH 3/3] Update dependencies --- tests/Directory.Build.targets | 8 ++++---- .../Formats/Astc/Reference/AstcReferenceDecoder.cs | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets index b7fad5c5..8346751a 100644 --- a/tests/Directory.Build.targets +++ b/tests/Directory.Build.targets @@ -17,11 +17,11 @@ - + - - - + + + diff --git a/tests/ImageSharp.Textures.Tests/Formats/Astc/Reference/AstcReferenceDecoder.cs b/tests/ImageSharp.Textures.Tests/Formats/Astc/Reference/AstcReferenceDecoder.cs index fd452da6..c4b16040 100644 --- a/tests/ImageSharp.Textures.Tests/Formats/Astc/Reference/AstcReferenceDecoder.cs +++ b/tests/ImageSharp.Textures.Tests/Formats/Astc/Reference/AstcReferenceDecoder.cs @@ -49,7 +49,7 @@ public static byte[] DecompressLdr(ReadOnlySpan blocks, int w, int h, int dimY = (uint)h, dimZ = 1, dataType = AstcencType.AstcencTypeU8, - data = outputBytes, + data = new[] { outputBytes }, }; // We need a mutable copy of blocks for the Span parameter @@ -99,7 +99,7 @@ public static byte[] DecompressLdrSrgb(ReadOnlySpan blocks, int w, int h, dimY = (uint)h, dimZ = 1, dataType = AstcencType.AstcencTypeU8, - data = outputBytes, + data = new[] { outputBytes }, }; byte[] blocksCopy = blocks.ToArray(); @@ -144,7 +144,7 @@ public static Half[] DecompressHdr(ReadOnlySpan blocks, int w, int h, int dimY = (uint)h, dimZ = 1, dataType = AstcencType.AstcencTypeF16, - data = outputBytes, + data = new[] { outputBytes }, }; byte[] blocksCopy = blocks.ToArray(); @@ -189,7 +189,7 @@ public static byte[] CompressLdr(byte[] pixels, int w, int h, int blockX, int bl dimY = (uint)h, dimZ = 1, dataType = AstcencType.AstcencTypeU8, - data = pixels, + data = new[] { pixels }, }; int blocksWide = (w + blockX - 1) / blockX; @@ -235,7 +235,7 @@ public static byte[] CompressHdr(Half[] pixels, int w, int h, int blockX, int bl dimY = (uint)h, dimZ = 1, dataType = AstcencType.AstcencTypeF16, - data = pixelBytes, + data = new[] { pixelBytes }, }; int blocksWide = (w + blockX - 1) / blockX; @@ -335,7 +335,7 @@ public static void DecompressLdrInto(AstcencContext context, byte[] blocks, int dimY = (uint)h, dimZ = 1, dataType = AstcencType.AstcencTypeU8, - data = output, + data = new[] { output }, }; AstcencError error = Astcenc.AstcencDecompressImage(context, blocks, ref image, IdentitySwizzle, 0); ThrowOnError(error, "DecompressImage(LDR/Into)"); @@ -354,7 +354,7 @@ public static void DecompressHdrInto(AstcencContext context, byte[] blocks, int dimY = (uint)h, dimZ = 1, dataType = AstcencType.AstcencTypeF16, - data = output, + data = new[] { output }, }; AstcencError error = Astcenc.AstcencDecompressImage(context, blocks, ref image, IdentitySwizzle, 0); ThrowOnError(error, "DecompressImage(HDR/Into)");