Put Image into the dcpomatic namespace.

[dcpomatic.git] / test / test.h

diff --git a/test/test.h b/test/test.h
index 217b738f48d2144d81fba4f4dc589f7f745fd09f..c4baefe93f6722b4a5e03b13cfc9e477fbbc7572 100644 (file)
--- a/test/test.h
+++ b/test/test.h
@@ -27,7 +27,9 @@
 
 
 class Film;
-class Image;
+namespace dcpomatic {
+       class Image;
+}
 class Log;
 
 
@@ -56,7 +58,6 @@ private:
 
 
 extern bool wait_for_jobs ();
-extern void setup_test_config ();
 extern std::shared_ptr<Film> new_test_film (std::string);
 extern std::shared_ptr<Film> new_test_film2 (std::string, std::vector<std::shared_ptr<Content>> content = {}, Cleanup* cleanup = nullptr);
 extern void check_dcp (boost::filesystem::path, boost::filesystem::path);
@@ -70,7 +71,7 @@ extern void check_xml (boost::filesystem::path, boost::filesystem::path, std::li
 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 = 4);
 extern boost::filesystem::path test_film_dir (std::string);
-extern void write_image (std::shared_ptr<const Image> image, boost::filesystem::path file);
+extern void write_image (std::shared_ptr<const dcpomatic::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 (std::shared_ptr<Film> film);
@@ -91,6 +92,13 @@ private:
 };
 
 
+class ConfigRestorer
+{
+public:
+       ~ConfigRestorer();
+};
+
+
 namespace dcp {
 
 std::ostream& operator<< (std::ostream& s, dcp::Size i);