X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Ftest.h;h=8ccebb5feb8c5bed0f56ce3c6d539e0b23ead499;hp=5e030f0ccb3ad2af8dc5fa180e6f06c3af722439;hb=d0555983d175e76585b2409d982e09f444eab391;hpb=44b97d718fa4b487641a983fa0b6ae485470eef8

diff --git a/test/test.h b/test/test.h
index 5e030f0cc..8ccebb5fe 100644
--- a/test/test.h
+++ b/test/test.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,12 +18,19 @@
 
 */
 
+#include <Magick++.h>
 #include <boost/filesystem.hpp>
 
 class Film;
 class Image;
 
-extern boost::filesystem::path private_data;
+
+class TestPaths
+{
+public:
+	static boost::filesystem::path private_data;
+	static boost::filesystem::path xsd;
+};
 
 extern bool wait_for_jobs ();
 extern void setup_test_config ();
@@ -38,6 +45,8 @@ extern void check_file (boost::filesystem::path, boost::filesystem::path);
 extern void check_ffmpeg (boost::filesystem::path, boost::filesystem::path, int audio_tolerance);
 extern void check_image (boost::filesystem::path, boost::filesystem::path, double threshold = 0.01);
 extern boost::filesystem::path test_film_dir (std::string);
-extern void write_image (boost::shared_ptr<const Image> image, boost::filesystem::path file, std::string format);
+extern void write_image (boost::shared_ptr<const Image> image, boost::filesystem::path file, std::string format, MagickCore::StorageType pixel_type = MagickCore::CharPixel);
 boost::filesystem::path dcp_file (boost::shared_ptr<const Film> film, std::string prefix);
 void check_one_frame (boost::filesystem::path dcp, int64_t index, boost::filesystem::path ref);
+extern boost::filesystem::path subtitle_file (boost::shared_ptr<Film> film);
+extern void make_random_file (boost::filesystem::path path, size_t size);