diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-03 21:33:30 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-03 21:33:30 +0000 |
| commit | 9655ed4740f08899698052f232256fcf7b77c58e (patch) | |
| tree | 195e8f30ec4c5dd5beeecfb371acf7a3ceaa7898 /src/colour_conversion.cc | |
| parent | 986bb0acba0aa73fc2ac0190a32e8fa8c6e636b4 (diff) | |
Various fixes to XYZ/RGB transforms.
Diffstat (limited to 'src/colour_conversion.cc')
| -rw-r--r-- | src/colour_conversion.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/colour_conversion.cc b/src/colour_conversion.cc index 28edf9bc..f2e85e76 100644 --- a/src/colour_conversion.cc +++ b/src/colour_conversion.cc @@ -26,22 +26,21 @@ using boost::shared_ptr; using namespace dcp; ColourConversion ColourConversion::srgb_to_xyz ( - shared_ptr<const TransferFunction> (new ModifiedGammaTransferFunction (2.4, 0.04045, 0.055, 12.92)), + shared_ptr<const TransferFunction> (new ModifiedGammaTransferFunction (false, 2.4, 0.04045, 0.055, 12.92)), dcp::colour_matrix::srgb_to_xyz, - shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6)) + shared_ptr<const TransferFunction> (new GammaTransferFunction (true, 2.6)) ); -/* XXX: what sort of RGB is this...? */ -ColourConversion ColourConversion::xyz_to_rgb ( - shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6)), +ColourConversion ColourConversion::xyz_to_srgb ( + shared_ptr<const TransferFunction> (new GammaTransferFunction (false, 2.6)), dcp::colour_matrix::xyz_to_rgb, - shared_ptr<const TransferFunction> (new GammaTransferFunction (2.2)) + shared_ptr<const TransferFunction> (new ModifiedGammaTransferFunction (true, 2.4, 0.04045, 0.055, 12.92)) ); ColourConversion ColourConversion::rec709_to_xyz ( - shared_ptr<const TransferFunction> (new ModifiedGammaTransferFunction (2.4, 0.081, 0.099, 4.5)), + shared_ptr<const TransferFunction> (new ModifiedGammaTransferFunction (false, 2.4, 0.081, 0.099, 4.5)), dcp::colour_matrix::srgb_to_xyz, - shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6)) + shared_ptr<const TransferFunction> (new GammaTransferFunction (true, 2.6)) ); ColourConversion::ColourConversion ( |