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];
}
shared_ptr<Image>
-MagickImageProxy::image (optional<dcp::NoteHandler>) const
+MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
{
boost::mutex::scoped_lock lm (_mutex);
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));