X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.h;h=9666ea406784f9981780661e60ba39c7dcfb2c31;hb=ff12ccdde76c54d3b9e69799a63750db9edf0023;hp=a23ec6d987e8af153eb163973751506f03c6f94a;hpb=9bfa07293928c371d59db2091ba2b7e715ce5994;p=dcpomatic.git

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index a23ec6d98..9666ea406 100644
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -57,15 +57,15 @@ public:
 	J2KImageProxy (dcp::ArrayData data, dcp::Size size, AVPixelFormat pixel_format);
 
 	Result image (
-		bool aligned,
+		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 (bool aligned, 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;
@@ -79,7 +79,7 @@ public:
 		return _eye;
 	}
 
-	size_t memory_used () const;
+	size_t memory_used () const override;
 
 private:
 	std::shared_ptr<const dcp::Data> _data;