summaryrefslogtreecommitdiff
path: root/src/lib/image_examiner.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-05-23 13:15:26 +0100
committerCarl Hetherington <cth@carlh.net>2018-05-23 13:15:26 +0100
commite31e8e2daf3c2f902a1187792c833025efd6913b (patch)
tree657b86b4925d75274624f1fc84d9a5c401ca4bf7 /src/lib/image_examiner.cc
parent50088fa4f26854849551807b40489e54c19c3dc6 (diff)
Try to fix failure to load files with non-ASCII filenames into ImageMagick.
Diffstat (limited to 'src/lib/image_examiner.cc')
-rw-r--r--src/lib/image_examiner.cc7
1 files changed, 4 insertions, 3 deletions
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 ()) {