Add a comment.

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

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index 7c212be045a166704852e78f4453f1af06175a74..3851f88e78c79e873ee962110ff1a929747ba0e8 100644 (file)
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -121,10 +121,30 @@ MagickImageProxy::image () const
        LOG_TIMING ("[%1] MagickImageProxy begins decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length());
 
        Magick::Image* magick_image = 0;
+       string error;
        try {
                magick_image = new Magick::Image (_blob);
-       } catch (...) {
-               throw DecodeError (_("Could not decode image file"));
+       } catch (Magick::Exception& e) {
+               error = e.what ();
+       }
+
+       if (!magick_image) {
+               /* ImageMagick cannot auto-detect Targa files, it seems, so try here with an
+                  explicit format.  I can't find it documented that passing a (0, 0) geometry
+                  is allowed, but it seems to work.
+               */
+               try {
+                       magick_image = new Magick::Image (_blob, Magick::Geometry (0, 0), "TGA");
+               } catch (...) {
+
+               }
+       }
+
+       if (!magick_image) {
+               /* 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));
        }
 
        LOG_TIMING ("[%1] MagickImageProxy decode finished", boost::this_thread::get_id ());
@@ -136,7 +156,11 @@ MagickImageProxy::image () const
        /* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */
        uint8_t* p = _image->data()[0];
        for (int i = 0; i < size.height; ++i) {
+#ifdef DCPOMATIC_IMAGE_MAGICK          
                using namespace MagickCore;
+#else
+               using namespace MagickLib;
+#endif         
                magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p);
                p += _image->stride()[0];
        }