Merge master.

[dcpomatic.git] / src / lib / image_proxy.cc

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index 9c4e7b8aaa1686c99d8a0a623d5f7220b607028c..16bd92f6ece1ea0f933cc0b09ec8a168533c0ece 100644 (file)
--- 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 ("[%1] MagickImageProxy begins read and decode of %2 bytes", boost::this_thread::get_id(), _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,9 +127,8 @@ MagickImageProxy::image () const
                throw DecodeError (_("Could not decode image file"));
        }
 
-       LOG_TIMING ("[%1] MagickImageProxy load and decode finished", boost::this_thread::get_id ());
-
-       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));
 
@@ -149,7 +148,7 @@ MagickImageProxy::image () const
 
        delete magick_image;
 
-       LOG_TIMING ("[%1] MagickImageProxy completes read and decode of %2 bytes", boost::this_thread::get_id(), _blob.length());
+       LOG_TIMING ("[%1] MagickImageProxy completes decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length());
 
        return _image;
 }