projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
467a88f
)
Fix confused checks for Image/GraphicsMagick in wscript. Add missing InitializeMagic...
author
Carl Hetherington
<cth@carlh.net>
Fri, 24 Jun 2016 10:51:42 +0000
(11:51 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 24 Jun 2016 10:51:42 +0000
(11:51 +0100)
src/lib/util.cc
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/src/lib/util.cc
b/src/lib/util.cc
index 92b3b22fd1cd72096e96d5dece3e23bea23d20b5..bb74c168d17d96847219e04804c9fc86b02d016c 100644
(file)
--- a/
src/lib/util.cc
+++ b/
src/lib/util.cc
@@
-46,6
+46,9
@@
extern "C" {
#include <libavcodec/avcodec.h>
}
#include <curl/curl.h>
#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>
#include <glib.h>
#include <pangomm/init.h>
#include <boost/algorithm/string.hpp>
@@
-346,6
+349,10
@@
dcpomatic_setup ()
curl_global_init (CURL_GLOBAL_ALL);
curl_global_init (CURL_GLOBAL_ALL);
+#ifdef DCPOMATIC_GRAPHICS_MAGICK
+ Magick::InitializeMagick (0);
+#endif
+
ui_thread = boost::this_thread::get_id ();
}
ui_thread = boost::this_thread::get_id ();
}
diff --git
a/wscript
b/wscript
index cf2eff405114f8bccb48d5a985f5a455a875dd7d..be9d2224503ecbe532f81762461facb7c6868f9d 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-192,7
+192,9
@@
def configure(conf):
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK')
else:
image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False)
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK')
else:
image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False)
- graphics = conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False)
+ graphics = None
+ if image is None:
+ graphics = conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False)
if image is None and graphics is None:
Logs.pprint('RED', 'Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required')
if image is not None:
if image is None and graphics is None:
Logs.pprint('RED', 'Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required')
if image is not None: