diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-11 14:29:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-11 14:29:55 +0100 |
| commit | b655bd3359e9a014da68cd9f61e2a5b1d233247d (patch) | |
| tree | 42ab16fdc9621fd0314a71f051804cdacd1cb823 /src/lib/image.h | |
| parent | e64acff7da897cd03d88aa9e8e21682545a61cc2 (diff) | |
| parent | 2514ffcd1adcca4fc8e3db894afb5cdc6c857e94 (diff) | |
Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
Diffstat (limited to 'src/lib/image.h')
| -rw-r--r-- | src/lib/image.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/image.h b/src/lib/image.h index 5407ce66e..d40ba77b4 100644 --- a/src/lib/image.h +++ b/src/lib/image.h @@ -32,6 +32,7 @@ extern "C" { #include <libavfilter/avfilter.h> } #include "util.h" +#include "position.h" class Scaler; class SimpleImage; @@ -75,8 +76,8 @@ public: boost::shared_ptr<Image> scale_and_convert_to_rgb (libdcp::Size, Scaler const *, bool) const; boost::shared_ptr<Image> scale (libdcp::Size, Scaler const *, bool aligned) const; boost::shared_ptr<Image> post_process (std::string, bool aligned) const; - void alpha_blend (boost::shared_ptr<const Image> image, Position pos); - void copy (boost::shared_ptr<const Image> image, Position pos); + void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos); + void copy (boost::shared_ptr<const Image> image, Position<int> pos); boost::shared_ptr<Image> crop (Crop c, bool aligned) const; void make_black (); |