Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg

to decode images.  Hence remove {Image,Graphics}Magick.

1 files changed, 0 insertions, 51 deletions

diff --git a/src/lib/magick_image_proxy.h b/src/lib/magick_image_proxy.h
deleted file mode 100644
index 62f3afa2e..000000000
--- a/src/lib/magick_image_proxy.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
-
-    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.
-
-    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 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:
-	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;
-
-	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:
-	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;
-};