diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-10-12 00:46:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-10-12 00:46:00 +0100 |
| commit | 72b11d5eb036651b6ff68edf3ed270e8fc52960f (patch) | |
| tree | c6b88de5c86696f186c93322d50fd954d09c9349 /src/lib/image_examiner.cc | |
| parent | c4ac1ba47652884a647103ec49b2de4c0b6e60a9 (diff) | |
Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg
to decode images. Hence remove {Image,Graphics}Magick.
Diffstat (limited to 'src/lib/image_examiner.cc')
| -rw-r--r-- | src/lib/image_examiner.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc index 71f0ca41c..26beeb363 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); @@ -67,7 +63,7 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag } delete[] buffer; } else { - MagickImageProxy proxy(content->path(0)); + FFmpegImageProxy proxy(content->path(0)); _video_size = proxy.image().first->size(); } |