From 0ff4fa6058b305476e7bc60c590acb6135c49b1c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 13 Apr 2018 23:23:00 +0100
Subject: Account for J2K decoding at lower-than-maximum resolution when
 cropping the resulting images; fixes #1274.

---
 src/lib/magick_image_proxy.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/magick_image_proxy.h')

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;
-- 
cgit v1.2.3