X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=colorspace_conversion_effect.cpp;h=3a8ad95c578c4626b190b7c04ce14b5c9c6e7770;hp=ea4390afe1ba63873c48fb7b956bc42bebdf8df5;hb=2ea2c3ea1dffa080c2f7221e50d703731e4aa9bb;hpb=f653817a84050a9b12c953eadd2999c8642ee025

diff --git a/colorspace_conversion_effect.cpp b/colorspace_conversion_effect.cpp
index ea4390a..3a8ad95 100644
--- a/colorspace_conversion_effect.cpp
+++ b/colorspace_conversion_effect.cpp
@@ -4,6 +4,7 @@
 
 #include "colorspace_conversion_effect.h"
 #include "util.h"
+#include "d65.h"
 
 using namespace Eigen;
 
@@ -17,9 +18,6 @@ static const double rec601_525_y_R = 0.340, rec601_525_y_G = 0.595, rec601_525_y
 static const double rec601_625_x_R = 0.640, rec601_625_x_G = 0.290, rec601_625_x_B = 0.150;
 static const double rec601_625_y_R = 0.330, rec601_625_y_G = 0.600, rec601_625_y_B = 0.060;
 
-// The D65 white point. Given in both Rec. 601 and 709.
-static const double d65_x = 0.3127, d65_y = 0.3290;
-
 ColorspaceConversionEffect::ColorspaceConversionEffect()
 	: source_space(COLORSPACE_sRGB),
 	  destination_space(COLORSPACE_sRGB)
@@ -59,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,
-		(1.0 - d65_x - d65_y) / d65_y
-	);
-
 	// We have, for each primary (example is with red):
 	//
 	//   X_R / (X_R + Y_R + Z_R) = x_R
@@ -107,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.