Small fixes and tidy-ups spotted by cppcheck.

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

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index d6c7d0502cebffb1f0be88e7770d0bfc683d1789..299f7f38d04f713aa185f45dae7119db7910bac4 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "cross.h"
 #include <dcp/xyz_frame.h>
+#include <dcp/exceptions.h>
 #include <Magick++.h>
 #include <iostream>
 
@@ -46,14 +47,19 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
        boost::filesystem::path path = content->path(0).string ();
        if (valid_j2k_file (path)) {
                boost::uintmax_t size = boost::filesystem::file_size (path);
-               uint8_t* buffer = new uint8_t[size];
                FILE* f = fopen_boost (path, "r");
                if (!f) {
                        throw FileError ("Could not open file for reading", path);
                }
+               uint8_t* buffer = new uint8_t[size];
                fread (buffer, 1, size, f);
                fclose (f);
-               _video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
+               try {
+                       _video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
+               } catch (dcp::DCPReadError& e) {
+                       delete[] buffer;
+                       throw DecodeError (String::compose (_("Could not decode JPEG2000 file %1 (%2)"), path, e.what ()));
+               }
                delete[] buffer;
        } else {
                Magick::Image* image = new Magick::Image (content->path(0).string());
@@ -65,7 +71,7 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
                _video_length = ContentTime::from_seconds (Config::instance()->default_still_length());
        } else {
                _video_length = ContentTime::from_frames (
-                       _image_content->number_of_paths (), video_frame_rate().get_value_or (0)
+                       _image_content->number_of_paths (), video_frame_rate().get_value_or (24)
                        );
        }
 }