X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=6c539164109a883e40b864a108a2a90810fd9fc3;hb=5e4f001bf32e3cdf65efa34803d70e6c1c00c66b;hp=1c096be718f8e33cc4b156530cb9ba470950b787;hpb=f58d9e44302151dea9f594acd9fc27a331fa77fb;p=dcpomatic.git

diff --git a/src/lib/image.h b/src/lib/image.h
index 1c096be71..6c5391641 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -31,9 +31,10 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
 }
-#include <libdcp/image.h>
+#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);
 
@@ -74,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 &);
@@ -90,4 +93,6 @@ private:
 	bool _aligned;
 };
 
+extern PositionImage merge (std::list<PositionImage> images);
+
 #endif