X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=23b88dd7601066c022bb457f116b8c252c7be256;hb=c98c87afe29d9ef74bdced8a9c96d7752f3fe80f;hp=5eba11041713f42ecc252648a7789505dbba467b;hpb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;p=dcpomatic.git

diff --git a/src/lib/image.h b/src/lib/image.h
index 5eba11041..23b88dd76 100644
--- 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);
 
@@ -89,4 +91,6 @@ private:
 	bool _aligned;
 };
 
+extern PositionImage merge (std::list<PositionImage> images);
+
 #endif