Supporters update.

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

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 69becafdd7566c18ea8e384edef8c74fdf7eb8ca..15a0b043d56543c8451cfd243c27204afc336f16 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,56 +18,55 @@
 
 */
 
+
+#include "compose.hpp"
+#include "config.h"
+#include "cross.h"
+#include "exceptions.h"
+#include "ffmpeg_image_proxy.h"
+#include "film.h"
+#include "image.h"
 #include "image_content.h"
 #include "image_examiner.h"
-#include "film.h"
 #include "job.h"
-#include "exceptions.h"
-#include "config.h"
-#include "cross.h"
-#include "compose.hpp"
 #include <dcp/openjpeg_image.h>
 #include <dcp/exceptions.h>
-#include <dcp/j2k.h>
-#include <Magick++.h>
+#include <dcp/filesystem.h>
+#include <dcp/j2k_transcode.h>
 #include <iostream>
 
 #include "i18n.h"
 
+
 using std::cout;
 using std::list;
+using std::shared_ptr;
 using std::sort;
-using boost::shared_ptr;
 using boost::optional;
 
+
 ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job>)
        : _film (film)
        , _image_content (content)
 {
-#ifdef DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE
-       using namespace MagickCore;
-#endif
-       boost::filesystem::path path = content->path(0).string ();
+       auto path = content->path(0);
        if (valid_j2k_file (path)) {
-               boost::uintmax_t size = boost::filesystem::file_size (path);
-               FILE* 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);
                }
-               uint8_t* buffer = new uint8_t[size];
-               fread (buffer, 1, size, f);
-               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 ();
-               } catch (dcp::DCPReadError& e) {
-                       delete[] buffer;
+                       _video_size = dcp::decompress_j2k(buffer.data(), size, 0)->size();
+               } catch (dcp::ReadError& e) {
                        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());
-               _video_size = dcp::Size (image->columns(), image->rows());
-               delete image;
+               FFmpegImageProxy proxy(content->path(0));
+               _video_size = proxy.image(Image::Alignment::COMPACT).image->size();
        }
 
        if (content->still ()) {
@@ -77,12 +76,14 @@ 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;
 }
 
+
 optional<double>
 ImageExaminer::video_frame_rate () const
 {
@@ -92,9 +93,10 @@ ImageExaminer::video_frame_rate () const
        }
 
        /* Don't know */
-       return optional<double> ();
+       return {};
 }
 
+
 bool
 ImageExaminer::yuv () const
 {