X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmagick_image_proxy.cc;h=fbb08b7b081229372ddb8fd83bc32f6607971e5e;hb=e3bb6707618b6a313a490f387bffbf0b6a064643;hp=d4d7e8aa6b8690a2c8945b5fae5111b3fc4c4b35;hpb=5f2a8e5892db9c0f578be0be29b9e157482cfed6;p=dcpomatic.git

diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index d4d7e8aa6..fbb08b7b0 100644
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -1,29 +1,32 @@
 /*
     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/>.
 
 */
 
-#include <Magick++.h>
 #include "magick_image_proxy.h"
 #include "cross.h"
 #include "exceptions.h"
 #include "dcpomatic_socket.h"
 #include "image.h"
 #include "compose.hpp"
+#include <Magick++.h>
+#include <libxml++/libxml++.h>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -36,19 +39,19 @@ using boost::dynamic_pointer_cast;
 MagickImageProxy::MagickImageProxy (boost::filesystem::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];
 	if (fread (data, 1, size, f) != size) {
 		delete[] data;
 		throw ReadFileError (path);
 	}
-	
+
 	fclose (f);
 	_blob.update (data, size);
 	delete[] data;
@@ -64,10 +67,10 @@ MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> s
 }
 
 shared_ptr<Image>
-MagickImageProxy::image (optional<dcp::NoteHandler>) const
+MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
 {
 	boost::mutex::scoped_lock lm (_mutex);
-	
+
 	if (_image) {
 		return _image;
 	}
@@ -99,18 +102,31 @@ MagickImageProxy::image (optional<dcp::NoteHandler>) 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) {
+		/* 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
+		   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		
+#endif
 		magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p);
 		p += _image->stride()[0];
 	}
@@ -144,6 +160,12 @@ MagickImageProxy::same (shared_ptr<const ImageProxy> other) const
 	if (_blob.length() != mp->_blob.length()) {
 		return false;
 	}
-	
+
 	return memcmp (_blob.data(), mp->_blob.data(), _blob.length()) == 0;
 }
+
+AVPixelFormat
+MagickImageProxy::pixel_format () const
+{
+	return AV_PIX_FMT_RGB24;
+}