projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[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 1c283180201c37a18d8b04b256c8e445f5c29d1d..d7b5c83fc443d36e2c79b98b641067fea695c924 100644
(file)
--- a/
src/lib/j2k_image_proxy.h
+++ b/
src/lib/j2k_image_proxy.h
@@
-20,6
+20,8
@@
#include <dcp/util.h>
#include "image_proxy.h"
#include <dcp/util.h>
#include "image_proxy.h"
+class EncodedData;
+
class J2KImageProxy : public ImageProxy
{
public:
class J2KImageProxy : public ImageProxy
{
public:
@@
-31,6
+33,11
@@
public:
void add_metadata (xmlpp::Node *) const;
void send_binary (boost::shared_ptr<Socket>) const;
void add_metadata (xmlpp::Node *) const;
void send_binary (boost::shared_ptr<Socket>) const;
+ boost::shared_ptr<EncodedData> j2k () const;
+ dcp::Size size () const {
+ return _size;
+ }
+
private:
boost::shared_ptr<const dcp::MonoPictureFrame> _mono;
boost::shared_ptr<const dcp::StereoPictureFrame> _stereo;
private:
boost::shared_ptr<const dcp::MonoPictureFrame> _mono;
boost::shared_ptr<const dcp::StereoPictureFrame> _stereo;