diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-10-14 21:10:53 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-10-14 21:13:09 +0200 |
| commit | bb0e9d3993d3645b03775f1dc5b5ffec588b2c32 (patch) | |
| tree | 18143c3f0ba8a23cf572e5cc9184acb69255252a /src/lib | |
| parent | 535764f8c15a8b1b976f3e9edd7d7a8763f04e32 (diff) | |
Rename dcp::ColourConversion::*_to_xyz() -> _to_dcp()
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/colour_conversion.cc | 16 | ||||
| -rw-r--r-- | src/lib/image.cc | 3 |
2 files changed, 9 insertions, 10 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); |