using dcp::raw_convert;
ColourConversion::ColourConversion ()
- : dcp::ColourConversion (dcp::ColourConversion::srgb_to_xyz)
+ : dcp::ColourConversion (dcp::ColourConversion::srgb_to_xyz ())
{
}
_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 ();
}
}
} 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");
{
{
boost::mutex::scoped_lock lm (_mutex);
- _colour_conversion = ColourConversion (dcp::ColourConversion::srgb_to_xyz);
+ _colour_conversion = ColourConversion (dcp::ColourConversion::srgb_to_xyz ());
}
if (signal) {
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");
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);
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);