X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fraw_image_proxy.h;h=dcd107a9ebc4f9255c226228681d25a41bcc029c;hb=b0bec103eaaebfbc0b6f90f9b3e7ac8c32f2707e;hp=9f8424eb34df8061154ee96925b679a8d6939890;hpb=c6871fe8617b3de03662b7630355059393bf8043;p=dcpomatic.git

diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h
index 9f8424eb3..dcd107a9e 100644
--- a/src/lib/raw_image_proxy.h
+++ b/src/lib/raw_image_proxy.h
@@ -29,15 +29,13 @@ public:
 	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: