anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Detect ImageMagick 7

Browse Source 
Imagemagick 7 does not have a convert command anymore, it is now called magick.
Joint work by Uwe and me.
This commit is contained in:
Georg Baum 2016-05-10 21:27:57 +02:00
parent a1cc936548
commit 8da5d01ff7
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/configure.py
View File

@ -972,7 +972,7 @@ def checkConverterEntries():
checkProg('an EPS -> PDF converter', ['epstopdf'], checkProg('an EPS -> PDF converter', ['epstopdf'],
rc_entry = [ r'\converter eps pdf6 "epstopdf --outfile=$$o $$i" ""']) 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 "%%" ""']) rc_entry = [ r'\converter eps png "%%" ""'])
# #
# no agr -> pdf6 converter, since the pdf library used by gracebat is not # no agr -> pdf6 converter, since the pdf library used by gracebat is not

16
lib/scripts/convertDefault.py
View File

@ -20,9 +20,17 @@ import os, re, sys
# We may need some extra options only supported by recent convert versions # We may need some extra options only supported by recent convert versions
re_version = re.compile(r'^Version:.*ImageMagick\s*(\d*)\.(\d*)\.(\d*).*$') 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() 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) version = re_version.match(output)
# Imagemagick by default # 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): if sys.argv[3] == 'ppm' and (version >= 0x060305 or gm):
opts = opts + ' -flatten' 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, sys.argv[0], 'ERROR'
print >> sys.stderr, 'Execution of "convert" failed.' print >> sys.stderr, ('Execution of "%s" failed.' % command)
sys.exit(1) sys.exit(1)