From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 3 Nov 2012 15:16:13 +0000 (+0100)
Subject: Move the XYZ (Y=1) definition of D65 to d65.h.
X-Git-Tag: 1.0~213
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=2ea2c3ea1dffa080c2f7221e50d703731e4aa9bb;ds=sidebyside

Move the XYZ (Y=1) definition of D65 to d65.h.
---

diff --git a/colorspace_conversion_effect.cpp b/colorspace_conversion_effect.cpp
index baced38..3a8ad95 100644
--- a/colorspace_conversion_effect.cpp
+++ b/colorspace_conversion_effect.cpp
@@ -57,14 +57,6 @@ Matrix3d get_xyz_matrix(Colorspace space)
 	double z_G = 1.0 - x_G - y_G;
 	double z_B = 1.0 - x_B - y_B;
 
-	// Find the XYZ coordinates of D65 (white point for both Rec. 601 and 709),
-	// normalized so that Y=1.
-	Vector3d d65_XYZ(
-		d65_x / d65_y,
-		1.0,
-		d65_z / d65_y
-	);
-
 	// We have, for each primary (example is with red):
 	//
 	//   X_R / (X_R + Y_R + Z_R) = x_R
@@ -105,6 +97,7 @@ Matrix3d get_xyz_matrix(Colorspace space)
 	temp(2,1) = z_G / y_G;
 	temp(2,2) = z_B / y_B;
 
+	Vector3d d65_XYZ(d65_X, d65_Y, d65_Z);
 	Vector3d Y_RGB = temp.inverse() * d65_XYZ;
 
 	// Now convert xyY -> XYZ.
diff --git a/d65.h b/d65.h
index 86f423b..8f1f3e7 100644
--- a/d65.h
+++ b/d65.h
@@ -9,5 +9,10 @@
 // The definition (in xyz space) is given, for instance, in both Rec. 601 and 709.
 static const double d65_x = 0.3127, d65_y = 0.3290, d65_z = 1.0 - d65_x - d65_y;
 
+// XYZ coordinates of D65, normalized so that Y=1.
+static const double d65_X = d65_x / d65_y;
+static const double d65_Y = 1.0;
+static const double d65_Z = d65_z / d65_y;
+
 #endif  // !defined(_D65_H)