X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmagick_image_proxy.h;h=62f3afa2e23e01cf37be424dffa2f8fd00a350f1;hb=c4ac1ba47652884a647103ec49b2de4c0b6e60a9;hp=32d2f7efb1dd0e772b55ec5fcf15396197609ca3;hpb=a69d242f3f00207d6ea7320e6723775f4b0dbfb3;p=dcpomatic.git

diff --git a/src/lib/magick_image_proxy.h b/src/lib/magick_image_proxy.h
index 32d2f7efb..62f3afa2e 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;
@@ -42,6 +42,10 @@ public:
 
 private:
 	Magick::Blob _blob;
+	/** Path of a file that this image came from, if applicable; stored so that
+	    failed-decode errors can give more detail.
+	*/
+	boost::optional<boost::filesystem::path> _path;
 	mutable boost::shared_ptr<Image> _image;
 	mutable boost::mutex _mutex;
 };