From af3e8ed8382cdc35e361cdca1f735a379fce1317 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 28 Dec 2013 15:00:38 +0000 Subject: Remove unused Film::content_paths_valid; fix ImageDecoder to throw an OpenFileError when a file is missing so that it gets treated as missing content; rename Content::path_valid -> paths_valid. --- src/lib/image_decoder.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/lib/image_decoder.cc') diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc index fb6053ae5..a7999c02a 100644 --- 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 (_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)); -- cgit v1.2.3