Put Image in dcpomatic:: to avoid Fastvideo name clash.

6 files changed, 12 insertions, 3 deletions

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 75cee85b3..6146bdeb0 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -47,6 +47,8 @@ using boost::thread;
 using boost::optional;
 using boost::weak_ptr;
 using dcp::Data;
+using namespace dcpomatic;
+
 
 void
 do_remote_encode (shared_ptr<DCPVideo> frame, EncodeServerDescription description, Data locally_encoded)
diff --git a/test/image_test.cc b/test/image_test.cc
index 5fccf6b9b..b45d9a97b 100644
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -34,6 +34,8 @@ using std::string;
 using std::list;
 using std::cout;
 using boost::shared_ptr;
+using namespace dcpomatic;
+
 
 BOOST_AUTO_TEST_CASE (aligned_image_test)
 {
diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index 2ed5db8ef..ddcb772d3 100644
--- a/test/make_black_test.cc
+++ b/test/make_black_test.cc
@@ -33,6 +33,8 @@ extern "C" {
 #include "lib/image.h"
 
 using std::list;
+using namespace dcpomatic;
+
 
 BOOST_AUTO_TEST_CASE (make_black_test)
 {
diff --git a/test/pixel_formats_test.cc b/test/pixel_formats_test.cc
index 952cc0af9..e8659cd7e 100644
--- a/test/pixel_formats_test.cc
+++ b/test/pixel_formats_test.cc
@@ -36,6 +36,7 @@ extern "C" {
 
 using std::list;
 using std::cout;
+using namespace dcpomatic;
 
 /** @struct Case
  *  @brief  A test case for pixel_formats_test.
diff --git a/test/test.cc b/test/test.cc
index 32d32f988..b044a2819 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -509,7 +509,7 @@ wait_for_jobs ()
 }
 
 void
-write_image (shared_ptr<const Image> image, boost::filesystem::path file, string format, MagickCore::StorageType pixel_type)
+write_image (shared_ptr<const dcpomatic::Image> image, boost::filesystem::path file, string format, MagickCore::StorageType pixel_type)
 {
 	using namespace MagickCore;
 
diff --git a/test/test.h b/test/test.h
index b620a68a0..0c1e304e0 100644
--- a/test/test.h
+++ b/test/test.h
@@ -26,9 +26,11 @@ DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 
 class Film;
-class Image;
 class Log;
 
+namespace dcpomatic {
+	class Image;
+}
 
 class TestPaths
 {
@@ -52,7 +54,7 @@ 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, MagickCore::StorageType pixel_type = MagickCore::CharPixel);
+extern void write_image (boost::shared_ptr<const dcpomatic::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);