Supporters update.

[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 91c90dba71bad6cd95cdfe6e095a1ebab1439804..9666ea406784f9981780661e60ba39c7dcfb2c31 100644 (file)
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,16 +18,19 @@
 
 */
 
+
 #include "image_proxy.h"
 #include <dcp/array_data.h>
 #include <dcp/util.h>
 #include <boost/thread/mutex.hpp>
 
+
 namespace dcp {
        class MonoPictureFrame;
        class StereoPictureFrame;
 }
 
+
 class J2KImageProxy : public ImageProxy
 {
 public:
@@ -50,15 +53,19 @@ public:
 
        J2KImageProxy (std::shared_ptr<cxml::Node> xml, std::shared_ptr<Socket> socket);
 
+       /* For tests */
+       J2KImageProxy (dcp::ArrayData data, dcp::Size size, AVPixelFormat pixel_format);
+
        Result image (
+               Image::Alignment alignment,
                boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
-               ) const;
+               ) const override;
 
-       void add_metadata (xmlpp::Node *) const;
-       void write_to_socket (std::shared_ptr<Socket>) const;
+       void add_metadata (xmlpp::Node *) const override;
+       void write_to_socket (std::shared_ptr<Socket> 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 ImageProxy>) const;
-       int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
+       bool same (std::shared_ptr<const ImageProxy>) const override;
+       int prepare (Image::Alignment alignment, boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const override;
 
        std::shared_ptr<const dcp::Data> j2k () const {
                return _data;
@@ -68,14 +75,13 @@ public:
                return _size;
        }
 
-       size_t memory_used () const;
-
-private:
-       friend struct client_server_test_j2k;
+       boost::optional<dcp::Eye> eye () const {
+               return _eye;
+       }
 
-       /* For tests */
-       J2KImageProxy (dcp::ArrayData data, dcp::Size size, AVPixelFormat pixel_format);
+       size_t memory_used () const override;
 
+private:
        std::shared_ptr<const dcp::Data> _data;
        dcp::Size _size;
        boost::optional<dcp::Eye> _eye;