X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmagick_image_proxy.cc;h=41aede6130d420b63dcc29ae843b9850dc55ce94;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=e5265187f57e3a67458d72a3a9f66e0133366f4b;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git

diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index e5265187f..41aede613 100644
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -21,44 +21,40 @@
 #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 "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);
 	}
-		
+
 	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];
@@ -68,14 +64,14 @@ MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> s
 }
 
 shared_ptr<Image>
-MagickImageProxy::image () const
+MagickImageProxy::image (optional<dcp::NoteHandler>) 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 {
@@ -104,22 +100,23 @@ MagickImageProxy::image () const
 	}
 
 	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));
 
 	/* 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
 		using namespace MagickCore;
+#else
+		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;
 }
 
@@ -147,6 +144,6 @@ MagickImageProxy::same (shared_ptr<const ImageProxy> other) const
 	if (_blob.length() != mp->_blob.length()) {
 		return false;
 	}
-	
+
 	return memcmp (_blob.data(), mp->_blob.data(), _blob.length()) == 0;
 }