Fix srgb_to_xyz and rec709_to_xyz to be the same (as they should be) and using Dennis Couzin's calculated values.

1 files changed, 10 insertions, 6 deletions

diff --git a/src/colour_matrix.cc b/src/colour_matrix.cc
index b633e384..732acc8c 100644
--- a/src/colour_matrix.cc
+++ b/src/colour_matrix.cc
@@ -29,14 +29,18 @@ double const libdcp::colour_matrix::xyz_to_rgb[3][3] = {
 	{  0.0556300804018974, -0.203976958990097, 1.05697154998779 }
 };
 
+/* These are the same, but kept as two separate variables for backwards compatibility;
+   the confusion is fixed in the 1.0 branch.
+*/
+
 double const libdcp::colour_matrix::srgb_to_xyz[3][3] = {
-	{0.4124564, 0.3575761, 0.1804375},
-	{0.2126729, 0.7151522, 0.0721750},
-	{0.0193339, 0.1191920, 0.9503041}
+	{ 0.4123908, 0.3575843, 0.1804808 },
+	{ 0.2126390, 0.7151687, 0.0721923 },
+	{ 0.0193308, 0.1191948, 0.9505322 }
 };
 
 double const libdcp::colour_matrix::rec709_to_xyz[3][3] = {
-	{ 0.412390799265959,  0.357584339383878, 0.180480788401834 },
-	{ 0.21263900587151,   0.715168678767756, 0.0721923153607337 },
-        { 0.0193308187155918, 0.119194779794626, 0.950532152249661 }
+	{ 0.4123908, 0.3575843, 0.1804808 },
+	{ 0.2126390, 0.7151687, 0.0721923 },
+	{ 0.0193308, 0.1191948, 0.9505322 }
 };