X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fraw_image_proxy.h;h=5711b54f2f9f362a0ec9a178994d3010af0269e5;hb=72b11d5eb036651b6ff68edf3ed270e8fc52960f;hp=33bf4827380e30f64a86c0fc0c694562d61556b6;hpb=1b653324caf9acf7183f053d3a0fdd29e40eb006;p=dcpomatic.git

diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h
index 33bf48273..5711b54f2 100644
--- a/src/lib/raw_image_proxy.h
+++ b/src/lib/raw_image_proxy.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -25,14 +26,19 @@
 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> ()) const;
+
+	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;
+
 	void add_metadata (xmlpp::Node *) const;
 	void send_binary (boost::shared_ptr<Socket>) const;
 	bool same (boost::shared_ptr<const ImageProxy>) const;
-	
+	size_t memory_used () const;
+
 private:
 	boost::shared_ptr<Image> _image;
 };