From e31e8e2daf3c2f902a1187792c833025efd6913b Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 23 May 2018 13:15:26 +0100
Subject: Try to fix failure to load files with non-ASCII filenames into
 ImageMagick.

---
 src/lib/image_examiner.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 69becafdd..71f0ca41c 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "cross.h"
 #include "compose.hpp"
+#include "magick_image_proxy.h"
+#include "image.h"
 #include <dcp/openjpeg_image.h>
 #include <dcp/exceptions.h>
 #include <dcp/j2k.h>
@@ -65,9 +67,8 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
 		}
 		delete[] buffer;
 	} else {
-		Magick::Image* image = new Magick::Image (content->path(0).string());
-		_video_size = dcp::Size (image->columns(), image->rows());
-		delete image;
+		MagickImageProxy proxy(content->path(0));
+		_video_size = proxy.image().first->size();
 	}
 
 	if (content->still ()) {
-- 
cgit v1.2.3