X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmagick_image_proxy.h;h=d22789eda7d04db3dbdeb167ceea2976ffc0b62e;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=7d2251aebb491408aa3096eef8a8bb227943f62c;hpb=77f7f3be256f81d2977bccdb236582e18a625ba7;p=dcpomatic.git diff --git a/src/lib/magick_image_proxy.h b/src/lib/magick_image_proxy.h index 7d2251aeb..d22789eda 100644 --- a/src/lib/magick_image_proxy.h +++ b/src/lib/magick_image_proxy.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ */ #include "image_proxy.h" +#include class MagickImageProxy : public ImageProxy { @@ -30,7 +31,8 @@ public: void send_binary (boost::shared_ptr) const; bool same (boost::shared_ptr other) const; -private: +private: Magick::Blob _blob; mutable boost::shared_ptr _image; + mutable boost::mutex _mutex; };