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 /wscript | |
| parent | 467a88f5def3c5c4b9be363e28fba77fef8f22c2 (diff) | |
Fix confused checks for Image/GraphicsMagick in wscript. Add missing InitializeMagick() call, fixing crash on loading still images.
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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) - 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: |
