diff --git a/src/ImageSharp/PixelFormats/Alpha8.cs b/src/ImageSharp/PixelFormats/Alpha8.cs
index 8c5d065849..0328e8bb3f 100644
--- a/src/ImageSharp/PixelFormats/Alpha8.cs
+++ b/src/ImageSharp/PixelFormats/Alpha8.cs
@@ -157,11 +157,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
/// Compares an object with the packed vector.
diff --git a/src/ImageSharp/PixelFormats/Argb32.cs b/src/ImageSharp/PixelFormats/Argb32.cs
index 7773395e7b..ca16be93b5 100644
--- a/src/ImageSharp/PixelFormats/Argb32.cs
+++ b/src/ImageSharp/PixelFormats/Argb32.cs
@@ -312,11 +312,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override bool Equals(object obj)
diff --git a/src/ImageSharp/PixelFormats/Bgr24.cs b/src/ImageSharp/PixelFormats/Bgr24.cs
index 5430e3b22b..01df05552b 100644
--- a/src/ImageSharp/PixelFormats/Bgr24.cs
+++ b/src/ImageSharp/PixelFormats/Bgr24.cs
@@ -179,10 +179,10 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/PixelFormats/Bgr565.cs b/src/ImageSharp/PixelFormats/Bgr565.cs
index dd50b28dc4..755590bfea 100644
--- a/src/ImageSharp/PixelFormats/Bgr565.cs
+++ b/src/ImageSharp/PixelFormats/Bgr565.cs
@@ -189,11 +189,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override bool Equals(object obj)
diff --git a/src/ImageSharp/PixelFormats/Bgra32.cs b/src/ImageSharp/PixelFormats/Bgra32.cs
index 733966137c..e51948996a 100644
--- a/src/ImageSharp/PixelFormats/Bgra32.cs
+++ b/src/ImageSharp/PixelFormats/Bgra32.cs
@@ -254,11 +254,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
/// Packs a into a color.
diff --git a/src/ImageSharp/PixelFormats/Bgra4444.cs b/src/ImageSharp/PixelFormats/Bgra4444.cs
index 70a63dccd2..75717ec8b7 100644
--- a/src/ImageSharp/PixelFormats/Bgra4444.cs
+++ b/src/ImageSharp/PixelFormats/Bgra4444.cs
@@ -180,11 +180,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override bool Equals(object obj)
diff --git a/src/ImageSharp/PixelFormats/Bgra5551.cs b/src/ImageSharp/PixelFormats/Bgra5551.cs
index 5c8c3f17ea..8f673d1dcf 100644
--- a/src/ImageSharp/PixelFormats/Bgra5551.cs
+++ b/src/ImageSharp/PixelFormats/Bgra5551.cs
@@ -180,11 +180,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override bool Equals(object obj)
diff --git a/src/ImageSharp/PixelFormats/Byte4.cs b/src/ImageSharp/PixelFormats/Byte4.cs
index 96c5647731..bc662cef98 100644
--- a/src/ImageSharp/PixelFormats/Byte4.cs
+++ b/src/ImageSharp/PixelFormats/Byte4.cs
@@ -181,11 +181,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override bool Equals(object obj)
diff --git a/src/ImageSharp/PixelFormats/HalfSingle.cs b/src/ImageSharp/PixelFormats/HalfSingle.cs
index ffd3bce188..7f0dff07a7 100644
--- a/src/ImageSharp/PixelFormats/HalfSingle.cs
+++ b/src/ImageSharp/PixelFormats/HalfSingle.cs
@@ -194,11 +194,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override bool Equals(object obj)
diff --git a/src/ImageSharp/PixelFormats/HalfVector2.cs b/src/ImageSharp/PixelFormats/HalfVector2.cs
index ec609ae621..0f4b06a0fc 100644
--- a/src/ImageSharp/PixelFormats/HalfVector2.cs
+++ b/src/ImageSharp/PixelFormats/HalfVector2.cs
@@ -209,11 +209,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override string ToString()
diff --git a/src/ImageSharp/PixelFormats/HalfVector4.cs b/src/ImageSharp/PixelFormats/HalfVector4.cs
index 4d0579cc10..745f48a910 100644
--- a/src/ImageSharp/PixelFormats/HalfVector4.cs
+++ b/src/ImageSharp/PixelFormats/HalfVector4.cs
@@ -202,11 +202,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override string ToString()
diff --git a/src/ImageSharp/PixelFormats/NormalizedByte2.cs b/src/ImageSharp/PixelFormats/NormalizedByte2.cs
index ef69a7da89..306894b11f 100644
--- a/src/ImageSharp/PixelFormats/NormalizedByte2.cs
+++ b/src/ImageSharp/PixelFormats/NormalizedByte2.cs
@@ -228,11 +228,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override bool Equals(object obj)
diff --git a/src/ImageSharp/PixelFormats/NormalizedByte4.cs b/src/ImageSharp/PixelFormats/NormalizedByte4.cs
index 7c0b54258b..620f3191db 100644
--- a/src/ImageSharp/PixelFormats/NormalizedByte4.cs
+++ b/src/ImageSharp/PixelFormats/NormalizedByte4.cs
@@ -221,11 +221,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override bool Equals(object obj)
diff --git a/src/ImageSharp/PixelFormats/NormalizedShort2.cs b/src/ImageSharp/PixelFormats/NormalizedShort2.cs
index 8bc9511fae..38df71523d 100644
--- a/src/ImageSharp/PixelFormats/NormalizedShort2.cs
+++ b/src/ImageSharp/PixelFormats/NormalizedShort2.cs
@@ -215,11 +215,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
/// Expands the packed representation into a .
diff --git a/src/ImageSharp/PixelFormats/NormalizedShort4.cs b/src/ImageSharp/PixelFormats/NormalizedShort4.cs
index a7941e59ed..dc65879001 100644
--- a/src/ImageSharp/PixelFormats/NormalizedShort4.cs
+++ b/src/ImageSharp/PixelFormats/NormalizedShort4.cs
@@ -223,11 +223,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override bool Equals(object obj)
diff --git a/src/ImageSharp/PixelFormats/Rg32.cs b/src/ImageSharp/PixelFormats/Rg32.cs
index ec1d7e0690..0efacd0dda 100644
--- a/src/ImageSharp/PixelFormats/Rg32.cs
+++ b/src/ImageSharp/PixelFormats/Rg32.cs
@@ -193,11 +193,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override bool Equals(object obj)
diff --git a/src/ImageSharp/PixelFormats/Rgb24.cs b/src/ImageSharp/PixelFormats/Rgb24.cs
index d5341e14b7..c3b870dffa 100644
--- a/src/ImageSharp/PixelFormats/Rgb24.cs
+++ b/src/ImageSharp/PixelFormats/Rgb24.cs
@@ -176,11 +176,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override string ToString()
diff --git a/src/ImageSharp/PixelFormats/Rgba1010102.cs b/src/ImageSharp/PixelFormats/Rgba1010102.cs
index 5503487368..adaec70515 100644
--- a/src/ImageSharp/PixelFormats/Rgba1010102.cs
+++ b/src/ImageSharp/PixelFormats/Rgba1010102.cs
@@ -187,11 +187,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override bool Equals(object obj)
diff --git a/src/ImageSharp/PixelFormats/Rgba32.cs b/src/ImageSharp/PixelFormats/Rgba32.cs
index a61e2e7a22..83ba6664f0 100644
--- a/src/ImageSharp/PixelFormats/Rgba32.cs
+++ b/src/ImageSharp/PixelFormats/Rgba32.cs
@@ -386,11 +386,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override bool Equals(object obj)
diff --git a/src/ImageSharp/PixelFormats/RgbaVector.cs b/src/ImageSharp/PixelFormats/RgbaVector.cs
index 8d49ba4d97..637a5f3628 100644
--- a/src/ImageSharp/PixelFormats/RgbaVector.cs
+++ b/src/ImageSharp/PixelFormats/RgbaVector.cs
@@ -300,11 +300,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
diff --git a/src/ImageSharp/PixelFormats/Short2.cs b/src/ImageSharp/PixelFormats/Short2.cs
index dcc7e00b52..593132d2b5 100644
--- a/src/ImageSharp/PixelFormats/Short2.cs
+++ b/src/ImageSharp/PixelFormats/Short2.cs
@@ -209,11 +209,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
/// Expands the packed representation into a .
diff --git a/src/ImageSharp/PixelFormats/Short4.cs b/src/ImageSharp/PixelFormats/Short4.cs
index 1f73e4a38a..3daabe9bae 100644
--- a/src/ImageSharp/PixelFormats/Short4.cs
+++ b/src/ImageSharp/PixelFormats/Short4.cs
@@ -215,11 +215,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba64(Rgba64 source) => this.PackFromVector4(source.ToScaledVector4());
+ public void PackFromRgba64(Rgba64 source) => this.PackFromScaledVector4(source.ToScaledVector4());
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba64(ref Rgba64 dest) => dest.PackFromVector4(this.ToScaledVector4());
+ public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
public override bool Equals(object obj)
diff --git a/tests/ImageSharp.Tests/PixelFormats/Bgra5551Tests.cs b/tests/ImageSharp.Tests/PixelFormats/Bgra5551Tests.cs
index b446511965..6ca822ed15 100644
--- a/tests/ImageSharp.Tests/PixelFormats/Bgra5551Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/Bgra5551Tests.cs
@@ -192,5 +192,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void Bgra5551_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(Bgra5551);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 0, 65535, 0);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/Byte4Tests.cs b/tests/ImageSharp.Tests/PixelFormats/Byte4Tests.cs
index b6c6232162..8e9ef4b3ed 100644
--- a/tests/ImageSharp.Tests/PixelFormats/Byte4Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/Byte4Tests.cs
@@ -190,5 +190,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void Byte4_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(Byte4);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 0, 65535, 0);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/HalfSingleTests.cs b/tests/ImageSharp.Tests/PixelFormats/HalfSingleTests.cs
index 5507243dde..ed853e6b85 100644
--- a/tests/ImageSharp.Tests/PixelFormats/HalfSingleTests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/HalfSingleTests.cs
@@ -141,5 +141,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void HalfSingle_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(HalfSingle);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 0, 0, 65535);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/HalfVector2Tests.cs b/tests/ImageSharp.Tests/PixelFormats/HalfVector2Tests.cs
index fe806e0c93..0cdf493d65 100644
--- a/tests/ImageSharp.Tests/PixelFormats/HalfVector2Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/HalfVector2Tests.cs
@@ -146,5 +146,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void HalfVector2_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(HalfVector2);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 65535, 0, 65535);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/HalfVector4Tests.cs b/tests/ImageSharp.Tests/PixelFormats/HalfVector4Tests.cs
index 5744243a45..1d6b7195b0 100644
--- a/tests/ImageSharp.Tests/PixelFormats/HalfVector4Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/HalfVector4Tests.cs
@@ -188,5 +188,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void HalfVector4_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(HalfVector4);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 0, 65535, 0);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/NormalizedByte2Tests.cs b/tests/ImageSharp.Tests/PixelFormats/NormalizedByte2Tests.cs
index 418e89ecc4..d727fd9520 100644
--- a/tests/ImageSharp.Tests/PixelFormats/NormalizedByte2Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/NormalizedByte2Tests.cs
@@ -157,5 +157,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void NormalizedByte2_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(NormalizedByte2);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 65535, 0, 65535);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/NormalizedByte4Tests.cs b/tests/ImageSharp.Tests/PixelFormats/NormalizedByte4Tests.cs
index 1a31b806b3..09b5b3e579 100644
--- a/tests/ImageSharp.Tests/PixelFormats/NormalizedByte4Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/NormalizedByte4Tests.cs
@@ -168,5 +168,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void NormalizedByte4_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(NormalizedByte4);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 65535, 0, 65535);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/NormalizedShort2Tests.cs b/tests/ImageSharp.Tests/PixelFormats/NormalizedShort2Tests.cs
index fc952a55c8..5a9d5a36e0 100644
--- a/tests/ImageSharp.Tests/PixelFormats/NormalizedShort2Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/NormalizedShort2Tests.cs
@@ -161,5 +161,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void NormalizedShort2_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(NormalizedShort2);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 65535, 0, 65535);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/NormalizedShort4Tests.cs b/tests/ImageSharp.Tests/PixelFormats/NormalizedShort4Tests.cs
index ead301c569..55e4b7d981 100644
--- a/tests/ImageSharp.Tests/PixelFormats/NormalizedShort4Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/NormalizedShort4Tests.cs
@@ -169,5 +169,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void NormalizedShort4_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(NormalizedShort4);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 65535, 0, 65535);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/Rg32Tests.cs b/tests/ImageSharp.Tests/PixelFormats/Rg32Tests.cs
index cbecda8d52..cc7969846b 100644
--- a/tests/ImageSharp.Tests/PixelFormats/Rg32Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/Rg32Tests.cs
@@ -128,5 +128,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void Rg32_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(Rg32);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 65535, 0, 65535);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/Rgb24Tests.cs b/tests/ImageSharp.Tests/PixelFormats/Rgb24Tests.cs
index 5ba21096ea..f86081404a 100644
--- a/tests/ImageSharp.Tests/PixelFormats/Rgb24Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/Rgb24Tests.cs
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
Assert.False(a.Equals(b));
Assert.False(a.Equals((object)b));
}
-
+
[Fact]
public void PackFromRgba32()
{
@@ -139,5 +139,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
Assert.Equal(new Bgra32(1, 2, 3, 255), bgra);
}
+
+ [Fact]
+ public void Rgb24_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(Rgb24);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 0, 65535, 65535);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/PixelFormats/Rgba1010102Tests.cs b/tests/ImageSharp.Tests/PixelFormats/Rgba1010102Tests.cs
index 361dd67b5c..9c28547dde 100644
--- a/tests/ImageSharp.Tests/PixelFormats/Rgba1010102Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/Rgba1010102Tests.cs
@@ -178,5 +178,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void Rgba1010102_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(Rgba1010102);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 0, 65535, 65535);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/Rgba32Tests.cs b/tests/ImageSharp.Tests/PixelFormats/Rgba32Tests.cs
index b8645d83ca..c41f075ef9 100644
--- a/tests/ImageSharp.Tests/PixelFormats/Rgba32Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/Rgba32Tests.cs
@@ -305,5 +305,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void Rgba32_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(Rgba32);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 0, 65535, 0);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/PixelFormats/Rgba64Tests.cs b/tests/ImageSharp.Tests/PixelFormats/Rgba64Tests.cs
index d8d6bcf8bd..b10fecb5f6 100644
--- a/tests/ImageSharp.Tests/PixelFormats/Rgba64Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/Rgba64Tests.cs
@@ -150,5 +150,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void Rgba64_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(Rgba64);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 0, 65535, 0);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/RgbaVectorTests.cs b/tests/ImageSharp.Tests/PixelFormats/RgbaVectorTests.cs
index 1dd280bee4..73f2dd1263 100644
--- a/tests/ImageSharp.Tests/PixelFormats/RgbaVectorTests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/RgbaVectorTests.cs
@@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
using SixLabors.ImageSharp.PixelFormats;
using Xunit;
-namespace SixLabors.ImageSharp.Tests
+namespace SixLabors.ImageSharp.Tests.PixelFormats
{
///
/// Tests the struct.
@@ -126,5 +126,21 @@ namespace SixLabors.ImageSharp.Tests
Assert.Equal(3, ordered[2]);
Assert.Equal(4, ordered[3]);
}
+
+ [Fact]
+ public void RgbaVector_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(RgbaVector);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 0, 65535, 0);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/PixelFormats/Short2Tests.cs b/tests/ImageSharp.Tests/PixelFormats/Short2Tests.cs
index b38c33b2a0..bfaf64204f 100644
--- a/tests/ImageSharp.Tests/PixelFormats/Short2Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/Short2Tests.cs
@@ -169,5 +169,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void Short2_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(Short2);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 65535, 0, 65535);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/Short4Tests.cs b/tests/ImageSharp.Tests/PixelFormats/Short4Tests.cs
index 097a533316..f9e2f4b588 100644
--- a/tests/ImageSharp.Tests/PixelFormats/Short4Tests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/Short4Tests.cs
@@ -205,5 +205,21 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
// assert
Assert.Equal(expected, actual);
}
+
+ [Fact]
+ public void Short4_PackFromRgba64_ToRgba64()
+ {
+ // arrange
+ var input = default(Short4);
+ var actual = default(Rgba64);
+ var expected = new Rgba64(65535, 0, 65535, 0);
+
+ // act
+ input.PackFromRgba64(expected);
+ input.ToRgba64(ref actual);
+
+ // assert
+ Assert.Equal(expected, actual);
+ }
}
}