projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Use a struct rather than a std::pair as the return type from ImageProxy::image.
[dcpomatic.git]
/
src
/
lib
/
j2k_image_proxy.h
diff --git
a/src/lib/j2k_image_proxy.h
b/src/lib/j2k_image_proxy.h
index 510c0ff2599a2143abbcdf8595d2f31e4f66660b..ec99e71a938c19c0b39d9af4c26d4a9baccf8f78 100644
(file)
--- a/
src/lib/j2k_image_proxy.h
+++ b/
src/lib/j2k_image_proxy.h
@@
-50,7
+50,7
@@
public:
J2KImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
-
std::pair<boost::shared_ptr<Image>, int>
image (
+
Result
image (
boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
) const;