X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.cc;h=ae12d7adb3570363304326250fe55474b3827039;hb=3799e91d126d243d41c44dcb0ca1bfa66b53a57e;hp=775a69eebac4779b69226f7a8f408f9ad19d43c2;hpb=05d90a3edda9c1f5e7499f0ce7b6617fe46ac54d;p=dcpomatic.git

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 775a69eeb..ae12d7adb 100644
--- 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,6 +18,7 @@
 
 */
 
+
 #include "image_content.h"
 #include "image_examiner.h"
 #include "film.h"
@@ -30,41 +31,43 @@
 #include "image.h"
 #include <dcp/openjpeg_image.h>
 #include <dcp/exceptions.h>
-#include <dcp/j2k.h>
+#include <dcp/j2k_transcode.h>
 #include <iostream>
 
 #include "i18n.h"
 
+
 using std::cout;
 using std::list;
 using std::sort;
-using boost::shared_ptr;
+using std::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)
 {
-	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 = boost::filesystem::file_size (path);
+		auto f = fopen_boost (path, "rb");
 		if (!f) {
 			throw FileError ("Could not open file for reading", path);
 		}
-		uint8_t* buffer = new uint8_t[size];
+		auto buffer = new uint8_t[size];
 		checked_fread (buffer, size, f, path);
 		fclose (f);
 		try {
 			_video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
-		} catch (dcp::DCPReadError& e) {
+		} 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));
-		_video_size = proxy.image().first->size();
+		_video_size = proxy.image(Image::Alignment::COMPACT).image->size();
 	}
 
 	if (content->still ()) {
@@ -74,12 +77,14 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
 	}
 }
 
+
 dcp::Size
 ImageExaminer::video_size () const
 {
 	return _video_size.get ();
 }
 
+
 optional<double>
 ImageExaminer::video_frame_rate () const
 {
@@ -89,9 +94,10 @@ ImageExaminer::video_frame_rate () const
 	}
 
 	/* Don't know */
-	return optional<double> ();
+	return {};
 }
 
+
 bool
 ImageExaminer::yuv () const
 {