Fix non-variant build.

[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 6b1436918e21b286b39b5b3e9018dea010751f0d..cd5749bb67fd85735f73a2c97f951f69c8287499 100644 (file)
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -25,23 +26,27 @@
 #include "compose.hpp"
 #include <Magick++.h>
 #include <libxml++/libxml++.h>
+#include <iostream>
 
 #include "i18n.h"
 
 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;
 
 MagickImageProxy::MagickImageProxy (boost::filesystem::path path)
+       : _path (path)
 {
        /* Read the file into a Blob */
 
        boost::uintmax_t const size = boost::filesystem::file_size (path);
        FILE* f = fopen_boost (path, "rb");
        if (!f) {
-               throw OpenFileError (path);
+               throw OpenFileError (path, errno, true);
        }
 
        uint8_t* data = new uint8_t[size];
@@ -64,13 +69,13 @@ MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> s
        delete[] data;
 }
 
-shared_ptr<Image>
-MagickImageProxy::image (optional<dcp::NoteHandler>) const
+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;
@@ -97,19 +102,40 @@ MagickImageProxy::image (optional<dcp::NoteHandler>) const
                /* If we failed both an auto-detect and a forced-Targa we give the error from
                   the auto-detect.
                */
-               throw DecodeError (String::compose (_("Could not decode image file (%1)"), error));
+               if (_path) {
+                       throw DecodeError (String::compose (_("Could not decode image file %1 (%2)"), _path->string(), error));
+               } else {
+                       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 (PIX_FMT_RGB24, size, true));
+       _image.reset (new Image (AV_PIX_FMT_RGB24, size, true));
 
        /* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */
        uint8_t* p = _image->data()[0];
        for (int i = 0; i < size.height; ++i) {
-#ifdef DCPOMATIC_IMAGE_MAGICK
+#ifdef DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE
                using namespace MagickCore;
-#else
+#endif
+#ifdef DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE
                using namespace MagickLib;
 #endif
                magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p);
@@ -118,7 +144,7 @@ MagickImageProxy::image (optional<dcp::NoteHandler>) const
 
        delete magick_image;
 
-       return _image;
+       return make_pair (_image, 0);
 }
 
 void
@@ -148,3 +174,19 @@ MagickImageProxy::same (shared_ptr<const ImageProxy> other) const
 
        return memcmp (_blob.data(), mp->_blob.data(), _blob.length()) == 0;
 }
+
+AVPixelFormat
+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;
+}