Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0

[libdcp.git] / src / colour_conversion.cc

diff --git a/src/colour_conversion.cc b/src/colour_conversion.cc
index 1fbed166c9b2b5fdfc0df6a5ec44395d9c76c70d..8c48c2e1f08f5abf93b580c71b68e59196987534 100644 (file)
--- a/src/colour_conversion.cc
+++ b/src/colour_conversion.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -51,7 +51,7 @@ ColourConversion const &
 ColourConversion::rec601_to_xyz ()
 {
        static ColourConversion* c = new ColourConversion (
-               shared_ptr<const TransferFunction> (new ModifiedGammaTransferFunction (1 / 0.45, 0.081, 0.099, 4.5)),
+               shared_ptr<const TransferFunction> (new GammaTransferFunction (2.2)),
                YUV_TO_RGB_REC601,
                Chromaticity (0.64, 0.33),
                Chromaticity (0.3, 0.6),
@@ -68,7 +68,7 @@ ColourConversion const &
 ColourConversion::rec709_to_xyz ()
 {
        static ColourConversion* c = new ColourConversion (
-               shared_ptr<const TransferFunction> (new ModifiedGammaTransferFunction (1 / 0.45, 0.081, 0.099, 4.5)),
+               shared_ptr<const TransferFunction> (new GammaTransferFunction (2.2)),
                YUV_TO_RGB_REC709,
                Chromaticity (0.64, 0.33),
                Chromaticity (0.3, 0.6),