On reflection showing CCAPs over the main picture doesn't make much sense.

[dcpomatic.git] / src / lib / magick_image_proxy.cc

diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index b8255c9ad92b70f3706d4b3801a25b744a8572e0..b12a81db554e0ddbdb8ebe5d7532d2945bb2845a 100644 (file)
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -32,6 +32,8 @@
 
 using std::string;
 using std::cout;
+using std::pair;
+using std::make_pair;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
@@ -66,13 +68,13 @@ MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> s
        delete[] data;
 }
 
-shared_ptr<Image>
+pair<shared_ptr<Image>, int>
 MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
 {
        boost::mutex::scoped_lock lm (_mutex);
 
        if (_image) {
-               return _image;
+               return make_pair (_image, 0);
        }
 
        Magick::Image* magick_image = 0;
@@ -102,6 +104,22 @@ MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
                throw DecodeError (String::compose (_("Could not decode image file (%1)"), error));
        }
 
+       unsigned char const * data = static_cast<unsigned char const *>(_blob.data());
+       if (data[801] == 1 || magick_image->image()->colorspace == Magick::sRGBColorspace) {
+               /* Either:
+                  1.  The transfer characteristic in this file is "printing density"; in this case ImageMagick sets the colour space
+                      to LogColorspace, or
+                  2.  The file is sRGB.
+
+                  Empirically we find that in these cases if we subsequently call colorSpace(Magick::RGBColorspace) the colours
+                  are very wrong.  To prevent this, set the image colour space to RGB to stop the ::colorSpace call below doing
+                  anything.  See #1123 and others.
+               */
+               magick_image->image()->colorspace = Magick::RGBColorspace;
+       }
+
+       magick_image->colorSpace(Magick::RGBColorspace);
+
        dcp::Size size (magick_image->columns(), magick_image->rows());
 
        _image.reset (new Image (AV_PIX_FMT_RGB24, size, true));
@@ -121,7 +139,7 @@ MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
 
        delete magick_image;
 
-       return _image;
+       return make_pair (_image, 0);
 }
 
 void
@@ -157,3 +175,13 @@ MagickImageProxy::pixel_format () const
 {
        return AV_PIX_FMT_RGB24;
 }
+
+size_t
+MagickImageProxy::memory_used () const
+{
+       size_t m = _blob.length();
+       if (_image) {
+               m += _image->memory_used();
+       }
+       return m;
+}