More logging tweaks; missing noncopyable.

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index 9c4e7b8aaa1686c99d8a0a623d5f7220b607028c..230bfacadc51cfba2dcf6eeb76b281da95e895cd 100644 (file)
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -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,7 +127,7 @@ MagickImageProxy::image () const
                throw DecodeError (_("Could not decode image file"));
        }
 
-       LOG_TIMING ("[%1] MagickImageProxy load and decode finished", boost::this_thread::get_id ());
+       LOG_TIMING ("[%1] MagickImageProxy decode finished", boost::this_thread::get_id ());
 
        libdcp::Size size (magick_image->columns(), magick_image->rows());
 
@@ -149,7 +149,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;
 }

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index fcbda7dd1f6695f5c29c6f0623eb619991e5eeb5..b499b329283362788c778b40ccb33769f3e36ea8 100644 (file)
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -45,7 +45,7 @@ namespace cxml {
  *  the TIFF data TIFF until such a time that the actual image is needed.
  *  At this point, the class decodes the TIFF to an Image.
  */
-class ImageProxy
+class ImageProxy : public boost::noncopyable
 {
 public:
        ImageProxy (boost::shared_ptr<Log> log);