From: Carl Hetherington <cth@carlh.net>
Date: Sun, 31 Dec 2017 01:40:57 +0000 (+0000)
Subject: Try to fix Windows build.
X-Git-Tag: v2.11.32~2
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=25c7dba5ba74b03ac30abcd6da86c358c2581ac7

Try to fix Windows build.
---

diff --git a/test/test.cc b/test/test.cc
index 41b845f85..dff7800ce 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -236,8 +236,15 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check)
 	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_IMAGE_MAGICK
 	double const dist = ref_image.compare(check_image, Magick::RootMeanSquaredErrorMetric);
 	BOOST_CHECK_MESSAGE (dist < 0.001, ref << " differs from " << check << " " << dist);
+#else
+	BOOST_CHECK_MESSAGE (!ref_image.compare(check_image), ref << " differs from " << check);
+#endif
 }
 
 void