X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.cc;h=6586a0d09bc5ad10ce09660a14d159ce5c695f6f;hb=8dabe7c3d815ff95c2fb3edc3cfce62434711fc4;hp=71f0ca41cab90db1d585c5fd2acf08218379e6d2;hpb=e31e8e2daf3c2f902a1187792c833025efd6913b;p=dcpomatic.git

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 71f0ca41c..6586a0d09 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -26,12 +26,11 @@
 #include "config.h"
 #include "cross.h"
 #include "compose.hpp"
-#include "magick_image_proxy.h"
+#include "ffmpeg_image_proxy.h"
 #include "image.h"
 #include <dcp/openjpeg_image.h>
 #include <dcp/exceptions.h>
 #include <dcp/j2k.h>
-#include <Magick++.h>
 #include <iostream>
 
 #include "i18n.h"
@@ -46,9 +45,6 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
 	: _film (film)
 	, _image_content (content)
 {
-#ifdef DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE
-	using namespace MagickCore;
-#endif
 	boost::filesystem::path path = content->path(0).string ();
 	if (valid_j2k_file (path)) {
 		boost::uintmax_t size = boost::filesystem::file_size (path);
@@ -57,18 +53,18 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
 			throw FileError ("Could not open file for reading", path);
 		}
 		uint8_t* buffer = new uint8_t[size];
-		fread (buffer, 1, size, f);
+		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 {
-		MagickImageProxy proxy(content->path(0));
-		_video_size = proxy.image().first->size();
+		FFmpegImageProxy proxy(content->path(0));
+		_video_size = proxy.image().image->size();
 	}
 
 	if (content->still ()) {