Take ISDCF metadata from templates.

[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 55795910553f422564fe2656cdb76632aac247e9..0fd4a5edb2bb36b355f4fb18996394c3e87266b0 100644 (file)
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -103,13 +103,17 @@ MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
        }
 
        unsigned char const * data = static_cast<unsigned char const *>(_blob.data());
-       if (data[801] == 1) {
-               /* The transfer characteristic in this file is "printing density"; in this case ImageMagick sets the colour space
-                  to LogColorspace.  Empirically we find that if we subsequently call colorSpace(Magick::RGBColorspace) the colours
+       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.
                */
-               SetImageColorspace(magick_image->image(), Magick::RGBColorspace);
+               magick_image->image()->colorspace = Magick::RGBColorspace;
        }
 
        magick_image->colorSpace(Magick::RGBColorspace);
@@ -169,3 +173,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;
+}