X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_proxy.cc;h=16bd92f6ece1ea0f933cc0b09ec8a168533c0ece;hb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;hp=ec5b6655521a10a20ac46c12793772d1954f976d;hpb=2935d9d158cf35496a35107f9c4ab7d2929cf6c3;p=dcpomatic.git

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index ec5b66555..16bd92f6e 100644
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -18,8 +18,8 @@
 */
 
 #include <Magick++.h>
-#include <libdcp/util.h>
-#include <libdcp/raw_convert.h>
+#include <dcp/util.h>
+#include <dcp/raw_convert.h>
 #include "image_proxy.h"
 #include "image.h"
 #include "exceptions.h"
@@ -51,7 +51,7 @@ RawImageProxy::RawImageProxy (shared_ptr<Image> image, shared_ptr<Log> log)
 RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket, shared_ptr<Log> log)
 	: ImageProxy (log)
 {
-	libdcp::Size size (
+	dcp::Size size (
 		xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
 		);
 
@@ -69,8 +69,8 @@ void
 RawImageProxy::add_metadata (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text (N_("Raw"));
-	node->add_child("Width")->add_child_text (libdcp::raw_convert<string> (_image->size().width));
-	node->add_child("Height")->add_child_text (libdcp::raw_convert<string> (_image->size().height));
+	node->add_child("Width")->add_child_text (dcp::raw_convert<string> (_image->size().width));
+	node->add_child("Height")->add_child_text (dcp::raw_convert<string> (_image->size().height));
 }
 
 void
@@ -118,7 +118,7 @@ MagickImageProxy::image () const
 		return _image;
 	}
 
-	LOG_TIMING ("MagickImageProxy begins read and decode of %1 bytes", _blob.length());
+	LOG_TIMING ("[%1] MagickImageProxy begins decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length());
 
 	Magick::Image* magick_image = 0;
 	try {
@@ -127,7 +127,8 @@ MagickImageProxy::image () const
 		throw DecodeError (_("Could not decode image file"));
 	}
 
-	libdcp::Size size (magick_image->columns(), magick_image->rows());
+	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));
 
@@ -147,7 +148,7 @@ MagickImageProxy::image () const
 
 	delete magick_image;
 
-	LOG_TIMING ("MagickImageProxy completes read and decode of %1 bytes", _blob.length());
+	LOG_TIMING ("[%1] MagickImageProxy completes decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length());
 
 	return _image;
 }