X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.h;h=510c0ff2599a2143abbcdf8595d2f31e4f66660b;hp=a67cc24deeffea184215ad221e371b3b2c288c90;hb=f0c10e92b849566e458bc323f8783a6fe83e52d2;hpb=72b11d5eb036651b6ff68edf3ed270e8fc52960f

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index a67cc24de..510c0ff25 100644
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -51,7 +51,6 @@ public:
 	J2KImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
 	std::pair<boost::shared_ptr<Image>, int> image (
-		boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
 		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
 		) const;
 
@@ -80,7 +79,7 @@ private:
 	dcp::Data _data;
 	dcp::Size _size;
 	boost::optional<dcp::Eye> _eye;
-	mutable boost::shared_ptr<dcp::OpenJPEGImage> _decompressed;
+	mutable boost::shared_ptr<Image> _image;
 	mutable boost::optional<dcp::Size> _target_size;
 	mutable boost::optional<int> _reduce;
 	AVPixelFormat _pixel_format;