diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-04 14:12:49 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-04 14:12:49 +0000 |
| commit | 6d25faad09cec21a39fd81d140c57542eceb0a6f (patch) | |
| tree | f83cff098a4f2b5580f45323217559deae453ddb /src/lib | |
| parent | ec72668d88935635a01f602f0aa33bfa5a5c426e (diff) | |
Adapt for changes to libdcp.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/colour_conversion.cc | 2 | ||||
| -rw-r--r-- | src/lib/config.cc | 8 | ||||
| -rw-r--r-- | src/lib/video_content.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc index 6b3d3b0f1..ef36087e7 100644 --- 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 485ecbad7..d43024128 100644 --- 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 5cf4704ea..8973fba7e 100644 --- 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) { |