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 094b50d058c2bef13cece2d1dbe8df402bce4e21..2509bd0d46f460390e6fb5b72b54c51d0b59bf9c 100644
(file)
--- a/
src/lib/raw_image_proxy.cc
+++ b/
src/lib/raw_image_proxy.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2018
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-31,6
+31,8
@@
extern "C" {
#include "i18n.h"
using std::string;
#include "i18n.h"
using std::string;
+using std::pair;
+using std::make_pair;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
@@
-52,10
+54,10
@@
RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
_image->read_from_socket (socket);
}
_image->read_from_socket (socket);
}
-shared_ptr<Image>
-RawImageProxy::image (optional<dcp::
NoteHandler>, optional<dcp::
Size>) const
+ImageProxy::Result
+RawImageProxy::image (optional<dcp::Size>) const
{
{
- return
_image
;
+ return
Result (_image, 0)
;
}
void
}
void
@@
-68,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);
}
@@
-81,13
+83,7
@@
RawImageProxy::same (shared_ptr<const ImageProxy> other) const
return false;
}
return false;
}
- return (*_image.get()) == (*rp->image().get());
-}
-
-AVPixelFormat
-RawImageProxy::pixel_format () const
-{
- return _image->pixel_format ();
+ return (*_image.get()) == (*rp->image().image.get());
}
size_t
}
size_t