Fixed regression introduced in 0.9.2

Author: castarco

ColorSharp.sln

@@ -33,6 +33,6 @@ Global
 		$0.VersionControlPolicy = $2
 		$2.inheritsSet = Mono
 		description = A .Net/Mono library to handle color spaces (and light spectrums!)
-		version = 0.9.2
+		version = 0.9.3
 	EndGlobalSection
 EndGlobal

ColorSharp/ColorSharp.csproj

@@ -11,7 +11,7 @@
     <SignAssembly>true</SignAssembly>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>colorsharp.pub</AssemblyOriginatorKeyFile>
-    <ReleaseVersion>0.9.2</ReleaseVersion>
+    <ReleaseVersion>0.9.3</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

ColorSharp/Properties/AssemblyInfo.cs

@@ -46,7 +46,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion ("0.9.2.*")]
+[assembly: AssemblyVersion ("0.9.3.*")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.

ColorSharp/src/ColorSpaces/AConvertibleColor.cs

@@ -122,7 +122,7 @@ AConvertibleColor InnerConvertTo (Type t, ConversionStrategy strategy = Conversi
 			/**
 			 * <summary>Tells us if the object represents a valid color sample in current color space.</summary>
 			 */
-			public abstract bool IsInsideColorSpace ();
+			public abstract bool IsInsideColorSpace (bool highPrecision = false);
 
 			/**
 			 * <summary>Converts the color sample to a CIE's 1931 XYZ color sample.</summary>

ColorSharp/src/ColorSpaces/CIEUVW.cs

@@ -76,10 +76,10 @@ public CIEUVW (double U, double V, double W, AConvertibleColor dataSource=null)
 			/**
 			 * <inheritdoc />
 			 */
-			public override bool IsInsideColorSpace()
+			public override bool IsInsideColorSpace(bool highPrecision = false)
 			{
 				// TODO : Improve ?
-				return ToCIExyY ().IsInsideColorSpace ();
+				return ToCIExyY ().IsInsideColorSpace (highPrecision);
 			}
 
 			/**

ColorSharp/src/ColorSpaces/CIEXYZ.cs

@@ -83,9 +83,9 @@ public CIEXYZ (double X, double Y, double Z, AConvertibleColor dataSource=null)
 			/**
 			 * <inheritdoc />
 			 */
-			public override bool IsInsideColorSpace()
+			public override bool IsInsideColorSpace(bool highPrecision = false)
 			{
-				return ToCIExyY ().IsInsideColorSpace ();
+				return ToCIExyY ().IsInsideColorSpace (highPrecision);
 			}
 
 			/**

ColorSharp/src/ColorSpaces/CIExyY.cs

@@ -110,11 +110,17 @@ static void computeSharkfin(IList<double> mfX, IList<double> mfY, IList<double>
 
 				for (int i = 0; i < n; i++) {
 					var XYZ = mfX [i] + mfY [i] + mfZ [i];
-					Sharkfin [i] = new xyYPoint { x = mfX [i] / XYZ, y = mfY [i] / XYZ };
+
+					if (Math.Abs (XYZ) < double.Epsilon) {
+						Sharkfin [i] = new xyYPoint { x = 0.0, y = 0.0 };
+					} else {
+						Sharkfin [i] = new xyYPoint { x = mfX [i] / XYZ, y = mfY [i] / XYZ };
+					}
 				}
 
 				// Used to speedup the convex hull algorithm
 				SortedSharkfin = (xyYPoint[])Sharkfin.Clone();
+
 				Array.Sort (SortedSharkfin, new xyYPointComparer());
 			}
 
@@ -140,15 +146,23 @@ public CIExyY (double x, double y, double Y, AConvertibleColor dataSource=null)
 			/**
 			 * <inheritdoc />
 			 */
-			public override bool IsInsideColorSpace()
+			public override bool IsInsideColorSpace(bool highPrecision = false)
 			{
 				// Fast checks
 				if (y > 1.0 - x || y < (x - 0.25) * 0.5 || y < 0.4 - x * 4 || y >= 0.85)
 					return false;
 
-				xyYPoint[] points = new xyYPoint[SortedSharkfin5Nm.Length + 1];
-				Array.Copy (SortedSharkfin5Nm, 0, points, 0, SortedSharkfin5Nm.Length);
-				points[SortedSharkfin5Nm.Length] = new xyYPoint{x=x, y=y};
+				xyYPoint[] points;
+
+				if (highPrecision) {
+					points = new xyYPoint[SortedSharkfin1Nm.Length + 1];
+					Array.Copy (SortedSharkfin1Nm, 0, points, 0, SortedSharkfin1Nm.Length);
+					points [SortedSharkfin1Nm.Length] = new xyYPoint{ x = x, y = y };
+				} else {
+					points = new xyYPoint[SortedSharkfin5Nm.Length + 1];
+					Array.Copy (SortedSharkfin5Nm, 0, points, 0, SortedSharkfin5Nm.Length);
+					points [SortedSharkfin5Nm.Length] = new xyYPoint{ x = x, y = y };
+				}
 
 				xyYPoint[] convexHull = findConvexHull (points);
 
@@ -191,7 +205,7 @@ public override bool Equals(Object obj)
 				if (xyYObj == this) {
 					return true;
 				}
-				if (xyYObj == null || GetHashCode () != obj.GetHashCode ()) {
+				if (xyYObj == null) {
 					return false;
 				}
 

ColorSharp/src/ColorSpaces/SRGB.cs

@@ -84,7 +84,7 @@ public SRGB (double R, double G, double B, AConvertibleColor dataSource=null) :
 			/**
 			 * <inheritdoc />
 			 */
-			public override bool IsInsideColorSpace()
+			public override bool IsInsideColorSpace(bool highPrecision = false)
 			{
 				return (
 					0.0 <= R && R <= 1.0 &&

ColorSharp/src/LightSpectrums/RegularLightSpectrum.cs

@@ -173,7 +173,7 @@ public override double GetNextAmplitudeSample (double waveLength)
 			/**
 			 * <inheritdoc />
 			 */
-			public override bool IsInsideColorSpace()
+			public override bool IsInsideColorSpace(bool highPrecision = false)
 			{
 				if (MinWaveLength <= double.Epsilon)
 					return false;

ColorSharp/src/LightSpectrums/TabularLightSpectrum.cs

@@ -156,7 +156,7 @@ public override double GetNextAmplitudeSample (double waveLength)
 			/**
 			 * <inheritdoc />
 			 */
-			public override bool IsInsideColorSpace()
+			public override bool IsInsideColorSpace(bool highPrecision = false)
 			{
 				if (RawAmplitudes[0].Key <= double.Epsilon)
 					return false;