Uwe Stöhr wrote:
> ImageMagick released the new major version 7. Unfortunately they removed
> the convert executable. One has to use the command "magick" instead of
> "convert".
This is a good thing. The name convert is too general (and indeed, windows
includes a convert.exe for converting file systems, so we were walking on
thin ice before).
> Attached is a patch that makes IM 7 work here but of course we need a
> way that convertDefault.py detects if IM 6 or IM 7 is used on the
> system. Unfortunately I don't know how to achieve this.
See attached. For later versions we should get rid of os.popen(), which is
deprecated: https://docs.python.org/2/library/os.html#os.popen.
> This should be done before 2.2.0 final because IM 6 won't be supported
> any longer and security issues in the image libraries appear quite often.
Imagemagick is unfortunately known for frequent security issues. IMHO the
fix would be safe for 2.2.0, since the fallback is to use convert, but it
would not be a big problem to wait for 2.2.1 either if this is regarded too
risky.
Georg
diff --git a/lib/configure.py b/lib/configure.py
index 0dcc4ce..564538d 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)
