X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.h;h=c188a614fc03612e5e76d9b93622cef87072fb1f;hb=28111007e2e6fd62f5810be780706ae1618bd33f;hp=b620a68a0802195982b02ddf365a22563cb2e8ce;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d;p=dcpomatic.git

diff --git a/test/test.h b/test/test.h
index b620a68a0..c188a614f 100644
--- a/test/test.h
+++ b/test/test.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,12 +18,11 @@
 
 */
 
+
 #include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <Magick++.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <dcp/types.h>
 #include <boost/filesystem.hpp>
-#include <boost/shared_ptr.hpp>
+
 
 class Film;
 class Image;
@@ -33,16 +32,16 @@ class Log;
 class TestPaths
 {
 public:
-	static boost::filesystem::path private_data;
-	static boost::filesystem::path xsd;
+	static boost::filesystem::path private_data();
+	static boost::filesystem::path xsd();
 };
 
 extern bool wait_for_jobs ();
 extern void setup_test_config ();
-extern boost::shared_ptr<Film> new_test_film (std::string);
-extern boost::shared_ptr<Film> new_test_film2 (std::string);
+extern std::shared_ptr<Film> new_test_film (std::string);
+extern std::shared_ptr<Film> new_test_film2 (std::string);
 extern void check_dcp (boost::filesystem::path, boost::filesystem::path);
-extern void check_dcp (boost::filesystem::path, boost::shared_ptr<const Film>);
+extern void check_dcp (boost::filesystem::path, std::shared_ptr<const Film>);
 extern void check_file (boost::filesystem::path ref, boost::filesystem::path check);
 extern void check_wav_file (boost::filesystem::path ref, boost::filesystem::path check);
 extern void check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check);
@@ -50,21 +49,27 @@ extern bool mxf_atmos_files_same (boost::filesystem::path ref, boost::filesystem
 extern void check_xml (boost::filesystem::path, boost::filesystem::path, std::list<std::string>);
 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 void check_image (boost::filesystem::path, boost::filesystem::path, double threshold = 4);
 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, MagickCore::StorageType pixel_type = MagickCore::CharPixel);
-boost::filesystem::path dcp_file (boost::shared_ptr<const Film> film, std::string prefix);
+extern void write_image (std::shared_ptr<const Image> image, boost::filesystem::path file);
+boost::filesystem::path dcp_file (std::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 boost::filesystem::path subtitle_file (std::shared_ptr<Film> film);
 extern void make_random_file (boost::filesystem::path path, size_t size);
 
 class LogSwitcher
 {
 public:
-	LogSwitcher (boost::shared_ptr<Log> log);
+	LogSwitcher (std::shared_ptr<Log> log);
 	~LogSwitcher ();
 
 private:
-	boost::shared_ptr<Log> _old;
+	std::shared_ptr<Log> _old;
 };
 
+namespace dcp {
+
+std::ostream& operator<< (std::ostream& s, dcp::Size i);
+std::ostream& operator<< (std::ostream& s, Standard t);
+
+}