Merge master.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index c0f732c46d22c9f558e6c897772d3833cf51e39f..e43db71ef9c3ded8b833f3e94c289cc7be2b05fc 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -19,6 +19,7 @@
 
 #include <vector>
 #include <list>
+#include <Magick++.h>
 #include <libxml++/libxml++.h>
 #include <libdcp/dcp.h>
 #include "lib/config.h"
@@ -29,6 +30,7 @@
 #include "lib/job.h"
 #include "lib/cross.h"
 #include "lib/server_finder.h"
+#include "lib/image.h"
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
@@ -95,14 +97,14 @@ new_test_film (string name)
        return f;
 }
 
-static void
+void
 check_file (boost::filesystem::path ref, boost::filesystem::path check)
 {
        uintmax_t N = boost::filesystem::file_size (ref);
        BOOST_CHECK_EQUAL (N, boost::filesystem::file_size (check));
        FILE* ref_file = fopen (ref.c_str(), "rb");
        BOOST_CHECK (ref_file);
-       FILE* check_file = fopen (check.c_str(), "rb");
+       FILE* check_file = fopen_boost (check, "rb");
        BOOST_CHECK (check_file);
        
        int const buffer_size = 65536;
@@ -231,3 +233,12 @@ wait_for_jobs ()
 
        ui_signaller->ui_idle ();
 }
+
+void
+write_image (shared_ptr<const Image> image, boost::filesystem::path file)
+{
+       using namespace MagickCore;
+
+       Magick::Image m (image->size().width, image->size().height, "ARGB", CharPixel, (void *) image->data()[0]);
+       m.write (file.string ());
+}