X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fmagick_image_proxy.h;h=e255b1336fcf512ad2eb70596749d17d5911f371;hp=f4ddb2c9418c7c7d23f4c1e0c254a48aa1a043aa;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=5f2a8e5892db9c0f578be0be29b9e157482cfed6 diff --git a/src/lib/magick_image_proxy.h b/src/lib/magick_image_proxy.h index f4ddb2c94..e255b1336 100644 --- a/src/lib/magick_image_proxy.h +++ b/src/lib/magick_image_proxy.h @@ -1,24 +1,27 @@ /* Copyright (C) 2014-2015 Carl Hetherington - 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 . */ #include "image_proxy.h" +#include #include +#include class MagickImageProxy : public ImageProxy { @@ -30,8 +33,9 @@ public: void add_metadata (xmlpp::Node *) const; void send_binary (boost::shared_ptr) const; bool same (boost::shared_ptr other) const; + AVPixelFormat pixel_format () const; -private: +private: Magick::Blob _blob; mutable boost::shared_ptr _image; mutable boost::mutex _mutex;