Merge remote-tracking branch 'origin/master' into 2.0

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

diff --git a/src/lib/image.h b/src/lib/image.h
index e1f8d0ddd4c1d7597b17c78ce8449479e3e9f44a..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;