Rec 709 -> XYZ and sRGB -> XYZ matrices are, it seems, the same;

I'm getting this from fnordware DCIconverter.
https://github.com/fnordware/DCIconverter/blob/master/src/DCIconverter.cpp

diff --git a/src/colour_conversion.cc b/src/colour_conversion.cc
index 8a64c89bf9b2340ddfbe08b112d353b4855f6017..1795591514887ae659444e8bc74cf49764c5fb16 100644 (file)
--- a/src/colour_conversion.cc
+++ b/src/colour_conversion.cc
@@ -30,7 +30,7 @@ ColourConversion::srgb_to_xyz ()
 {
        static ColourConversion* c = new ColourConversion (
                shared_ptr<const TransferFunction> (new ModifiedGammaTransferFunction (false, 2.4, 0.04045, 0.055, 12.92)),
-               dcp::colour_matrix::srgb_to_xyz,
+               dcp::colour_matrix::rgb_to_xyz,
                shared_ptr<const TransferFunction> (new GammaTransferFunction (true, 2.6))
                );
        return *c;
@@ -52,7 +52,7 @@ ColourConversion::rec709_to_xyz ()
 {
        static ColourConversion* c = new ColourConversion (
                shared_ptr<const TransferFunction> (new ModifiedGammaTransferFunction (false, 2.4, 0.081, 0.099, 4.5)),
-               dcp::colour_matrix::rec709_to_xyz,
+               dcp::colour_matrix::rgb_to_xyz,
                shared_ptr<const TransferFunction> (new GammaTransferFunction (true, 2.6))
                );
        return *c;

diff --git a/src/colour_matrix.cc b/src/colour_matrix.cc
index 1a99732622568b22e064c9ef37f09f7a7f604be7..32683e8e503680a9502aaf190bbbb9767ca34420 100644 (file)
--- a/src/colour_matrix.cc
+++ b/src/colour_matrix.cc
@@ -29,14 +29,8 @@ double const dcp::colour_matrix::xyz_to_rgb[3][3] = {
        {  0.0556300804018974, -0.203976958990097, 1.05697154998779 }
 };
 
-double const dcp::colour_matrix::srgb_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}
 };
-
-double const dcp::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 }
-};

diff --git a/src/colour_matrix.h b/src/colour_matrix.h
index ce15051cbbd066545943310897b3bc70a671f1ec..fd89ed3ac8fd7ae8686b972e36086d3441371e48 100644 (file)
--- a/src/colour_matrix.h
+++ b/src/colour_matrix.h
@@ -22,8 +22,7 @@ namespace dcp {
 namespace colour_matrix {
 
 extern double const xyz_to_rgb[3][3];
-extern double const srgb_to_xyz[3][3];
-extern double const rec709_to_xyz[3][3];
+extern double const rgb_to_xyz[3][3];
 
 }