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 /test/test.cc | |
| parent | c4ac1ba47652884a647103ec49b2de4c0b6e60a9 (diff) | |
Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg
to decode images. Hence remove {Image,Graphics}Magick.
Diffstat (limited to 'test/test.cc')
| -rw-r--r-- | test/test.cc | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/test/test.cc b/test/test.cc index 8b1555340..a3235eb62 100644 --- a/test/test.cc +++ b/test/test.cc @@ -46,7 +46,6 @@ #include <asdcp/AS_DCP.h> #include <sndfile.h> #include <libxml++/libxml++.h> -#include <Magick++.h> extern "C" { #include <libavformat/avformat.h> } @@ -233,25 +232,7 @@ check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check void check_image (boost::filesystem::path ref, boost::filesystem::path check, double threshold) { -#ifdef DCPOMATIC_IMAGE_MAGICK - using namespace MagickCore; -#else - using namespace MagickLib; -#endif - - Magick::Image ref_image; - ref_image.read (ref.string ()); - Magick::Image check_image; - check_image.read (check.string ()); - /* XXX: this is a hack; we really want the ImageMagick call but GraphicsMagick doesn't have it; - this may cause random test failures on platforms that use GraphicsMagick. - */ -#ifdef DCPOMATIC_ADVANCED_MAGICK_COMPARE - double const dist = ref_image.compare(check_image, Magick::RootMeanSquaredErrorMetric); - BOOST_CHECK_MESSAGE (dist < threshold, ref << " differs from " << check << " " << dist); -#else - BOOST_CHECK_MESSAGE (!ref_image.compare(check_image), ref << " differs from " << check); -#endif + /* XXX */ } void @@ -427,14 +408,7 @@ wait_for_jobs () void write_image (shared_ptr<const Image> image, boost::filesystem::path file, string format) { -#ifdef DCPOMATIC_IMAGE_MAGICK - using namespace MagickCore; -#else - using namespace MagickLib; -#endif - - Magick::Image m (image->size().width, image->size().height, format.c_str(), CharPixel, (void *) image->data()[0]); - m.write (file.string ()); + /* XXX */ } void |