projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
lib
/
magick_image_proxy.h
diff --git
a/src/lib/magick_image_proxy.h
b/src/lib/magick_image_proxy.h
index a2635236fc26014b7281ba8228133d35d7aab7b2..e255b1336fcf512ad2eb70596749d17d5911f371 100644
(file)
--- a/
src/lib/magick_image_proxy.h
+++ b/
src/lib/magick_image_proxy.h
@@
-1,35
+1,42
@@
/*
/*
- 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.
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
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 "image_proxy.h"
+#include <Magick++.h>
+#include <boost/thread/mutex.hpp>
+#include <boost/filesystem.hpp>
class MagickImageProxy : public ImageProxy
{
public:
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
);
+ MagickImageProxy (boost::filesystem::path);
+ MagickImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
- boost::shared_ptr<Image> image () const;
+ boost::shared_ptr<Image> image (
boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()
) const;
void add_metadata (xmlpp::Node *) const;
void send_binary (boost::shared_ptr<Socket>) 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;
-private:
+private:
Magick::Blob _blob;
mutable boost::shared_ptr<Image> _image;
Magick::Blob _blob;
mutable boost::shared_ptr<Image> _image;
+ mutable boost::mutex _mutex;
};
};