Put Image into the dcpomatic namespace.

7 files changed, 11 insertions, 6 deletions

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 0291b660f..70a0566bd 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -40,7 +40,6 @@ DCPOMATIC_ENABLE_WARNINGS
 
 class wxToggleButton;
 class FFmpegPlayer;
-class Image;
 class RGBPlusAlphaImage;
 class PlayerVideo;
 class Player;
diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 0a8235537..8642b4cd9 100644
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -64,6 +64,7 @@ using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
+using namespace dcpomatic;
 
 
 static void
diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index e64cb63db..57e682391 100644
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -56,7 +56,7 @@ public:
 	Texture& operator= (Texture const&) = delete;
 
 	void bind ();
-	void set (std::shared_ptr<const Image> image);
+	void set (std::shared_ptr<const dcpomatic::Image> image);
 
 private:
 	GLuint _name;
diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h
index cbb162023..ba7fc81f8 100644
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -47,7 +47,7 @@ private:
 	void timer ();
 
 	wxPanel* _panel;
-	std::shared_ptr<const Image> _image;
+	std::shared_ptr<const dcpomatic::Image> _image;
 	wxTimer _timer;
 	Position<int> _inter_position;
 	dcp::Size _inter_size;
diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 5353f213f..8fb26a521 100644
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -33,7 +33,9 @@
 #include <boost/thread.hpp>
 
 
-class Image;
+namespace dcpomatic {
+	class Image;
+}
 class wxWindow;
 class FilmViewer;
 class Player;
diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc
index 07b2955b3..37d411cb2 100644
--- a/src/wx/video_waveform_plot.cc
+++ b/src/wx/video_waveform_plot.cc
@@ -45,6 +45,7 @@ using std::weak_ptr;
 using namespace boost::placeholders;
 #endif
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 
 int const VideoWaveformPlot::_vertical_margin = 8;
diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h
index 36ec63d8a..dc35e54b4 100644
--- a/src/wx/video_waveform_plot.h
+++ b/src/wx/video_waveform_plot.h
@@ -31,7 +31,9 @@ namespace dcp {
 }
 
 class PlayerVideo;
-class Image;
+namespace dcpomatic {
+	class Image;
+}
 class Film;
 class FilmViewer;
 
@@ -61,7 +63,7 @@ private:
 
 	std::weak_ptr<const Film> _film;
 	std::shared_ptr<dcp::OpenJPEGImage> _image;
-	std::shared_ptr<const Image> _waveform;
+	std::shared_ptr<const dcpomatic::Image> _waveform;
 	bool _dirty = true;
 	bool _enabled = false;
 	int _component = 0;