X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmagick_image_proxy.cc;h=b12a81db554e0ddbdb8ebe5d7532d2945bb2845a;hb=0ff4fa6058b305476e7bc60c590acb6135c49b1c;hp=0fd4a5edb2bb36b355f4fb18996394c3e87266b0;hpb=9106e6ed551b13e1b7c7ee2088d54ce0ae430bcf;p=dcpomatic.git

diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index 0fd4a5edb..b12a81db5 100644
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -32,6 +32,8 @@
 
 using std::string;
 using std::cout;
+using std::pair;
+using std::make_pair;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
@@ -66,13 +68,13 @@ MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> s
 	delete[] data;
 }
 
-shared_ptr<Image>
+pair<shared_ptr<Image>, int>
 MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
 	if (_image) {
-		return _image;
+		return make_pair (_image, 0);
 	}
 
 	Magick::Image* magick_image = 0;
@@ -137,7 +139,7 @@ MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
 
 	delete magick_image;
 
-	return _image;
+	return make_pair (_image, 0);
 }
 
 void