From 15716c1d38136a9a4e382a536e174f956dac39cb Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Thu, 2 Dec 2021 22:53:11 +1100
Subject: [PATCH] Fix Color conversion for differing types

---
 src/ImageSharp/Color/Color.cs                 |  9 +++-
 .../Color/ColorTests.CastTo.cs                | 51 ++++++++++++++++---
 2 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/src/ImageSharp/Color/Color.cs b/src/ImageSharp/Color/Color.cs
index 7c21d62dd..cd0583361 100644
--- a/src/ImageSharp/Color/Color.cs
+++ b/src/ImageSharp/Color/Color.cs
@@ -270,8 +270,15 @@ namespace SixLabors.ImageSharp
                 return pixel;
             }
 
+            if (this.boxedHighPrecisionPixel is null)
+            {
+                pixel = default;
+                pixel.FromRgba64(this.data);
+                return pixel;
+            }
+
             pixel = default;
-            pixel.FromRgba64(this.data);
+            pixel.FromScaledVector4(this.boxedHighPrecisionPixel.ToScaledVector4());
             return pixel;
         }
 
diff --git a/tests/ImageSharp.Tests/Color/ColorTests.CastTo.cs b/tests/ImageSharp.Tests/Color/ColorTests.CastTo.cs
index 3003265ca..bfc290c2e 100644
--- a/tests/ImageSharp.Tests/Color/ColorTests.CastTo.cs
+++ b/tests/ImageSharp.Tests/Color/ColorTests.CastTo.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
 
 using Xunit;
@@ -90,17 +91,30 @@ namespace SixLabors.ImageSharp.Tests
             }
 
             [Fact]
-            public void GenericPixel()
+            public void Vector4Constructor()
             {
-                AssertGenericPixel(new RgbaVector(float.Epsilon, 2 * float.Epsilon, float.MaxValue, float.MinValue));
-                AssertGenericPixel(new Rgba64(1, 2, ushort.MaxValue, ushort.MaxValue - 1));
-                AssertGenericPixel(new Rgb48(1, 2, ushort.MaxValue - 1));
-                AssertGenericPixel(new La32(1, ushort.MaxValue - 1));
-                AssertGenericPixel(new L16(ushort.MaxValue - 1));
-                AssertGenericPixel(new Rgba32(1, 2, 255, 254));
+                // Act:
+                Color color = new(Vector4.One);
+
+                // Assert:
+                Assert.Equal(new RgbaVector(1, 1, 1, 1), color.ToPixel<RgbaVector>());
+                Assert.Equal(new Rgba64(65535, 65535, 65535, 65535), color.ToPixel<Rgba64>());
+                Assert.Equal(new Rgba32(255, 255, 255, 255), color.ToPixel<Rgba32>());
+                Assert.Equal(new L8(255), color.ToPixel<L8>());
+            }
+
+            [Fact]
+            public void GenericPixelRoundTrip()
+            {
+                AssertGenericPixelRoundTrip(new RgbaVector(float.Epsilon, 2 * float.Epsilon, float.MaxValue, float.MinValue));
+                AssertGenericPixelRoundTrip(new Rgba64(1, 2, ushort.MaxValue, ushort.MaxValue - 1));
+                AssertGenericPixelRoundTrip(new Rgb48(1, 2, ushort.MaxValue - 1));
+                AssertGenericPixelRoundTrip(new La32(1, ushort.MaxValue - 1));
+                AssertGenericPixelRoundTrip(new L16(ushort.MaxValue - 1));
+                AssertGenericPixelRoundTrip(new Rgba32(1, 2, 255, 254));
             }
 
-            private static void AssertGenericPixel<TPixel>(TPixel source)
+            private static void AssertGenericPixelRoundTrip<TPixel>(TPixel source)
                 where TPixel : unmanaged, IPixel<TPixel>
             {
                 // Act:
@@ -110,6 +124,27 @@ namespace SixLabors.ImageSharp.Tests
                 TPixel actual = color.ToPixel<TPixel>();
                 Assert.Equal(source, actual);
             }
+
+            [Fact]
+            public void GenericPixelDifferentPrecision()
+            {
+                AssertGenericPixelDifferentPrecision(new RgbaVector(1, 1, 1, 1), new Rgba64(65535, 65535, 65535, 65535));
+                AssertGenericPixelDifferentPrecision(new RgbaVector(1, 1, 1, 1), new Rgba32(255, 255, 255, 255));
+                AssertGenericPixelDifferentPrecision(new Rgba64(65535, 65535, 65535, 65535), new Rgba32(255, 255, 255, 255));
+                AssertGenericPixelDifferentPrecision(new Rgba32(255, 255, 255, 255), new L8(255));
+            }
+
+            private static void AssertGenericPixelDifferentPrecision<TPixel, TPixel2>(TPixel source, TPixel2 expected)
+                where TPixel : unmanaged, IPixel<TPixel>
+                where TPixel2 : unmanaged, IPixel<TPixel2>
+            {
+                // Act:
+                var color = Color.FromPixel(source);
+
+                // Assert:
+                TPixel2 actual = color.ToPixel<TPixel2>();
+                Assert.Equal(expected, actual);
+            }
         }
     }
 }