X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fmagick_image_proxy.h;h=62f3afa2e23e01cf37be424dffa2f8fd00a350f1;hp=a2635236fc26014b7281ba8228133d35d7aab7b2;hb=c4ac1ba47652884a647103ec49b2de4c0b6e60a9;hpb=cb1dfa9ec09af2abf6d10e4bf2764476db83841b

diff --git a/src/lib/magick_image_proxy.h b/src/lib/magick_image_proxy.h
index a2635236f..62f3afa2e 100644
--- a/src/lib/magick_image_proxy.h
+++ b/src/lib/magick_image_proxy.h
@@ -1,35 +1,51 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    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/>.
 
 */
 
 #include "image_proxy.h"
+#include <Magick++.h>
+#include <boost/thread/mutex.hpp>
+#include <boost/filesystem.hpp>
 
 class MagickImageProxy : public ImageProxy
 {
 public:
-	MagickImageProxy (boost::filesystem::path, boost::shared_ptr<Log> log);
-	MagickImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket, boost::shared_ptr<Log> log);
+	explicit MagickImageProxy (boost::filesystem::path);
+	MagickImageProxy (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;
 
-	boost::shared_ptr<Image> image () const;
 	void add_metadata (xmlpp::Node *) const;
 	void send_binary (boost::shared_ptr<Socket>) const;
+	bool same (boost::shared_ptr<const ImageProxy> other) const;
+	AVPixelFormat pixel_format () const;
+	size_t memory_used () const;
 
-private:	
+private:
 	Magick::Blob _blob;
+	/** Path of a file that this image came from, if applicable; stored so that
+	    failed-decode errors can give more detail.
+	*/
+	boost::optional<boost::filesystem::path> _path;
 	mutable boost::shared_ptr<Image> _image;
+	mutable boost::mutex _mutex;
 };