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];
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;
/* 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 (AV_PIX_FMT_RGB24, size, true));
delete magick_image;
- return _image;
+ return make_pair (_image, 0);
}
void
{
return AV_PIX_FMT_RGB24;
}
+
+size_t
+MagickImageProxy::memory_used () const
+{
+ size_t m = _blob.length();
+ if (_image) {
+ m += _image->memory_used();
+ }
+ return m;
+}