diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-24 11:51:42 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-24 11:51:42 +0100 |
| commit | 4bbf23f815dfb05ace6c699595edb0908187a421 (patch) | |
| tree | daa500f11240050708542d78d585ceb7b7ffcc95 /src | |
| parent | 467a88f5def3c5c4b9be363e28fba77fef8f22c2 (diff) | |
Fix confused checks for Image/GraphicsMagick in wscript. Add missing InitializeMagick() call, fixing crash on loading still images.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/util.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc index 92b3b22fd..bb74c168d 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -46,6 +46,9 @@ extern "C" { #include <libavcodec/avcodec.h> } #include <curl/curl.h> +#ifdef DCPOMATIC_GRAPHICS_MAGICK +#include <Magick++.h> +#endif #include <glib.h> #include <pangomm/init.h> #include <boost/algorithm/string.hpp> @@ -346,6 +349,10 @@ dcpomatic_setup () curl_global_init (CURL_GLOBAL_ALL); +#ifdef DCPOMATIC_GRAPHICS_MAGICK + Magick::InitializeMagick (0); +#endif + ui_thread = boost::this_thread::get_id (); } |
