diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-21 23:19:31 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-21 23:19:31 +0100 |
| commit | b9f6e9512017dc1ecd3a42aa1ef3c6058608cef5 (patch) | |
| tree | 0c5ccae6f26d46c270e9287a722b63e397900c57 /src/lib/imagemagick_decoder.cc | |
| parent | 02e4022f540915f8a38f9ab9576ac896fe39a1ab (diff) | |
Give Film a container; move crop into video content; other bits.
Diffstat (limited to 'src/lib/imagemagick_decoder.cc')
| -rw-r--r-- | src/lib/imagemagick_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc index dd18ad64e..c6b19b742 100644 --- a/src/lib/imagemagick_decoder.cc +++ b/src/lib/imagemagick_decoder.cc @@ -34,7 +34,7 @@ using libdcp::Size; ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c) : Decoder (f) - , VideoDecoder (f) + , VideoDecoder (f, c) , _imagemagick_content (c) , _position (0) { @@ -92,7 +92,7 @@ ImageMagickDecoder::pass () delete magick_image; - _image = _image->crop (_film->crop(), true); + _image = _image->crop (_imagemagick_content->crop(), true); emit_video (_image, false, double (_position) / 24); ++_position; |