X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fj2k_image_proxy.h;h=3346fff08c4dc8d8cc82d5270468c52d0d17dd11;hb=6d95d9689831a74fade32038a808f206c03d8aa2;hp=d925bef864fe9129fc59dd8246b4b305325ea55e;hpb=952084c4221c5708e02c783284cf0f7239c6b4c4;p=dcpomatic.git diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h index d925bef86..3346fff08 100644 --- a/src/lib/j2k_image_proxy.h +++ b/src/lib/j2k_image_proxy.h @@ -59,13 +59,13 @@ public: Result image ( Image::Alignment alignment, boost::optional size = boost::optional () - ) const; + ) const override; - void add_metadata (xmlpp::Node *) const; - void write_to_socket (std::shared_ptr) const; + void add_metadata(xmlpp::Element*) const override; + void write_to_socket (std::shared_ptr override) const override; /** @return true if our image is definitely the same as another, false if it is probably not */ - bool same (std::shared_ptr) const; - int prepare (Image::Alignment alignment, boost::optional = boost::optional()) const; + bool same (std::shared_ptr) const override; + int prepare (Image::Alignment alignment, boost::optional = boost::optional()) const override; std::shared_ptr j2k () const { return _data; @@ -79,7 +79,7 @@ public: return _eye; } - size_t memory_used () const; + size_t memory_used () const override; private: std::shared_ptr _data;