diff options
Diffstat (limited to 'src/stereo_j2k_picture_frame.h')
| -rw-r--r-- | src/stereo_j2k_picture_frame.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/stereo_j2k_picture_frame.h b/src/stereo_j2k_picture_frame.h index 193960f3..e1291314 100644 --- a/src/stereo_j2k_picture_frame.h +++ b/src/stereo_j2k_picture_frame.h @@ -75,28 +75,30 @@ public: StereoJ2KPictureFrame (StereoJ2KPictureFrame const &) = delete; StereoJ2KPictureFrame& operator= (StereoJ2KPictureFrame const &) = delete; + StereoJ2KPictureFrame(StereoJ2KPictureFrame&&); + StereoJ2KPictureFrame& operator=(StereoJ2KPictureFrame&&); + std::shared_ptr<OpenJPEGImage> xyz_image (Eye eye, int reduce = 0) const; - class Part : public Data + class Part : public ConstantData { public: - Part (std::shared_ptr<ASDCP::JP2K::SFrameBuffer> buffer, Eye eye); + Part(ASDCP::JP2K::SFrameBuffer const& buffer, Eye eye); uint8_t const * data () const override; - uint8_t * data () override; int size () const override; private: friend class StereoJ2KPictureFrame; - ASDCP::JP2K::FrameBuffer& mono () const; + ASDCP::JP2K::FrameBuffer const& mono() const; - std::shared_ptr<ASDCP::JP2K::SFrameBuffer> _buffer; + ASDCP::JP2K::SFrameBuffer const& _buffer; Eye _eye; }; - std::shared_ptr<Part> left () const; - std::shared_ptr<Part> right () const; + Part left() const; + Part right() const; private: /* XXX: this is a bit of a shame, but I tried friend StereoJ2KPictureAssetReader and it's @@ -106,7 +108,7 @@ private: StereoJ2KPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, std::shared_ptr<DecryptionContext>, bool check_hmac); - std::shared_ptr<ASDCP::JP2K::SFrameBuffer> _buffer; + ASDCP::JP2K::SFrameBuffer _buffer; }; |