diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-04-13 23:23:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-04-13 23:23:00 +0100 |
| commit | 0ff4fa6058b305476e7bc60c590acb6135c49b1c (patch) | |
| tree | 1ea7e181846964bd1bab52bbfafc118f49b584f8 /src/lib/magick_image_proxy.h | |
| parent | 9106e6ed551b13e1b7c7ee2088d54ce0ae430bcf (diff) | |
Account for J2K decoding at lower-than-maximum resolution when croppingv2.13.14
the resulting images; fixes #1274.
Diffstat (limited to 'src/lib/magick_image_proxy.h')
| -rw-r--r-- | src/lib/magick_image_proxy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/magick_image_proxy.h b/src/lib/magick_image_proxy.h index 32d2f7efb..7d2b69afe 100644 --- a/src/lib/magick_image_proxy.h +++ b/src/lib/magick_image_proxy.h @@ -29,7 +29,7 @@ public: explicit MagickImageProxy (boost::filesystem::path); MagickImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket); - boost::shared_ptr<Image> image ( + std::pair<boost::shared_ptr<Image>, int> image ( boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (), boost::optional<dcp::Size> size = boost::optional<dcp::Size> () ) const; |