Bugfix in sRGB->CIE's 1931 XYZ conversion

Author: castarco

ColorSharp.sln

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

ColorSharp/ColorSharp.csproj

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

ColorSharp/ColorSharp.nuspec

@@ -10,7 +10,11 @@
     <projectUrl>https://github.com/Litipk/ColorSharp</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
-    <releaseNotes>Bugfixes in RegularLightSpectrum</releaseNotes>
+    <releaseNotes>
+      - Improved documentation
+      - Minor cleanups
+      - Bugfix in sRGB -> CIE's 1931 XYZ conversion
+    </releaseNotes>
     <copyright>Copyright 2014</copyright>
     <tags>Light Color Colour CIEXYZ CIExyY sRGB</tags>
   </metadata>

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.5.2.*")]
+[assembly: AssemblyVersion ("0.6.0.*")]
 
 // 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/SRGB.cs

@@ -74,17 +74,18 @@ public SRGB (double R, double G, double B, AConvertibleColor dataSource=null) :
 		 */
 			public CIEXYZ ToCIEXYZ (ConversionStrategy strategy=ConversionStrategy.Default)
 			{
-				// Linear transformation
-				double X = R * 0.412424 + G * 0.357579 + B * 0.180464;
-				double Y = R * 0.212656 + G * 0.715158 + B * 0.072186;
-				double Z = R * 0.019332 + G * 0.119193 + B * 0.950444;
-
 				// Gamma correction
-				X = X > 0.04045 ? Math.Pow((X+0.055)/1.055, 2.4) : X/12.92 ;
-				Y = Y > 0.04045 ? Math.Pow((Y+0.055)/1.055, 2.4) : Y/12.92 ;
-				Z = Z > 0.04045 ? Math.Pow((Z+0.055)/1.055, 2.4) : Z/12.92 ;
-
-				return new CIEXYZ(X, Y, Z, DataSource ?? this);
+				double r = R > 0.04045 ? Math.Pow((R+0.055)/1.055, 2.4) : R/12.92 ;
+				double g = G > 0.04045 ? Math.Pow((G+0.055)/1.055, 2.4) : G/12.92 ;
+				double b = B > 0.04045 ? Math.Pow((B+0.055)/1.055, 2.4) : B/12.92 ;
+
+				return new CIEXYZ(
+					// Linear transformation
+					r * 0.412424 + g * 0.357579 + b * 0.180464,
+					r * 0.212656 + g * 0.715158 + b * 0.072186,
+					r * 0.019332 + g * 0.119193 + b * 0.950444,
+					DataSource ?? this
+				);
 			}
 
 			#endregion

ColorSharpTests/ColorSharpTests.csproj

@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Litipk.ColorSharpTests</RootNamespace>
     <AssemblyName>ColorSharpTests</AssemblyName>
-    <ReleaseVersion>0.5.2</ReleaseVersion>
+    <ReleaseVersion>0.6.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>