Give filename (where possible) when image file decoding fails.

diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index b12a81db554e0ddbdb8ebe5d7532d2945bb2845a..cd5749bb67fd85735f73a2c97f951f69c8287499 100644 (file)
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -39,6 +39,7 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 
 MagickImageProxy::MagickImageProxy (boost::filesystem::path path)
+       : _path (path)
 {
        /* Read the file into a Blob */
 
@@ -101,7 +102,11 @@ MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
                /* If we failed both an auto-detect and a forced-Targa we give the error from
                   the auto-detect.
                */
-               throw DecodeError (String::compose (_("Could not decode image file (%1)"), error));
+               if (_path) {
+                       throw DecodeError (String::compose (_("Could not decode image file %1 (%2)"), _path->string(), error));
+               } else {
+                       throw DecodeError (String::compose (_("Could not decode image file (%1)"), error));
+               }
        }
 
        unsigned char const * data = static_cast<unsigned char const *>(_blob.data());

diff --git a/src/lib/magick_image_proxy.h b/src/lib/magick_image_proxy.h
index df90c7723594143687dab225bf8c1b531ff42b92..668f40736d2150e166bfdaa647dc58f117a86937 100644 (file)
--- a/src/lib/magick_image_proxy.h
+++ b/src/lib/magick_image_proxy.h
@@ -42,6 +42,10 @@ public:
 
 private:
        Magick::Blob _blob;
+       /** Path of a file that this image came from, if applicable; stored so that
+           failed-decode errors can give more detail.
+       */
+       boost::optional<boost::filesystem::path> _path;
        mutable boost::shared_ptr<Image> _image;
        mutable boost::mutex _mutex;
 };