projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract common code out into kdm_for_screen()
[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..2509bd0d46f460390e6fb5b72b54c51d0b59bf9c 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);
}
_image->read_from_socket (socket);
}
-pair<shared_ptr<Image>, int>
+ImageProxy::Result
RawImageProxy::image (optional<dcp::Size>) const
{
RawImageProxy::image (optional<dcp::Size>) const
{
- return
make_pair
(_image, 0);
+ return
Result
(_image, 0);
}
void
}
void
@@
-70,7
+70,7
@@
RawImageProxy::add_metadata (xmlpp::Node* node) const
}
void
}
void
-RawImageProxy::
send_binary
(shared_ptr<Socket> socket) const
+RawImageProxy::
write_to_socket
(shared_ptr<Socket> socket) const
{
_image->write_to_socket (socket);
}
{
_image->write_to_socket (socket);
}
@@
-83,7
+83,7
@@
RawImageProxy::same (shared_ptr<const ImageProxy> other) const
return false;
}
return false;
}
- return (*_image.get()) == (*rp->image().
first
.get());
+ return (*_image.get()) == (*rp->image().
image
.get());
}
size_t
}
size_t