Merge branch 'content-burn-subs' into 2.0

[dcpomatic.git] / test / colour_conversion_test.cc

diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index 35beed519507ac6269f9d2b8a5a4add1ad9aabed..f8c764975ad774a852235fb56c22f551d06fdcc8 100644 (file)
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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
@@ -35,8 +35,8 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test1)
        ColourConversion A (dcp::ColourConversion::srgb_to_xyz ());
        ColourConversion B (dcp::ColourConversion::rec709_to_xyz ());
 
-       BOOST_CHECK_EQUAL (A.identifier(), "751dd37378fb52502d356ec334a104c8");
-       BOOST_CHECK_EQUAL (B.identifier(), "149bc864d969ad7446fa18d62d1690b2");
+       BOOST_CHECK_EQUAL (A.identifier(), "9840c601d2775bf1b3847254bbaa36a9");
+       BOOST_CHECK_EQUAL (B.identifier(), "0778fbc5c87470f58820604a66992579");
 }
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test2)
@@ -56,15 +56,15 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test2)
                "    <A>0.055</A>\n"
                "    <B>12.92</B>\n"
                "  </InputTransferFunction>\n"
-               "  <Matrix i=\"0\" j=\"0\">0.4124564</Matrix>\n"
-               "  <Matrix i=\"0\" j=\"1\">0.3575761</Matrix>\n"
-               "  <Matrix i=\"0\" j=\"2\">0.1804375</Matrix>\n"
-               "  <Matrix i=\"1\" j=\"0\">0.2126729</Matrix>\n"
-               "  <Matrix i=\"1\" j=\"1\">0.7151522</Matrix>\n"
-               "  <Matrix i=\"1\" j=\"2\">0.072175</Matrix>\n"
-               "  <Matrix i=\"2\" j=\"0\">0.0193339</Matrix>\n"
-               "  <Matrix i=\"2\" j=\"1\">0.119192</Matrix>\n"
-               "  <Matrix i=\"2\" j=\"2\">0.9503041</Matrix>\n"
+               "  <YUVToRGB>0</YUVToRGB>\n"
+               "  <RedX>0.64</RedX>\n"
+               "  <RedY>0.33</RedY>\n"
+               "  <GreenX>0.3</GreenX>\n"
+               "  <GreenY>0.6</GreenY>\n"
+               "  <BlueX>0.15</BlueX>\n"
+               "  <BlueY>0.06</BlueY>\n"
+               "  <WhiteX>0.3127</WhiteX>\n"
+               "  <WhiteY>0.329</WhiteY>\n"
                "  <OutputGamma>2.6</OutputGamma>\n"
                "</Test>\n"
                );
@@ -82,20 +82,20 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test3)
                "<Test>\n"
                "  <InputTransferFunction>\n"
                "    <Type>ModifiedGamma</Type>\n"
-               "    <Power>2.4</Power>\n"
+               "    <Power>2.222222222222222</Power>\n"
                "    <Threshold>0.081</Threshold>\n"
                "    <A>0.099</A>\n"
                "    <B>4.5</B>\n"
                "  </InputTransferFunction>\n"
-               "  <Matrix i=\"0\" j=\"0\">0.4124564</Matrix>\n"
-               "  <Matrix i=\"0\" j=\"1\">0.3575761</Matrix>\n"
-               "  <Matrix i=\"0\" j=\"2\">0.1804375</Matrix>\n"
-               "  <Matrix i=\"1\" j=\"0\">0.2126729</Matrix>\n"
-               "  <Matrix i=\"1\" j=\"1\">0.7151522</Matrix>\n"
-               "  <Matrix i=\"1\" j=\"2\">0.072175</Matrix>\n"
-               "  <Matrix i=\"2\" j=\"0\">0.0193339</Matrix>\n"
-               "  <Matrix i=\"2\" j=\"1\">0.119192</Matrix>\n"
-               "  <Matrix i=\"2\" j=\"2\">0.9503041</Matrix>\n"
+               "  <YUVToRGB>1</YUVToRGB>\n"
+               "  <RedX>0.64</RedX>\n"
+               "  <RedY>0.33</RedY>\n"
+               "  <GreenX>0.3</GreenX>\n"
+               "  <GreenY>0.6</GreenY>\n"
+               "  <BlueX>0.15</BlueX>\n"
+               "  <BlueY>0.06</BlueY>\n"
+               "  <WhiteX>0.3127</WhiteX>\n"
+               "  <WhiteY>0.329</WhiteY>\n"
                "  <OutputGamma>2.6</OutputGamma>\n"
                "</Test>\n"
                );