Hopefully fix logarithmic DPX sources.

diff --git a/ChangeLog b/ChangeLog
index 5527deb6da6b513d2064aa479287a12b54b7b634..7e8f3e269023f06712a7b7e7ecacf7fc13d27259 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-07-04  Carl Hetherington  <cth@carlh.net>
+
+       * Tentative fix for incorrect colours with logarithmic DPX sources.
+
 2017-07-02  Carl Hetherington  <cth@carlh.net>
 
        * Updated fr_FR translation from Thierry Journet.

diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index b8255c9ad92b70f3706d4b3801a25b744a8572e0..e6a93d899ce5fa64a920d8b39d957d2bb474b15e 100644 (file)
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -102,6 +102,10 @@ MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
                throw DecodeError (String::compose (_("Could not decode image file (%1)"), error));
        }
 
+       if (magick_image->colorSpace() == Magick::LogColorspace) {
+               magick_image->colorSpace(Magick::RGBColorspace);
+       }
+
        dcp::Size size (magick_image->columns(), magick_image->rows());
 
        _image.reset (new Image (AV_PIX_FMT_RGB24, size, true));