Remove uses of boost::system::error_code::message(), which seem to cause the pure...

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

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 9e90b5bc8317cccd5d46b4c36912fd6872653337..204849ecf8bd1ddc3ca415d5152eb4085863816e 100644 (file)
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -49,12 +49,19 @@ ImageDecoder::pass ()
        }
 
        if (_image && _image_content->still ()) {
-               video (_image, true, _video_position * TIME_HZ / _video_content->video_frame_rate ());
+               video (_image, true, _video_position);
                ++_video_position;
                return false;
        }
 
-       Magick::Image* magick_image = new Magick::Image (_image_content->path (_image_content->still() ? 0 : _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));
@@ -75,7 +82,7 @@ ImageDecoder::pass ()
 
        delete magick_image;
 
-       video (_image, false, _video_position * TIME_HZ / _video_content->video_frame_rate ());
+       video (_image, false, _video_position);
        ++_video_position;
 
        return false;