X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fraw_image_proxy.h;h=dcd107a9ebc4f9255c226228681d25a41bcc029c;hp=28fd7f26362090241526ae92eaf2a7fe78d70be3;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=5bbf16e87ca09369174c9d2bb7f7fe94b6d70275

diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h
index 28fd7f263..dcd107a9e 100644
--- a/src/lib/raw_image_proxy.h
+++ b/src/lib/raw_image_proxy.h
@@ -26,18 +26,17 @@
 class RawImageProxy : public ImageProxy
 {
 public:
-	RawImageProxy (boost::shared_ptr<Image>);
+	explicit RawImageProxy (boost::shared_ptr<Image>);
 	RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
-	boost::shared_ptr<Image> image (
-		boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
+	std::pair<boost::shared_ptr<Image>, int> image (
 		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
 		) const;
 
 	void add_metadata (xmlpp::Node *) const;
 	void send_binary (boost::shared_ptr<Socket>) const;
 	bool same (boost::shared_ptr<const ImageProxy>) const;
-	AVPixelFormat pixel_format () const;
+	size_t memory_used () const;
 
 private:
 	boost::shared_ptr<Image> _image;