X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=c87f4e70b736d9c4e8d561fd8b9c1d0ca22a4fbc;hb=refs%2Ftags%2Fv2.15.18;hp=c7a8bbed6cc52fd4a0f0c8d17d1cabfc881dcab7;hpb=c66f02ac13e508deecea70898397f7e8a8d37d9e;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index c7a8bbed6..c87f4e70b 100644
--- 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 ());
@@ -481,3 +469,29 @@ dcp_file (shared_ptr<const Film> film, string prefix)
 	BOOST_REQUIRE (i != boost::filesystem::directory_iterator());
 	return i->path();
 }
+
+boost::filesystem::path
+subtitle_file (shared_ptr<Film> film)
+{
+	for (
+		boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->directory().get() / film->dcp_name (false));
+		i != boost::filesystem::directory_iterator ();
+		++i) {
+
+		if (boost::filesystem::is_directory (i->path ())) {
+			for (
+				boost::filesystem::directory_iterator j = boost::filesystem::directory_iterator (i->path ());
+				j != boost::filesystem::directory_iterator ();
+				++j) {
+
+				if (boost::algorithm::starts_with (j->path().leaf().string(), "sub_")) {
+					return j->path();
+				}
+			}
+		}
+	}
+
+	BOOST_REQUIRE (false);
+	/* Remove warning */
+	return boost::filesystem::path("/");
+}