diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-29 16:57:33 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-29 18:44:04 +0000 |
| commit | aa7edc3114fa3b7868088a9f8f22b5ee195a8668 (patch) | |
| tree | 5e5fef8156320f47aaa7626e557f85e8eb236ff5 /src/lib/j2k_image_proxy.h | |
| parent | e1c23a19b93d7bb66bd439af511d6666e56a7d29 (diff) | |
Fix incorrect colourspace conversion of XYZ content
when it is not being passed through as untouched
JPEG2000 (#730).
Diffstat (limited to 'src/lib/j2k_image_proxy.h')
| -rw-r--r-- | src/lib/j2k_image_proxy.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h index bb8c216e3..1d34e7f84 100644 --- a/src/lib/j2k_image_proxy.h +++ b/src/lib/j2k_image_proxy.h @@ -40,7 +40,8 @@ public: void add_metadata (xmlpp::Node *) const; void send_binary (boost::shared_ptr<Socket>) const; /** @return true if our image is definitely the same as another, false if it is probably not */ - virtual bool same (boost::shared_ptr<const ImageProxy>) const; + bool same (boost::shared_ptr<const ImageProxy>) const; + AVPixelFormat pixel_format () const; Data j2k () const { return _data; @@ -53,9 +54,12 @@ public: private: friend struct client_server_test_j2k; + /* For tests */ J2KImageProxy (Data data, dcp::Size size); + void ensure_j2k () const; Data _data; dcp::Size _size; boost::optional<dcp::Eye> _eye; + mutable boost::shared_ptr<dcp::OpenJPEGImage> _j2k; }; |