No-op; fix GPL address and use the explicit-program-name version.

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

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 9367bc0a7ad4ec3309b8347c6f85ae17d5cb021c..b0ec161102d1f311e1e019c47793314c35166944 100644 (file)
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -24,23 +25,23 @@
  *  @brief ImageProxy and subclasses.
  */
 
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
 #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,7 +65,8 @@ 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;
+       virtual bool same (boost::shared_ptr<const ImageProxy>) const = 0;
+       virtual AVPixelFormat pixel_format () const = 0;
 };
 
 boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);