X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fimage.h;h=23c85e92b044d1371650805ee6364b49a9063165;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hp=f83bf6998111defbb49fcd49d67dea6703099992;hpb=884093edac5f63d26c02d411c73dfb52376ccf8f;p=dcpomatic.git

diff --git a/src/lib/image.h b/src/lib/image.h
index f83bf6998..23c85e92b 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -31,16 +31,17 @@ 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;
 
-class Image : public libdcp::Image
+class Image : public dcp::Image
 {
 public:
-	Image (AVPixelFormat, libdcp::Size, bool);
+	Image (AVPixelFormat, dcp::Size, bool);
 	Image (AVFrame *);
 	Image (Image const &);
 	Image (boost::shared_ptr<const Image>, bool);
@@ -50,19 +51,20 @@ public:
 	uint8_t ** data () const;
 	int * line_size () const;
 	int * stride () const;
-	libdcp::Size size () const;
+	dcp::Size size () const;
 	bool aligned () const;
 
 	int components () const;
 	int line_factor (int) const;
 	int lines (int) const;
 
-	boost::shared_ptr<Image> scale (libdcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
+	boost::shared_ptr<Image> scale (dcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
 	boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
 
-	boost::shared_ptr<Image> crop_scale_window (Crop c, libdcp::Size, libdcp::Size, Scaler const *, AVPixelFormat, 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);
 
@@ -91,4 +93,6 @@ private:
 	bool _aligned;
 };
 
+extern PositionImage merge (std::list<PositionImage> images);
+
 #endif