commit 1e5acc5656431e124cd404d49274edc272c4eb1e
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Fri Jul 13 10:20:26 2018 +0200
Fix command line output of convertDefault.py for ImageMagick
Part of #11186
---
lib/scripts/convertDefault.py | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index 9a460b7..8678965 100644
--- a/lib/scripts/convertDefault.py
+++ b/lib/scripts/convertDefault.py
@@ -56,21 +56,24 @@ else:
if version != None:
gm = True
+# IM >= 5.5.8 separates options for source and target files
+# See http://www.imagemagick.org/Usage/basics/#why
if im or gm:
- opts = "-depth 8"
+ sopts = "-depth 8"
+ topts = ""
elif sys.platform == 'darwin':
command = 'lyxconvert'
# If supported, add the -define option for pdf source formats
if sys.argv[1] == 'pdf' and (version >= 0x060206 or gm):
- opts = '-define pdf:use-cropbox=true ' + opts
+ sopts = '-define pdf:use-cropbox=true ' + sopts
# If supported, add the -flatten option for ppm target formats (see bug 4749)
if sys.argv[3] == 'ppm' and (im and version >= 0x060305 or gm):
- opts = opts + ' -flatten'
+ topts = '-flatten'
# print (command, sys.argv[2], sys.argv[4], file= sys.stdout)
-if (im or gm) and os.system(r'%s %s "%s" "%s"' % (command, opts, sys.argv[2],
sys.argv[3] + ':' + sys.argv[4])) != 0:
+if (im or gm) and os.system(r'%s %s "%s" %s "%s"' % (command, sopts,
sys.argv[2], topts, sys.argv[3] + ':' + sys.argv[4])) != 0:
print (sys.argv[0], 'ERROR', file= sys.stderr)
print ('Execution of "%s" failed.' % command, file= sys.stderr)
sys.exit(1)
