From 3b31d2d8a129ae6d8d267427bd6b5bc444b40b2a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 14 Apr 2020 21:38:26 +0200
Subject: Use a struct rather than a std::pair as the return type from
 ImageProxy::image.

---
 src/lib/raw_image_proxy.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/raw_image_proxy.cc')

diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc
index 21201faa6..5bd8c4811 100644
--- a/src/lib/raw_image_proxy.cc
+++ b/src/lib/raw_image_proxy.cc
@@ -54,10 +54,10 @@ RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 	_image->read_from_socket (socket);
 }
 
-pair<shared_ptr<Image>, int>
+ImageProxy::Result
 RawImageProxy::image (optional<dcp::Size>) const
 {
-	return make_pair (_image, 0);
+	return Result (_image, 0);
 }
 
 void
@@ -83,7 +83,7 @@ RawImageProxy::same (shared_ptr<const ImageProxy> other) const
 		return false;
 	}
 
-	return (*_image.get()) == (*rp->image().first.get());
+	return (*_image.get()) == (*rp->image().image.get());
 }
 
 size_t
-- 
cgit v1.2.3