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_proxy.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_proxy.cc')
| -rw-r--r-- | src/lib/image_proxy.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc index 3a09cb8e8..e16fab063 100644 --- a/src/lib/image_proxy.cc +++ b/src/lib/image_proxy.cc @@ -20,7 +20,7 @@ #include "image_proxy.h" #include "raw_image_proxy.h" -#include "magick_image_proxy.h" +#include "ffmpeg_image_proxy.h" #include "j2k_image_proxy.h" #include "image.h" #include "exceptions.h" @@ -40,8 +40,8 @@ image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket) { if (xml->string_child("Type") == N_("Raw")) { return shared_ptr<ImageProxy> (new RawImageProxy (xml, socket)); - } else if (xml->string_child("Type") == N_("Magick")) { - return shared_ptr<MagickImageProxy> (new MagickImageProxy (xml, socket)); + } else if (xml->string_child("Type") == N_("FFmpeg")) { + return shared_ptr<FFmpegImageProxy> (new FFmpegImageProxy(xml, socket)); } else if (xml->string_child("Type") == N_("J2K")) { return shared_ptr<J2KImageProxy> (new J2KImageProxy (xml, socket)); } |