diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-04 21:16:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-07 22:48:29 +0100 |
| commit | dd9be86db6cde0afa5da0d1d1ac43b42e05dca26 (patch) | |
| tree | e56a3f82fb9e1c8602f265bea0d0688d8a018644 /src/lib/j2k_image_proxy.h | |
| parent | 0d35820cf50d2789752b8776683b26d04642518d (diff) | |
std::shared_ptr
Diffstat (limited to 'src/lib/j2k_image_proxy.h')
| -rw-r--r-- | src/lib/j2k_image_proxy.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h index 3eccc213d..91c90dba7 100644 --- a/src/lib/j2k_image_proxy.h +++ b/src/lib/j2k_image_proxy.h @@ -34,33 +34,33 @@ public: J2KImageProxy (boost::filesystem::path path, dcp::Size, AVPixelFormat pixel_format); J2KImageProxy ( - boost::shared_ptr<const dcp::MonoPictureFrame> frame, + std::shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size, AVPixelFormat pixel_format, boost::optional<int> forced_reduction ); J2KImageProxy ( - boost::shared_ptr<const dcp::StereoPictureFrame> frame, + std::shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size, dcp::Eye, AVPixelFormat pixel_format, boost::optional<int> forced_reduction ); - J2KImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket); + J2KImageProxy (std::shared_ptr<cxml::Node> xml, std::shared_ptr<Socket> socket); Result image ( boost::optional<dcp::Size> size = boost::optional<dcp::Size> () ) const; void add_metadata (xmlpp::Node *) const; - void write_to_socket (boost::shared_ptr<Socket>) const; + void write_to_socket (std::shared_ptr<Socket>) const; /** @return true if our image is definitely the same as another, false if it is probably not */ - bool same (boost::shared_ptr<const ImageProxy>) const; + bool same (std::shared_ptr<const ImageProxy>) const; int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const; - boost::shared_ptr<const dcp::Data> j2k () const { + std::shared_ptr<const dcp::Data> j2k () const { return _data; } @@ -76,10 +76,10 @@ private: /* For tests */ J2KImageProxy (dcp::ArrayData data, dcp::Size size, AVPixelFormat pixel_format); - boost::shared_ptr<const dcp::Data> _data; + std::shared_ptr<const dcp::Data> _data; dcp::Size _size; boost::optional<dcp::Eye> _eye; - mutable boost::shared_ptr<Image> _image; + mutable std::shared_ptr<Image> _image; mutable boost::optional<dcp::Size> _target_size; mutable boost::optional<int> _reduce; AVPixelFormat _pixel_format; |
