Merge master.

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

diff --git a/src/lib/image.h b/src/lib/image.h
index 5eba11041713f42ecc252648a7789505dbba467b..6c539164109a883e40b864a108a2a90810fd9fc3 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -34,6 +34,7 @@ extern "C" {
 #include <dcp/image.h>
 #include "util.h"
 #include "position.h"
+#include "position_image.h"
 
 class Scaler;
 
@@ -63,6 +64,7 @@ public:
        boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
        
        void make_black ();
+       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);
 
@@ -73,8 +75,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 &);
@@ -89,4 +93,6 @@ private:
        bool _aligned;
 };
 
+extern PositionImage merge (std::list<PositionImage> images);
+
 #endif