Use a struct rather than a std::pair as the return type from ImageProxy::image.

[dcpomatic.git] / src / lib / raw_image_proxy.cc

diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc
index 21201faa69264826db4129b7db3eaccb931e10c1..5bd8c4811306feea406d5e023dfe3e0cbd706780 100644 (file)
--- 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