Update for change to default Rec. 601/709 gamma.

diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index f8c764975ad774a852235fb56c22f551d06fdcc8..da6600f08abc58b042b16ea357dcbb48852dc45b 100644 (file)
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test1)
        ColourConversion B (dcp::ColourConversion::rec709_to_xyz ());
 
        BOOST_CHECK_EQUAL (A.identifier(), "9840c601d2775bf1b3847254bbaa36a9");
-       BOOST_CHECK_EQUAL (B.identifier(), "0778fbc5c87470f58820604a66992579");
+       BOOST_CHECK_EQUAL (B.identifier(), "58151ac92fdf333663a62c9a8ba5c5f4");
 }
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test2)
@@ -81,11 +81,8 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test3)
                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                "<Test>\n"
                "  <InputTransferFunction>\n"
-               "    <Type>ModifiedGamma</Type>\n"
-               "    <Power>2.222222222222222</Power>\n"
-               "    <Threshold>0.081</Threshold>\n"
-               "    <A>0.099</A>\n"
-               "    <B>4.5</B>\n"
+               "    <Type>Gamma</Type>\n"
+               "    <Gamma>2.2</Gamma>\n"
                "  </InputTransferFunction>\n"
                "  <YUVToRGB>1</YUVToRGB>\n"
                "  <RedX>0.64</RedX>\n"

diff --git a/test/data b/test/data
index c710f266d188cd7b933506b2973c97b967f33329..dd316a1ba7d7d7076489ff3e6ad29bb99322acf0 160000 (submodule)
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit c710f266d188cd7b933506b2973c97b967f33329
+Subproject commit dd316a1ba7d7d7076489ff3e6ad29bb99322acf0

diff --git a/test/recover_test.cc b/test/recover_test.cc
index ef60a56ab99704f6c92d25b92e6ebce1b011d858..a70357e94d1709a094416c93182009efec01473b 100644 (file)
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE (recover_test)
        film->make_dcp ();
        wait_for_jobs ();
 
-       boost::filesystem::path const video = "build/test/recover_test/video/185_2K_0e7cded8bd5cb8143184fc7729be136e_24_100000000_P_S_3D.mxf";
+       boost::filesystem::path const video = "build/test/recover_test/video/185_2K_961f053444e90c5ddbf978eb0ebfa772_24_100000000_P_S_3D.mxf";
 
        boost::filesystem::copy_file (
                video,

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 1837d816b4a7ff7a05735148c04ec22773f4f575..4bf2e59ea248a774918b8575e1deffdee34b7087 100644 (file)
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -108,8 +108,6 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
                                j != boost::filesystem::directory_iterator ();
                                ++j) {
 
-                               std::cout << j->path().string() << "\n";
-
                                if (boost::algorithm::starts_with (j->path().leaf().string(), "sub_")) {
                                        list<string> ignore;
                                        ignore.push_back ("SubtitleID");