From db87a41079170a7bbeefabd1cba942f07a8979ec Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Fri, 20 Apr 2018 20:54:09 +1000 Subject: [PATCH] Add additional tests plus cleanup --- src/ImageSharp/PixelFormats/Argb32.cs | 16 +- src/ImageSharp/PixelFormats/Bgra32.cs | 14 ++ src/ImageSharp/PixelFormats/Rgba32.cs | 38 ++- .../PixelFormats/ColorPackingTests.cs | 22 +- .../PixelFormats/PackedPixelTests.cs | 235 ++++++++++++++++-- .../PixelFormats/PixelOperationsTests.cs | 45 ++++ .../PixelFormats/Rgba32Tests.cs | 14 +- 7 files changed, 319 insertions(+), 65 deletions(-) diff --git a/src/ImageSharp/PixelFormats/Argb32.cs b/src/ImageSharp/PixelFormats/Argb32.cs index 471e5e87ed..ef869af011 100644 --- a/src/ImageSharp/PixelFormats/Argb32.cs +++ b/src/ImageSharp/PixelFormats/Argb32.cs @@ -296,10 +296,24 @@ namespace SixLabors.ImageSharp.PixelFormats [MethodImpl(MethodImplOptions.AggressiveInlining)] public Rgba32 ToRgba32() => new Rgba32(this.R, this.G, this.B, this.A); + /// + /// Converts the pixel to format. + /// + /// The RGBA value + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Bgra32 ToBgra32() => new Bgra32(this.R, this.G, this.B, this.A); + + /// + /// Converts the pixel to format. + /// + /// The RGBA value + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Argb32 ToArgb32() => this; + /// public override bool Equals(object obj) { - return obj is Argb32 && this.Equals((Argb32)obj); + return obj is Argb32 argb32 && this.Equals(argb32); } /// diff --git a/src/ImageSharp/PixelFormats/Bgra32.cs b/src/ImageSharp/PixelFormats/Bgra32.cs index 710bc50e86..20dfda5046 100644 --- a/src/ImageSharp/PixelFormats/Bgra32.cs +++ b/src/ImageSharp/PixelFormats/Bgra32.cs @@ -229,5 +229,19 @@ namespace SixLabors.ImageSharp.PixelFormats /// The RGBA value [MethodImpl(MethodImplOptions.AggressiveInlining)] public Rgba32 ToRgba32() => new Rgba32(this.R, this.G, this.B, this.A); + + /// + /// Converts the pixel to format. + /// + /// The RGBA value + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Argb32 ToArgb32() => new Argb32(this.R, this.G, this.B, this.A); + + /// + /// Converts the pixel to format. + /// + /// The RGBA value + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Bgra32 ToBgra32() => this; } } \ No newline at end of file diff --git a/src/ImageSharp/PixelFormats/Rgba32.cs b/src/ImageSharp/PixelFormats/Rgba32.cs index a2ca02636a..f6979aad80 100644 --- a/src/ImageSharp/PixelFormats/Rgba32.cs +++ b/src/ImageSharp/PixelFormats/Rgba32.cs @@ -274,7 +274,10 @@ namespace SixLabors.ImageSharp.PixelFormats [MethodImpl(MethodImplOptions.AggressiveInlining)] public void PackFromBgra32(Bgra32 source) { - Pack(source.R, source.G, source.B, source.A); + this.R = source.R; + this.G = source.G; + this.B = source.B; + this.A = source.A; } /// @@ -283,7 +286,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// A hexadecimal string representation of the value. public string ToHex() { - uint hexOrder = Pack(this.A, this.B, this.G, this.R); + uint hexOrder = (uint)(this.A << 0 | this.B << 8 | this.G << 16 | this.R << 24); return hexOrder.ToString("X8"); } @@ -364,10 +367,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// /// A value. [MethodImpl(MethodImplOptions.AggressiveInlining)] - public Bgra32 ToBgra32() - { - return new Bgra32(this.R, this.G, this.B, this.A); - } + public Bgra32 ToBgra32() => new Bgra32(this.R, this.G, this.B, this.A); /// /// Gets the value of this struct as . @@ -375,10 +375,14 @@ namespace SixLabors.ImageSharp.PixelFormats /// /// A value. [MethodImpl(MethodImplOptions.AggressiveInlining)] - public Argb32 ToArgb32() - { - return new Argb32(this.R, this.G, this.B, this.A); - } + public Argb32 ToArgb32() => new Argb32(this.R, this.G, this.B, this.A); + + /// + /// Converts the pixel to format. + /// + /// The RGBA value + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public Rgba32 ToRgba32() => this; /// public override bool Equals(object obj) @@ -420,20 +424,6 @@ namespace SixLabors.ImageSharp.PixelFormats return new Vector4(this.R, this.G, this.B, this.A); } - /// - /// Packs the four floats into a . - /// - /// The x-component - /// The y-component - /// The z-component - /// The w-component - /// The - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static uint Pack(byte x, byte y, byte z, byte w) - { - return (uint)(x << RedShift | y << GreenShift | z << BlueShift | w << AlphaShift); - } - /// /// Packs a into a color returning a new instance as a result. /// diff --git a/tests/ImageSharp.Tests/PixelFormats/ColorPackingTests.cs b/tests/ImageSharp.Tests/PixelFormats/ColorPackingTests.cs index ad8297fbb5..c9a1c8fe7e 100644 --- a/tests/ImageSharp.Tests/PixelFormats/ColorPackingTests.cs +++ b/tests/ImageSharp.Tests/PixelFormats/ColorPackingTests.cs @@ -28,16 +28,16 @@ namespace SixLabors.ImageSharp.Tests.Colors { float[] vector4Components = new float[] { vector4.X, vector4.Y, vector4.Z, vector4.W }; - yield return new object[] { new Argb32(), vector4Components }; - yield return new object[] { new Bgra4444(), vector4Components }; - yield return new object[] { new Bgra5551(), vector4Components }; - yield return new object[] { new Byte4(), vector4Components }; - yield return new object[] { new HalfVector4(), vector4Components }; - yield return new object[] { new NormalizedByte4(), vector4Components }; - yield return new object[] { new NormalizedShort4(), vector4Components }; - yield return new object[] { new Rgba1010102(), vector4Components }; - yield return new object[] { new Rgba64(), vector4Components }; - yield return new object[] { new Short4(), vector4Components }; + yield return new object[] { default(Argb32), vector4Components }; + yield return new object[] { default(Bgra4444), vector4Components }; + yield return new object[] { default(Bgra5551), vector4Components }; + yield return new object[] { default(Byte4), vector4Components }; + yield return new object[] { default(HalfVector4), vector4Components }; + yield return new object[] { default(NormalizedByte4), vector4Components }; + yield return new object[] { default(NormalizedShort4), vector4Components }; + yield return new object[] { default(Rgba1010102), vector4Components }; + yield return new object[] { default(Rgba64), vector4Components }; + yield return new object[] { default(Short4), vector4Components }; } } } @@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Tests.Colors { float[] vector4Components = new float[] { vector4.X, vector4.Y, vector4.Z, vector4.W }; - yield return new object[] { new Argb32(), vector4Components }; + yield return new object[] { default(Argb32), vector4Components }; yield return new object[] { new Bgr565(), vector4Components }; } } diff --git a/tests/ImageSharp.Tests/PixelFormats/PackedPixelTests.cs b/tests/ImageSharp.Tests/PixelFormats/PackedPixelTests.cs index 0281531420..546d675c13 100644 --- a/tests/ImageSharp.Tests/PixelFormats/PackedPixelTests.cs +++ b/tests/ImageSharp.Tests/PixelFormats/PackedPixelTests.cs @@ -47,27 +47,31 @@ namespace SixLabors.ImageSharp.Tests.Colors Assert.Equal(.5F, scaled.W, 2); // Test PackFromScaledVector4. - var pixel = default(Alpha8); - pixel.PackFromScaledVector4(scaled); - Assert.Equal(128, pixel.PackedValue); + Alpha8 alpha = default; + alpha.PackFromScaledVector4(scaled); + Assert.Equal(128, alpha.PackedValue); // Test Rgb conversion - var rgb = default(Rgb24); - var rgba = default(Rgba32); - var bgr = default(Bgr24); - var bgra = default(Bgra32); + Rgb24 rgb = default; + Rgba32 rgba = default; + Bgr24 bgr = default; + Bgra32 bgra = default; + Argb32 argb = default; - new Alpha8(.5F).ToRgb24(ref rgb); + alpha.ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(0, 0, 0)); - new Alpha8(.5F).ToRgba32(ref rgba); + alpha.ToRgba32(ref rgba); Assert.Equal(rgba, new Rgba32(0, 0, 0, 128)); - new Alpha8(.5F).ToBgr24(ref bgr); + alpha.ToBgr24(ref bgr); Assert.Equal(bgr, new Bgr24(0, 0, 0)); - new Alpha8(.5F).ToBgra32(ref bgra); + alpha.ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(0, 0, 0, 128)); + + alpha.ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(0, 0, 0, 128)); } [Fact] @@ -113,19 +117,40 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); - + var argb2 = default(Argb32); argb.ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(0x1a, 0, 0x80)); argb.ToRgba32(ref rgba); Assert.Equal(rgba, new Rgba32(0x1a, 0, 0x80, 0)); + Assert.Equal(rgba, argb.ToRgba32()); argb.ToBgr24(ref bgr); Assert.Equal(bgr, new Bgr24(0x1a, 0, 0x80)); argb.ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(0x1a, 0, 0x80, 0)); + Assert.Equal(bgra, argb.ToBgra32()); + + argb.ToArgb32(ref argb2); + Assert.Equal(argb2, new Argb32(0x1a, 0, 0x80, 0)); + Assert.Equal(argb2, argb.ToArgb32()); + + var r = default(Argb32); + r.PackFromRgba32(new Rgba32(0x1a, 0, 0x80, 0)); + r.ToRgba32(ref rgba); + Assert.Equal(rgba, new Rgba32(0x1a, 0, 0x80, 0)); + + r = default(Argb32); + r.PackFromBgra32(new Bgra32(0x1a, 0, 0x80, 0)); + r.ToBgra32(ref bgra); + Assert.Equal(bgra, new Bgra32(0x1a, 0, 0x80, 0)); + + r = default(Argb32); + r.PackFromArgb32(new Argb32(0x1a, 0, 0x80, 0)); + r.ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(0x1a, 0, 0x80, 0)); } [Fact] @@ -173,6 +198,7 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); new Bgr565(x, y, z).ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(25, 0, 132)); @@ -185,6 +211,9 @@ namespace SixLabors.ImageSharp.Tests.Colors new Bgr565(x, y, z).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(25, 0, 132, 255)); + + new Bgr565(x, y, z).ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(25, 0, 132, 255)); } [Fact] @@ -235,6 +264,7 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); new Bgra4444(x, y, z, w).ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(34, 0, 136)); @@ -247,6 +277,24 @@ namespace SixLabors.ImageSharp.Tests.Colors new Bgra4444(x, y, z, w).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(34, 0, 136, 0)); + + new Bgra4444(x, y, z, w).ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(34, 0, 136, 0)); + + var r = default(Bgra4444); + r.PackFromRgba32(new Rgba32(34, 0, 136, 0)); + r.ToRgba32(ref rgba); + Assert.Equal(rgba, new Rgba32(34, 0, 136, 0)); + + r = default(Bgra4444); + r.PackFromBgra32(new Bgra32(34, 0, 136, 0)); + r.ToBgra32(ref bgra); + Assert.Equal(bgra, new Bgra32(34, 0, 136, 0)); + + r = default(Bgra4444); + r.PackFromArgb32(new Argb32(34, 0, 136, 0)); + r.ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(34, 0, 136, 0)); } [Fact] @@ -293,6 +341,7 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); new Bgra5551(x, y, z, w).ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(24, 0, 131)); @@ -305,6 +354,24 @@ namespace SixLabors.ImageSharp.Tests.Colors new Bgra5551(x, y, z, w).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(24, 0, 131, 0)); + + new Bgra5551(x, y, z, w).ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(24, 0, 131, 0)); + + var r = default(Bgra5551); + r.PackFromRgba32(new Rgba32(24, 0, 131, 0)); + r.ToRgba32(ref rgba); + Assert.Equal(rgba, new Rgba32(24, 0, 131, 0)); + + r = default(Bgra5551); + r.PackFromBgra32(new Bgra32(24, 0, 131, 0)); + r.ToBgra32(ref bgra); + Assert.Equal(bgra, new Bgra32(24, 0, 131, 0)); + + r = default(Bgra5551); + r.PackFromArgb32(new Argb32(24, 0, 131, 0)); + r.ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(24, 0, 131, 0)); } [Fact] @@ -356,6 +423,7 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); new Byte4(x, y, z, w).ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(128, 0, 0)); @@ -369,10 +437,23 @@ namespace SixLabors.ImageSharp.Tests.Colors new Byte4(x, y, z, w).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(128, 0, 0, 0)); - var r = new Byte4(); + new Byte4(x, y, z, w).ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(128, 0, 0, 0)); + + var r = default(Byte4); r.PackFromRgba32(new Rgba32(20, 38, 0, 255)); r.ToRgba32(ref rgba); Assert.Equal(rgba, new Rgba32(20, 38, 0, 255)); + + r = default(Byte4); + r.PackFromBgra32(new Bgra32(20, 38, 0, 255)); + r.ToBgra32(ref bgra); + Assert.Equal(bgra, new Bgra32(20, 38, 0, 255)); + + r = default(Byte4); + r.PackFromArgb32(new Argb32(20, 38, 0, 255)); + r.ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(20, 38, 0, 255)); } [Fact] @@ -407,6 +488,7 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); new HalfSingle(x).ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(128, 0, 0)); @@ -419,6 +501,9 @@ namespace SixLabors.ImageSharp.Tests.Colors new HalfSingle(x).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(128, 0, 0, 255)); + + new HalfSingle(x).ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(128, 0, 0, 255)); } [Fact] @@ -456,6 +541,7 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); new HalfVector2(x, y).ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(128, 64, 0)); @@ -468,6 +554,9 @@ namespace SixLabors.ImageSharp.Tests.Colors new HalfVector2(x, y).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(128, 64, 0, 255)); + + new HalfVector2(x, y).ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(128, 64, 0, 255)); } [Fact] @@ -514,6 +603,7 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); new HalfVector4(x, y, z, w).ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(64, 128, 191)); @@ -526,6 +616,24 @@ namespace SixLabors.ImageSharp.Tests.Colors new HalfVector4(x, y, z, w).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(64, 128, 191, 255)); + + new HalfVector4(x, y, z, w).ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(64, 128, 191, 255)); + + var r = default(HalfVector4); + r.PackFromRgba32(new Rgba32(64, 128, 191, 255)); + r.ToRgba32(ref rgba); + Assert.Equal(rgba, new Rgba32(64, 128, 191, 255)); + + r = default(HalfVector4); + r.PackFromBgra32(new Bgra32(64, 128, 191, 255)); + r.ToBgra32(ref bgra); + Assert.Equal(bgra, new Bgra32(64, 128, 191, 255)); + + r = default(HalfVector4); + r.PackFromArgb32(new Argb32(64, 128, 191, 255)); + r.ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(64, 128, 191, 255)); } [Fact] @@ -571,6 +679,7 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); new NormalizedByte2(x, y).ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(141, 90, 0)); @@ -583,6 +692,9 @@ namespace SixLabors.ImageSharp.Tests.Colors new NormalizedByte2(x, y).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(141, 90, 0, 255)); + + new NormalizedByte2(x, y).ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(141, 90, 0, 255)); } [Fact] @@ -618,7 +730,7 @@ namespace SixLabors.ImageSharp.Tests.Colors float z = 0.5f; float w = -0.7f; Assert.Equal(0xA740DA0D, new NormalizedByte4(x, y, z, w).PackedValue); - var n = new NormalizedByte4(); + var n = default(NormalizedByte4); n.PackFromRgba32(new Rgba32(141, 90, 192, 39)); Assert.Equal(0xA740DA0D, n.PackedValue); @@ -628,6 +740,7 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); new NormalizedByte4(x, y, z, w).ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(141, 90, 192)); @@ -641,8 +754,11 @@ namespace SixLabors.ImageSharp.Tests.Colors new NormalizedByte4(x, y, z, w).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(141, 90, 192, 39)); + new NormalizedByte4(x, y, z, w).ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(141, 90, 192, 39)); + // http://community.monogame.net/t/normalizedbyte4-texture2d-gives-different-results-from-xna/8012/8 - var r = new NormalizedByte4(); + var r = default(NormalizedByte4); r.PackFromRgba32(new Rgba32(9, 115, 202, 127)); r.ToRgba32(ref rgba); Assert.Equal(rgba, new Rgba32(9, 115, 202, 127)); @@ -650,6 +766,16 @@ namespace SixLabors.ImageSharp.Tests.Colors r.PackedValue = 0xff4af389; r.ToRgba32(ref rgba); Assert.Equal(rgba, new Rgba32(9, 115, 202, 127)); + + r = default(NormalizedByte4); + r.PackFromArgb32(new Argb32(9, 115, 202, 127)); + r.ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(9, 115, 202, 127)); + + r = default(NormalizedByte4); + r.PackFromBgra32(new Bgra32(9, 115, 202, 127)); + r.ToBgra32(ref bgra); + Assert.Equal(bgra, new Bgra32(9, 115, 202, 127)); } [Fact] @@ -692,6 +818,7 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); var n = new NormalizedShort2(); n.PackFromRgba32(new Rgba32(141, 90, 0, 0)); @@ -712,6 +839,9 @@ namespace SixLabors.ImageSharp.Tests.Colors new NormalizedShort2(x, y).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(141, 90, 0, 255)); + + new NormalizedShort2(x, y).ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(141, 90, 0, 255)); } [Fact] @@ -753,6 +883,7 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); new NormalizedShort4(x, y, z, w).ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(141, 90, 192)); @@ -766,10 +897,23 @@ namespace SixLabors.ImageSharp.Tests.Colors new NormalizedShort4(x, y, z, w).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(141, 90, 192, 39)); - var r = new NormalizedShort4(); + new NormalizedShort4(x, y, z, w).ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(141, 90, 192, 39)); + + var r = default(NormalizedShort4); r.PackFromRgba32(new Rgba32(9, 115, 202, 127)); r.ToRgba32(ref rgba); Assert.Equal(rgba, new Rgba32(9, 115, 202, 127)); + + r = default(NormalizedShort4); + r.PackFromBgra32(new Bgra32(9, 115, 202, 127)); + r.ToBgra32(ref bgra); + Assert.Equal(bgra, new Bgra32(9, 115, 202, 127)); + + r = default(NormalizedShort4); + r.PackFromArgb32(new Argb32(9, 115, 202, 127)); + r.ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(9, 115, 202, 127)); } [Fact] @@ -812,6 +956,7 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); new Rg32(x, y).ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(25, 0, 0)); @@ -824,6 +969,9 @@ namespace SixLabors.ImageSharp.Tests.Colors new Rg32(x, y).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(25, 0, 0, 255)); + + new Rg32(x, y).ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(25, 0, 0, 255)); } [Fact] @@ -869,6 +1017,7 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); new Rgba1010102(x, y, z, w).ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(25, 0, 128)); @@ -883,10 +1032,20 @@ namespace SixLabors.ImageSharp.Tests.Colors Assert.Equal(bgra, new Bgra32(25, 0, 128, 0)); // Alpha component accuracy will be awful. - var r = new Rgba1010102(); + var r = default(Rgba1010102); r.PackFromRgba32(new Rgba32(25, 0, 128, 0)); r.ToRgba32(ref rgba); Assert.Equal(rgba, new Rgba32(25, 0, 128, 0)); + + r = default(Rgba1010102); + r.PackFromBgra32(new Bgra32(25, 0, 128, 0)); + r.ToBgra32(ref bgra); + Assert.Equal(bgra, new Bgra32(25, 0, 128, 0)); + + r = default(Rgba1010102); + r.PackFromArgb32(new Argb32(25, 0, 128, 0)); + r.ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(25, 0, 128, 0)); } [Fact] @@ -932,18 +1091,40 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); rgba32.ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(0x1a, 0, 0x80)); rgba32.ToRgba32(ref rgba); Assert.Equal(rgba, new Rgba32(0x1a, 0, 0x80, 0)); + Assert.Equal(rgba, rgba.ToRgba32()); rgba32.ToBgr24(ref bgr); Assert.Equal(bgr, new Bgr24(0x1a, 0, 0x80)); rgba32.ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(0x1a, 0, 0x80, 0)); + Assert.Equal(bgra, bgra.ToBgra32()); + + rgba32.ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(0x1a, 0, 0x80, 0)); + Assert.Equal(argb, argb.ToArgb32()); + + var r = default(Rgba32); + r.PackFromRgba32(new Rgba32(0x1a, 0, 0x80, 0)); + r.ToRgba32(ref rgba); + Assert.Equal(rgba, new Rgba32(0x1a, 0, 0x80, 0)); + + r = default(Rgba32); + r.PackFromBgra32(new Bgra32(0x1a, 0, 0x80, 0)); + r.ToBgra32(ref bgra); + Assert.Equal(bgra, new Bgra32(0x1a, 0, 0x80, 0)); + + r = default(Rgba32); + r.PackFromArgb32(new Argb32(0x1a, 0, 0x80, 0)); + r.ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(0x1a, 0, 0x80, 0)); } [Fact] @@ -1008,7 +1189,7 @@ namespace SixLabors.ImageSharp.Tests.Colors new Rgba64(x, y, z, w).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(20, 38, 76, 115)); - var r = new Rgba64(); + var r = default(Rgba64); r.PackFromRgba32(new Rgba32(20, 38, 76, 115)); r.ToRgba32(ref rgba); Assert.Equal(rgba, new Rgba32(20, 38, 76, 115)); @@ -1075,7 +1256,7 @@ namespace SixLabors.ImageSharp.Tests.Colors new Short2(x, y).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(128, 127, 0, 255)); - var r = new Short2(); + var r = default(Short2); r.PackFromRgba32(new Rgba32(20, 38, 0, 255)); r.ToRgba32(ref rgba); Assert.Equal(rgba, new Rgba32(20, 38, 0, 255)); @@ -1131,6 +1312,7 @@ namespace SixLabors.ImageSharp.Tests.Colors var rgba = default(Rgba32); var bgr = default(Bgr24); var bgra = default(Bgra32); + var argb = default(Argb32); new Short4(x, y, z, w).ToRgb24(ref rgb); Assert.Equal(rgb, new Rgb24(172, 177, 243)); @@ -1144,10 +1326,23 @@ namespace SixLabors.ImageSharp.Tests.Colors new Short4(x, y, z, w).ToBgra32(ref bgra); Assert.Equal(bgra, new Bgra32(172, 177, 243, 128)); - var r = new Short4(); + new Short4(x, y, z, w).ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(172, 177, 243, 128)); + + var r = default(Short4); r.PackFromRgba32(new Rgba32(20, 38, 0, 255)); r.ToRgba32(ref rgba); Assert.Equal(rgba, new Rgba32(20, 38, 0, 255)); + + r = default(Short4); + r.PackFromBgra32(new Bgra32(20, 38, 0, 255)); + r.ToBgra32(ref bgra); + Assert.Equal(bgra, new Bgra32(20, 38, 0, 255)); + + r = default(Short4); + r.PackFromArgb32(new Argb32(20, 38, 0, 255)); + r.ToArgb32(ref argb); + Assert.Equal(argb, new Argb32(20, 38, 0, 255)); } // Comparison helpers with small tolerance to allow for floating point rounding during computations. diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs index 4ea179d090..4ae11301d5 100644 --- a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs +++ b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs @@ -383,6 +383,51 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats ); } + [Theory] + [MemberData(nameof(ArraySizesData))] + public void PackFromWzyxBytes(int count) + { + byte[] source = CreateByteTestData(count * 4); + var expected = new TPixel[count]; + + for (int i = 0; i < count; i++) + { + int i4 = i * 4; + + expected[i].PackFromRgba32(new Rgba32(source[i4 + 1], source[i4 + 2], source[i4 + 3], source[i4 + 0])); + } + + TestOperation( + source, + expected, + (s, d) => Operations.PackFromArgb32Bytes(s, d.Span, count) + ); + } + + [Theory] + [MemberData(nameof(ArraySizesData))] + public void ToWzyxBytes(int count) + { + TPixel[] source = CreatePixelTestData(count); + byte[] expected = new byte[count * 4]; + var argb = default(Argb32); + + for (int i = 0; i < count; i++) + { + int i4 = i * 4; + source[i].ToArgb32(ref argb); + expected[i4] = argb.A; + expected[i4 + 1] = argb.R; + expected[i4 + 2] = argb.G; + expected[i4 + 3] = argb.B; + } + + TestOperation( + source, + expected, + (s, d) => Operations.ToArgb32Bytes(s, d.Span, count) + ); + } private class TestBuffers : IDisposable where TSource : struct diff --git a/tests/ImageSharp.Tests/PixelFormats/Rgba32Tests.cs b/tests/ImageSharp.Tests/PixelFormats/Rgba32Tests.cs index a8d38b9381..da9ae08587 100644 --- a/tests/ImageSharp.Tests/PixelFormats/Rgba32Tests.cs +++ b/tests/ImageSharp.Tests/PixelFormats/Rgba32Tests.cs @@ -88,26 +88,22 @@ namespace SixLabors.ImageSharp.Tests [Fact] public void FromAndToHex() { - Rgba32 color = Rgba32.FromHex("#AABBCCDD"); + // 8 digit hex matches css4 spec. RRGGBBAA + var color = Rgba32.FromHex("#AABBCCDD"); // 170, 187, 204, 221 Assert.Equal(170, color.R); Assert.Equal(187, color.G); Assert.Equal(204, color.B); Assert.Equal(221, color.A); - color.A = 170; - color.B = 187; - color.G = 204; - color.R = 221; - - Assert.Equal("DDCCBBAA", color.ToHex()); + Assert.Equal("AABBCCDD", color.ToHex()); color.R = 0; - Assert.Equal("00CCBBAA", color.ToHex()); + Assert.Equal("00BBCCDD", color.ToHex()); color.A = 255; - Assert.Equal("00CCBBFF", color.ToHex()); + Assert.Equal("00BBCCFF", color.ToHex()); } ///