Fix colour range in XYZ -> RGBA.

[libdcp.git] / src / colour_matrix.cc

diff --git a/src/colour_matrix.cc b/src/colour_matrix.cc
index c5c5027f3af3d7b62510cb617e97ce4eec966ac2..32683e8e503680a9502aaf190bbbb9767ca34420 100644 (file)
--- a/src/colour_matrix.cc
+++ b/src/colour_matrix.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,23 +19,17 @@
 
 #include "colour_matrix.h"
 
-/* sRGB color matrix for XYZ -> RGB.  This is the same as the one used by the Fraunhofer
+/* sRGB colour matrix for XYZ -> RGB.  This is the same as the one used by the Fraunhofer
    EasyDCP player, I think.
 */
 
-double const libdcp::colour_matrix::xyz_to_rgb[3][3] = {
+double const dcp::colour_matrix::xyz_to_rgb[3][3] = {
        {  3.24096989631653,   -1.5373831987381,  -0.498610764741898 },
        { -0.96924364566803,    1.87596750259399,  0.0415550582110882 },
        {  0.0556300804018974, -0.203976958990097, 1.05697154998779 }
 };
 
-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}
-};
-
-double const libdcp::colour_matrix::rec709_to_xyz[3][3] = {
+double const dcp::colour_matrix::rgb_to_xyz[3][3] = {
        {0.4124564, 0.3575761, 0.1804375},
        {0.2126729, 0.7151522, 0.0721750},
        {0.0193339, 0.1191920, 0.9503041}