Merge master.

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

diff --git a/src/lib/image.h b/src/lib/image.h
index 23b88dd7601066c022bb457f116b8c252c7be256..172250eb1bb253ffd6a87e9998951ca6b534a7c3 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -67,6 +67,7 @@ public:
        void make_transparent ();
        void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos);
        void copy (boost::shared_ptr<const Image> image, Position<int> pos);
+       void fade (float);
 
        void read_from_socket (boost::shared_ptr<Socket>);
        void write_to_socket (boost::shared_ptr<Socket>) const;
@@ -75,8 +76,10 @@ public:
                return _pixel_format;
        }
 
+       std::string digest () const;
+
 private:
-       friend class pixel_formats_test;
+       friend struct pixel_formats_test;
        
        void allocate ();
        void swap (Image &);
@@ -92,5 +95,6 @@ private:
 };
 
 extern PositionImage merge (std::list<PositionImage> images);
+extern bool operator== (Image const & a, Image const & b);
 
 #endif