summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-02-17 20:03:30 +0000
committerCarl Hetherington <cth@carlh.net>2015-02-17 20:03:30 +0000
commite94c6239d1a88c5a6d2b6eef7fb0f5fc28cb8777 (patch)
tree1f79f67fd3f3f33b3047a440af37f2515e40d037
parent4f68d50abb5a83628482fd166e40f3b4b281166b (diff)
Use 2.222222 for the power in the modified Rec. 709 input gamma
correction, as per fnordware DCIconverter.
-rw-r--r--src/colour_conversion.cc2
-rw-r--r--test/colour_conversion_test.cc6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/colour_conversion.cc b/src/colour_conversion.cc
index 17955915..39799927 100644
--- a/src/colour_conversion.cc
+++ b/src/colour_conversion.cc
@@ -51,7 +51,7 @@ ColourConversion const &
ColourConversion::rec709_to_xyz ()
{
static ColourConversion* c = new ColourConversion (
- shared_ptr<const TransferFunction> (new ModifiedGammaTransferFunction (false, 2.4, 0.081, 0.099, 4.5)),
+ shared_ptr<const TransferFunction> (new ModifiedGammaTransferFunction (false, 1 / 0.45, 0.081, 0.099, 4.5)),
dcp::colour_matrix::rgb_to_xyz,
shared_ptr<const TransferFunction> (new GammaTransferFunction (true, 2.6))
);
diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index 7193a5ef..9111b918 100644
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -71,9 +71,9 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test2)
{
ColourConversion cc = ColourConversion::rec709_to_xyz ();
- check_modified_gamma (cc.in(), 8, 2.4, 0.081, 0.099, 4.5);
- check_modified_gamma (cc.in(), 12, 2.4, 0.081, 0.099, 4.5);
- check_modified_gamma (cc.in(), 16, 2.4, 0.081, 0.099, 4.5);
+ check_modified_gamma (cc.in(), 8, 1 / 0.45, 0.081, 0.099, 4.5);
+ check_modified_gamma (cc.in(), 12, 1 / 0.45, 0.081, 0.099, 4.5);
+ check_modified_gamma (cc.in(), 16, 1 / 0.45, 0.081, 0.099, 4.5);
check_gamma (cc.out(), 8, 1 / 2.6);
check_gamma (cc.out(), 12, 1 / 2.6);