Adapt for changes to libdcp.

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 6b3d3b0f16a5a15c58d8664b3fa9064e54fca67d..ef36087e7449ab40b01668f4c275d60c294b8c45 100644 (file)
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -40,7 +40,7 @@ using boost::dynamic_pointer_cast;
 using dcp::raw_convert;
 
 ColourConversion::ColourConversion ()
-       : dcp::ColourConversion (dcp::ColourConversion::srgb_to_xyz)
+       : dcp::ColourConversion (dcp::ColourConversion::srgb_to_xyz ())
 {
        
 }

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 485ecbad7326a6348d8bc8ea4df6a5238419e47f..d43024128915d19046c1e6150cc87bcb31f20250 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -85,8 +85,8 @@ Config::Config ()
        _allowed_dcp_frame_rates.push_back (50);
        _allowed_dcp_frame_rates.push_back (60);
 
-       _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz));
-       _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz));
+       _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ()));
+       _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ()));
 
        reset_kdm_email ();
 }
@@ -183,8 +183,8 @@ Config::read ()
                }
        } catch (cxml::Error) {
                /* Probably failed to load an old-style ColourConversion tag; just give up */
-               _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz));
-               _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz));
+               _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ()));
+               _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ()));
        }
 
        list<cxml::NodePtr> cin = f.node_children ("Cinema");

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 5cf4704ea73585f4bcb306cfcfa82d7dec861e12..8973fba7e2786e5c818dd46ce87d9582b2e7fe99 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -208,7 +208,7 @@ VideoContent::set_default_colour_conversion (bool signal)
 {
        {
                boost::mutex::scoped_lock lm (_mutex);
-               _colour_conversion = ColourConversion (dcp::ColourConversion::srgb_to_xyz);
+               _colour_conversion = ColourConversion (dcp::ColourConversion::srgb_to_xyz ());
        }
 
        if (signal) {

diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index eb3e3c294f2432f19a1dce31384c920e422b1510..666fe83de014c0befbecfcacee9161179eec254a 100644 (file)
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -32,8 +32,8 @@ using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test1)
 {
-       ColourConversion A (dcp::ColourConversion::srgb_to_xyz);
-       ColourConversion B (dcp::ColourConversion::rec709_to_xyz);
+       ColourConversion A (dcp::ColourConversion::srgb_to_xyz ());
+       ColourConversion B (dcp::ColourConversion::rec709_to_xyz ());
 
        BOOST_CHECK_EQUAL (A.identifier(), "8b5a265a7c63c22a6a8fc871c64d6116");
        BOOST_CHECK_EQUAL (B.identifier(), "bc82e69f700d0426f2ae1848d05ed006");
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test1)
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test2)
 {
-       ColourConversion A (dcp::ColourConversion::srgb_to_xyz);
+       ColourConversion A (dcp::ColourConversion::srgb_to_xyz ());
        xmlpp::Document doc;
        xmlpp::Element* root = doc.create_root_node ("Test");
        A.as_xml (root);
@@ -72,7 +72,7 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test2)
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test3)
 {
-       ColourConversion A (dcp::ColourConversion::rec709_to_xyz);
+       ColourConversion A (dcp::ColourConversion::rec709_to_xyz ());
        xmlpp::Document doc;
        xmlpp::Element* root = doc.create_root_node ("Test");
        A.as_xml (root);