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

diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index 25935a839..fbb08b7b0 100644
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -43,7 +43,7 @@ MagickImageProxy::MagickImageProxy (boost::filesystem::path path)
 	boost::uintmax_t const size = boost::filesystem::file_size (path);
 	FILE* f = fopen_boost (path, "rb");
 	if (!f) {
-		throw OpenFileError (path, errno);
+		throw OpenFileError (path, errno, true);
 	}
 
 	uint8_t* data = new uint8_t[size];
@@ -67,7 +67,7 @@ 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);
 
@@ -102,6 +102,18 @@ 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 (AV_PIX_FMT_RGB24, size, true));