Cleanup: use seconds() method.

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

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index acbf55696271daa84588b179debdb60bcae0e439..562a7c557a60028f16c305d32305f8c6b9a9b611 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -55,19 +55,17 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
                if (!f) {
                        throw FileError ("Could not open file for reading", path);
                }
-               auto buffer = new uint8_t[size];
-               checked_fread (buffer, size, f, path);
+               std::vector<uint8_t> buffer(size);
+               checked_fread (buffer.data(), size, f, path);
                fclose (f);
                try {
-                       _video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
+                       _video_size = dcp::decompress_j2k(buffer.data(), size, 0)->size();
                } catch (dcp::ReadError& e) {
-                       delete[] buffer;
                        throw DecodeError (String::compose (_("Could not decode JPEG2000 file %1 (%2)"), path, e.what ()));
                }
-               delete[] buffer;
        } else {
-               FFmpegImageProxy proxy(content->path(0), content->video->range());
-               _video_size = proxy.image().image->size();
+               FFmpegImageProxy proxy(content->path(0));
+               _video_size = proxy.image(Image::Alignment::COMPACT).image->size();
        }
 
        if (content->still ()) {