commit 8da5d01ff768b1d76be4179553eb026a7fe33872
Author: Georg Baum <b...@lyx.org>
Date: Tue May 10 21:27:57 2016 +0200
Detect ImageMagick 7
Imagemagick 7 does not have a convert command anymore, it is now called
magick.
Joint work by Uwe and me.
diff --git a/lib/configure.py b/lib/configure.py
index cd2a0c5..5dcb29f 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -972,7 +972,7 @@ def checkConverterEntries():
checkProg('an EPS -> PDF converter', ['epstopdf'],
rc_entry = [ r'\converter eps pdf6 "epstopdf
--outfile=$$o $$i" ""'])
#
- checkProg('an EPS -> PNG converter', ['convert $$i $$o'],
+ checkProg('an EPS -> PNG converter', ['magick $$i $$o', 'convert $$i $$o'],
rc_entry = [ r'\converter eps png "%%" ""'])
#
# no agr -> pdf6 converter, since the pdf library used by gracebat is not
diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index 40bc8b5..16e8f19 100644
--- a/lib/scripts/convertDefault.py
+++ b/lib/scripts/convertDefault.py
@@ -20,9 +20,17 @@ import os, re, sys
# We may need some extra options only supported by recent convert versions
re_version = re.compile(r'^Version:.*ImageMagick\s*(\d*)\.(\d*)\.(\d*).*$')
-fout = os.popen('convert -version 2>&1')
+# imagemagick 7
+command = 'magick'
+fout = os.popen('magick -version 2>&1')
output = fout.readline()
-fout.close()
+if fout.close() != None:
+ # older versions
+ # caution: windows has a convert.exe for converting file systems
+ command = 'convert'
+ fout = os.popen('convert -version 2>&1')
+ output = fout.readline()
+ fout.close()
version = re_version.match(output)
# Imagemagick by default
@@ -50,7 +58,7 @@ if sys.argv[1] == 'pdf' and (version >= 0x060206 or gm):
if sys.argv[3] == 'ppm' and (version >= 0x060305 or gm):
opts = opts + ' -flatten'
-if os.system(r'convert %s "%s" "%s"' % (opts, sys.argv[2], sys.argv[3] + ':' +
sys.argv[4])) != 0:
+if os.system(r'%s %s "%s" "%s"' % (command, opts, sys.argv[2], sys.argv[3] +
':' + sys.argv[4])) != 0:
print >> sys.stderr, sys.argv[0], 'ERROR'
- print >> sys.stderr, 'Execution of "convert" failed.'
+ print >> sys.stderr, ('Execution of "%s" failed.' % command)
sys.exit(1)
