summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-05-25 23:23:48 +0100
committerCarl Hetherington <cth@carlh.net>2014-05-25 23:23:48 +0100
commitc38648f30eb24c88e2af2927ba60acbf7e353fe8 (patch)
treec9cfa8f29f9da47bc70c4307b3a86c712d358083 /src
parentbc4705d14aed0ac281d140a718f67ae82cacbcca (diff)
More logging tweaks; missing noncopyable.
Diffstat (limited to 'src')
-rw-r--r--src/lib/image_proxy.cc6
-rw-r--r--src/lib/image_proxy.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index 9c4e7b8aa..230bfacad 100644
--- 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 fcbda7dd1..b499b3292 100644
--- 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);