diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-04-24 12:05:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-04-24 12:05:21 +0100 |
| commit | 1cdedd1c19bd34f1c41043f9bbeae39cb54a0ed8 (patch) | |
| tree | 460ee0ad60988d641cf00e458fef6c91e3621370 /src/lib/image.h | |
| parent | 666808c7f735d5ff0daff70dfb7b0c409113874e (diff) | |
| parent | 2d3092216e97c02bf715a3df19725518312a0b65 (diff) | |
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Diffstat (limited to 'src/lib/image.h')
| -rw-r--r-- | src/lib/image.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/image.h b/src/lib/image.h index 2e90a89e9..5c3931102 100644 --- a/src/lib/image.h +++ b/src/lib/image.h @@ -27,6 +27,7 @@ #include "position.h" #include "position_image.h" #include "types.h" +#include <dcp/colour_conversion.h> extern "C" { #include <libavcodec/avcodec.h> #include <libavfilter/avfilter.h> @@ -57,10 +58,9 @@ public: int line_factor (int) const; int lines (int) const; - boost::shared_ptr<Image> scale (dcp::Size, AVPixelFormat, bool aligned) const; + boost::shared_ptr<Image> scale (dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, 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, AVPixelFormat, bool aligned) const; + boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned) const; void make_black (); void make_transparent (); |