summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-07-04 21:19:27 +0100
committerCarl Hetherington <cth@carlh.net>2017-07-04 21:19:27 +0100
commitbe4e480f2ac51805ffd6784217b91540dd804aba (patch)
tree46b245c77f4936351e3867c20e562d64bf1b7345
parent879d813ec17df061037d3e5122b985dabd585524 (diff)
Hopefully fix logarithmic DPX sources.
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/magick_image_proxy.cc4
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5527deb6d..7e8f3e269 100644
--- 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 b8255c9ad..e6a93d899 100644
--- 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));