diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-01-23 20:15:13 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-01-23 20:15:13 +0000 |
| commit | 420adb1fd2910fd24eb84be98169afc209f76a0e (patch) | |
| tree | 91efc15ae6351a1b93e3867b6685fb3922933efc /src/lib/imagemagick_decoder.cc | |
| parent | 4233db111cc4b1ca8a1a82b8aac96805a866ffa0 (diff) | |
| parent | 742f0fb10fb38a73d517e2a8870cd03ebefefa20 (diff) | |
Merge master branch.
Diffstat (limited to 'src/lib/imagemagick_decoder.cc')
| -rw-r--r-- | src/lib/imagemagick_decoder.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc index a623fd226..99b9e1d34 100644 --- a/src/lib/imagemagick_decoder.cc +++ b/src/lib/imagemagick_decoder.cc @@ -51,7 +51,7 @@ ImageMagickDecoder::ImageMagickDecoder ( _iter = _files.begin (); } -Size +libdcp::Size ImageMagickDecoder::native_size () const { if (_files.empty ()) { @@ -61,7 +61,7 @@ ImageMagickDecoder::native_size () const /* Look at the first file and assume its size holds for all */ using namespace MagickCore; Magick::Image* image = new Magick::Image (_film->content_path ()); - Size const s = Size (image->columns(), image->rows()); + libdcp::Size const s = libdcp::Size (image->columns(), image->rows()); delete image; return s; @@ -81,7 +81,7 @@ ImageMagickDecoder::pass () Magick::Image* magick_image = new Magick::Image (_film->content_path ()); - Size size = native_size (); + libdcp::Size size = native_size (); shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, size, false)); using namespace MagickCore; |