X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=23b88dd7601066c022bb457f116b8c252c7be256;hb=9c5a7319d807063c22d6bc165ee414ce82e26965;hp=3220a23b4adba6b42632edc4df3355898516d180;hpb=a79d78d8bb6d51f6662f1f63b9f8fd19e1a0c5f1;p=dcpomatic.git

diff --git a/src/lib/image.h b/src/lib/image.h
index 3220a23b4..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;
 
@@ -58,12 +59,12 @@ public:
 	int lines (int) const;
 
 	boost::shared_ptr<Image> scale (dcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
-	boost::shared_ptr<Image> post_process (std::string, bool aligned) const;
 	boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
 
 	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);
 
@@ -90,4 +91,6 @@ private:
 	bool _aligned;
 };
 
+extern PositionImage merge (std::list<PositionImage> images);
+
 #endif