summaryrefslogtreecommitdiff
path: root/src/lib/image.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-03-25 09:41:36 +0000
committerCarl Hetherington <cth@carlh.net>2014-03-25 09:41:36 +0000
commitee77b3cf5f59f775e75e628aa28e8f2f9f941530 (patch)
treebbf9ab4ef1f0f633591889cbbd6b7b65de8f5a57 /src/lib/image.h
parente6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160 (diff)
It builds.
Diffstat (limited to 'src/lib/image.h')
-rw-r--r--src/lib/image.h4
1 files changed, 4 insertions, 0 deletions
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