Use ImageMagick for test stuff.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 93cd5ee14de923030e22a9c32c2758133fc26e24..c87f4e70b736d9c4e8d561fd8b9c1d0ca22a4fbc 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -233,11 +233,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 ());
@@ -246,12 +242,8 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check, double
        /* 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
 }
 
 void
@@ -427,11 +419,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
+       using namespace MagickCore;
 
        Magick::Image m (image->size().width, image->size().height, format.c_str(), CharPixel, (void *) image->data()[0]);
        m.write (file.string ());
@@ -504,4 +492,6 @@ subtitle_file (shared_ptr<Film> film)
        }
 
        BOOST_REQUIRE (false);
+       /* Remove warning */
+       return boost::filesystem::path("/");
 }