Supporters update.

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

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index acbf55696271daa84588b179debdb60bcae0e439..15a0b043d56543c8451cfd243c27204afc336f16 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -19,18 +19,19 @@
 */
 
 
-#include "image_content.h"
-#include "image_examiner.h"
-#include "film.h"
-#include "job.h"
-#include "exceptions.h"
+#include "compose.hpp"
 #include "config.h"
 #include "cross.h"
-#include "compose.hpp"
+#include "exceptions.h"
 #include "ffmpeg_image_proxy.h"
+#include "film.h"
 #include "image.h"
+#include "image_content.h"
+#include "image_examiner.h"
+#include "job.h"
 #include <dcp/openjpeg_image.h>
 #include <dcp/exceptions.h>
+#include <dcp/filesystem.h>
 #include <dcp/j2k_transcode.h>
 #include <iostream>
 
@@ -39,8 +40,8 @@
 
 using std::cout;
 using std::list;
-using std::sort;
 using std::shared_ptr;
+using std::sort;
 using boost::optional;
 
 
@@ -50,24 +51,22 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
 {
        auto path = content->path(0);
        if (valid_j2k_file (path)) {
-               auto size = boost::filesystem::file_size (path);
-               auto f = fopen_boost (path, "rb");
+               auto size = dcp::filesystem::file_size(path);
+               dcp::File f(path, "rb");
                if (!f) {
                        throw FileError ("Could not open file for reading", path);
                }
-               auto buffer = new uint8_t[size];
-               checked_fread (buffer, size, f, path);
-               fclose (f);
+               std::vector<uint8_t> buffer(size);
+               f.checked_read(buffer.data(), size);
+               f.close();
                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 ()) {
@@ -78,10 +77,10 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
 }
 
 
-dcp::Size
+optional<dcp::Size>
 ImageExaminer::video_size () const
 {
-       return _video_size.get ();
+       return _video_size;
 }