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

diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index 4adf8047f..fbb08b7b0 100644
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -1,62 +1,63 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    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 "util.h"
-#include "log.h"
+#include "dcpomatic_socket.h"
 #include "image.h"
-#include "log.h"
+#include "compose.hpp"
+#include <Magick++.h>
+#include <libxml++/libxml++.h>
+#include <iostream>
 
 #include "i18n.h"
 
-#define LOG_TIMING(...) _log->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING);
-
 using std::string;
+using std::cout;
 using boost::shared_ptr;
+using boost::optional;
+using boost::dynamic_pointer_cast;
 
-MagickImageProxy::MagickImageProxy (boost::filesystem::path path, shared_ptr<Log> log)
-	: ImageProxy (log)
+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;
 }
 
-MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> socket, shared_ptr<Log> log)
-	: ImageProxy (log)
+MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> socket)
 {
 	uint32_t const size = socket->read_uint32 ();
 	uint8_t* data = new uint8_t[size];
@@ -66,14 +67,14 @@ MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> s
 }
 
 shared_ptr<Image>
-MagickImageProxy::image () const
+MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
 {
+	boost::mutex::scoped_lock lm (_mutex);
+
 	if (_image) {
 		return _image;
 	}
 
-	LOG_TIMING ("[%1] MagickImageProxy begins decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length());
-
 	Magick::Image* magick_image = 0;
 	string error;
 	try {
@@ -101,23 +102,37 @@ MagickImageProxy::image () 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());
-	LOG_TIMING ("[%1] MagickImageProxy decode finished", boost::this_thread::get_id ());
 
-	_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_HAVE_MAGICKCORE_NAMESPACE
 		using namespace MagickCore;
+#endif
+#ifdef DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE
+		using namespace MagickLib;
+#endif
 		magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p);
 		p += _image->stride()[0];
 	}
 
 	delete magick_image;
 
-	LOG_TIMING ("[%1] MagickImageProxy completes decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length());
-
 	return _image;
 }
 
@@ -133,3 +148,24 @@ MagickImageProxy::send_binary (shared_ptr<Socket> socket) const
 	socket->write (_blob.length ());
 	socket->write ((uint8_t *) _blob.data (), _blob.length ());
 }
+
+bool
+MagickImageProxy::same (shared_ptr<const ImageProxy> other) const
+{
+	shared_ptr<const MagickImageProxy> mp = dynamic_pointer_cast<const MagickImageProxy> (other);
+	if (!mp) {
+		return false;
+	}
+
+	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;
+}