Rename dcp::ColourConversion::*_to_xyz() -> _to_dcp()

4 files changed, 14 insertions, 15 deletions

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 588a388e3..4d02c58bd 100644
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -55,7 +55,7 @@ vector<PresetColourConversion> PresetColourConversion::_presets;
 
 
 ColourConversion::ColourConversion()
-	: dcp::ColourConversion(dcp::ColourConversion::srgb_to_xyz())
+	: dcp::ColourConversion(dcp::ColourConversion::srgb_to_dcp())
 {
 
 }
@@ -285,13 +285,13 @@ operator==(PresetColourConversion const & a, PresetColourConversion const & b)
 void
 PresetColourConversion::setup_colour_conversion_presets()
 {
-	_presets.push_back(PresetColourConversion(_("sRGB"), "srgb", dcp::ColourConversion::srgb_to_xyz()));
-	_presets.push_back(PresetColourConversion(_("Rec. 601"), "rec601", dcp::ColourConversion::rec601_to_xyz()));
-	_presets.push_back(PresetColourConversion(_("Rec. 709"), "rec709", dcp::ColourConversion::rec709_to_xyz()));
-	_presets.push_back(PresetColourConversion(_("P3"), "p3", dcp::ColourConversion::p3_to_xyz()));
-	_presets.push_back(PresetColourConversion(_("Rec. 1886"), "rec1886", dcp::ColourConversion::rec1886_to_xyz()));
-	_presets.push_back(PresetColourConversion(_("Rec. 2020"), "rec2020", dcp::ColourConversion::rec2020_to_xyz()));
-	_presets.push_back(PresetColourConversion(_("S-Gamut3/S-Log3"), "sgamut3", dcp::ColourConversion::s_gamut3_to_xyz()));
+	_presets.push_back(PresetColourConversion(_("sRGB"), "srgb", dcp::ColourConversion::srgb_to_dcp()));
+	_presets.push_back(PresetColourConversion(_("Rec. 601"), "rec601", dcp::ColourConversion::rec601_to_dcp()));
+	_presets.push_back(PresetColourConversion(_("Rec. 709"), "rec709", dcp::ColourConversion::rec709_to_dcp()));
+	_presets.push_back(PresetColourConversion(_("P3"), "p3", dcp::ColourConversion::p3_to_dcp()));
+	_presets.push_back(PresetColourConversion(_("Rec. 1886"), "rec1886", dcp::ColourConversion::rec1886_to_dcp()));
+	_presets.push_back(PresetColourConversion(_("Rec. 2020"), "rec2020", dcp::ColourConversion::rec2020_to_dcp()));
+	_presets.push_back(PresetColourConversion(_("S-Gamut3/S-Log3"), "sgamut3", dcp::ColourConversion::s_gamut3_to_dcp()));
 }
 
 PresetColourConversion
diff --git a/src/lib/image.cc b/src/lib/image.cc
index b1557bf47..d823c5dbe 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -33,7 +33,6 @@
 #include "memory_util.h"
 #include "rect.h"
 #include "timer.h"
-#include <dcp/rgb_xyz.h>
 #include <dcp/transfer_function.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
@@ -783,7 +782,7 @@ void
 alpha_blend_onto_xyz12le(TargetParams const& target, OtherRGBParams const& other, int red, int blue, std::function<float (OtherType*)> get, int value_divisor)
 {
 	auto const alpha_divisor = other.alpha_divisor();
-	auto conv = dcp::ColourConversion::srgb_to_xyz();
+	auto conv = dcp::ColourConversion::srgb_to_dcp();
 	double fast_matrix[9];
 	dcp::combined_rgb_to_xyz(conv, fast_matrix);
 	auto lut_in = conv.in()->double_lut(0, 1, 8, false);
diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 64a2d71cb..84eea856b 100644
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -502,7 +502,7 @@ GLVideoView::setup_shaders()
 	};
 
 	{
-		auto conversion = dcp::ColourConversion::rec709_to_xyz();
+		auto conversion = dcp::ColourConversion::rec709_to_dcp();
 		boost::numeric::ublas::matrix<double> matrix = conversion.xyz_to_rgb();
 		GLfloat gl_matrix[16];
 		ublas_to_gl(matrix, gl_matrix);
@@ -512,8 +512,8 @@ GLVideoView::setup_shaders()
 	}
 
 	{
-		auto xyz_rec709 = dcp::ColourConversion::rec709_to_xyz().xyz_to_rgb();
-		auto rec2020_xyz = dcp::ColourConversion::rec2020_to_xyz().rgb_to_xyz();
+		auto xyz_rec709 = dcp::ColourConversion::rec709_to_dcp().xyz_to_rgb();
+		auto rec2020_xyz = dcp::ColourConversion::rec2020_to_dcp().rgb_to_xyz();
 		auto product = boost::numeric::ublas::prod(xyz_rec709, rec2020_xyz);
 
 		GLfloat gl_matrix[16];
@@ -792,7 +792,7 @@ GLVideoView::set_image(shared_ptr<const PlayerVideo> pv)
 		check_error("glBufferSubData (subtitle)");
 	}
 
-	_rec2020 = pv->colour_conversion() && pv->colour_conversion()->about_equal(dcp::ColourConversion::rec2020_to_xyz(), 1e-6);
+	_rec2020 = pv->colour_conversion() && pv->colour_conversion()->about_equal(dcp::ColourConversion::rec2020_to_dcp(), 1e-6);
 
 	/* opt: where should these go? */
 	for (auto i = 0; i < 3; ++i) {
diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index b16ea641a..053ac1c84 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -253,7 +253,7 @@ SimpleVideoView::update ()
 
 	auto const pv = player_video();
 	_image = pv.first->image(force(AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, true);
-	if (pv.first->colour_conversion() && pv.first->colour_conversion()->about_equal(dcp::ColourConversion::rec2020_to_xyz(), 1e-6)) {
+	if (pv.first->colour_conversion() && pv.first->colour_conversion()->about_equal(dcp::ColourConversion::rec2020_to_dcp(), 1e-6)) {
 		_image = Image::ensure_alignment(_rec2020_filter_graph.get(_image->size(), _image->pixel_format())->process(_image).front(), Image::Alignment::COMPACT);
 	}