From 46161c652589d2dc01767cc139123f0e625f279f Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Tue, 6 Feb 2018 23:38:42 +1100
Subject: [PATCH] DebugGuard + missing ApproximateComparer

---
 .../Implementation/Rgb/LinearRgbAndCieXyzConverterBase.cs     | 4 ++--
 .../Implementation/Rgb/LinearRgbToCieXyzConverter.cs          | 2 +-
 .../ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs  | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbAndCieXyzConverterBase.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbAndCieXyzConverterBase.cs
index 2ec79b353..b40a02af7 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbAndCieXyzConverterBase.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbAndCieXyzConverterBase.cs
@@ -11,7 +11,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
     internal abstract class LinearRgbAndCieXyzConverterBase
     {
         /// <summary>
-        /// Geturns the correct matrix to convert between the Rgb and CieXyz color space.
+        /// Returns the correct matrix to convert between the Rgb and CieXyz color space.
         /// </summary>
         /// <param name="workingSpace">The Rgb working space.</param>
         /// <returns>The <see cref="Matrix4x4"/> based on the chromaticity and working space.</returns>
@@ -53,7 +53,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
 
             Vector3 vector = Vector3.Transform(workingSpace.WhitePoint.Vector, inverseXyzMatrix);
 
-            // Use transposed Rows/Coloumns
+            // Use transposed Rows/Columns
             // TODO: Is there a built in method for this multiplication?
             return new Matrix4x4
             {
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToCieXyzConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToCieXyzConverter.cs
index 19d413037..bf36e252a 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToCieXyzConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToCieXyzConverter.cs
@@ -39,7 +39,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
         public CieXyz Convert(LinearRgb input)
         {
             DebugGuard.NotNull(input, nameof(input));
-            Guard.IsTrue(input.WorkingSpace.Equals(this.SourceWorkingSpace), nameof(input.WorkingSpace), "Input and source working spaces must be equal.");
+            DebugGuard.IsTrue(input.WorkingSpace.Equals(this.SourceWorkingSpace), nameof(input.WorkingSpace), "Input and source working spaces must be equal.");
 
             Vector3 vector = Vector3.Transform(input.Vector, this.conversionMatrix);
             return new CieXyz(vector);
diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs
index 6c3d579b4..aa1f9c574 100644
--- a/tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs
@@ -22,6 +22,8 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces
 
         private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
 
+        private static readonly ApproximateFloatComparer ApproximateComparer = new ApproximateFloatComparer(0.0001F);
+
         /// <summary>
         /// Tests conversion from <see cref="Cmyk"/> to <see cref="Rgb"/>.
         /// </summary>
@@ -38,7 +40,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces
             Rgb output = Converter.ToRgb(input);
 
             // Assert
-            Assert.Equal(Rgb.DefaultWorkingSpace, output.WorkingSpace);
+            Assert.Equal(Rgb.DefaultWorkingSpace, output.WorkingSpace, ApproximateComparer);
             Assert.Equal(r, output.R, FloatRoundingComparer);
             Assert.Equal(g, output.G, FloatRoundingComparer);
             Assert.Equal(b, output.B, FloatRoundingComparer);