Fix rounding of timecodes in at least some cases (#323).

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

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 498ff2e25dc026dad8000fd956ce0645a5bb71f5..a7999c02a86b5270b09dd50fd118c00280ef5761 100644 (file)
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -52,7 +52,14 @@ ImageDecoder::pass ()
                return;
        }
 
-       Magick::Image* magick_image = new Magick::Image (_image_content->path(_video_position).string ());
+       Magick::Image* magick_image = 0;
+       boost::filesystem::path const path = _image_content->path (_image_content->still() ? 0 : _video_position);
+       try {
+               magick_image = new Magick::Image (path.string ());
+       } catch (...) {
+               throw OpenFileError (path);
+       }
+       
        libdcp::Size size (magick_image->columns(), magick_image->rows());
 
        _image.reset (new Image (PIX_FMT_RGB24, size, true));