/*
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/>.
*/
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];
}
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));
/* 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);