Fix assertion failure on making a VF, in certain circumstances.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 59283b14105148211b48647ece229c8f06e5c287..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 ());
@@ -465,6 +453,7 @@ check_one_frame (boost::filesystem::path dcp_dir, int64_t index, boost::filesyst
                        BOOST_REQUIRE_EQUAL (ref_image->data(0)[off], image->data(0)[off]);
                        BOOST_REQUIRE_EQUAL (ref_image->data(1)[off], image->data(1)[off]);
                        BOOST_REQUIRE_EQUAL (ref_image->data(2)[off], image->data(2)[off]);
+                       ++off;
                }
        }
 }
@@ -480,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("/");
+}