Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / lib / image_proxy.h

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 39cbda27d85e4572c99480b0b921064775e10099..d6b3f878e74a5179483a67d843d9f69a47e9693d 100644 (file)
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -25,22 +25,19 @@
  */
 
 #include <dcp/types.h>
-#include <Magick++.h>
-#include <libxml++/libxml++.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
-#include <boost/filesystem.hpp>
+#include <boost/utility.hpp>
 
 class Image;
 class Socket;
 
-namespace cxml {
+namespace xmlpp {
        class Node;
 }
 
-namespace dcp {
-       class MonoPictureFrame;
-       class StereoPictureFrame;
+namespace cxml {
+       class Node;
 }
 
 /** @class ImageProxy
@@ -64,9 +61,7 @@ public:
        virtual void add_metadata (xmlpp::Node *) const = 0;
        virtual void send_binary (boost::shared_ptr<Socket>) const = 0;
        /** @return true if our image is definitely the same as another, false if it is probably not */
-       virtual bool same (boost::shared_ptr<const ImageProxy>) const {
-               return false;
-       }
+       virtual bool same (boost::shared_ptr<const ImageProxy>) const = 0;
 };
 
 boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);