X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2FconvertDefault.py;h=c9277131ac8811cdfcfa1ff764d6d5a7526edee3;hb=92c4bb46828941a36cb464bb2202607fe2abb934;hp=9a460b7cf3031e11495f3f68a24e35831ae4dd3d;hpb=5b160e82be3797ae57632174f2510a132a7558a1;p=lyx.git

diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index 9a460b7cf3..c9277131ac 100644
--- a/lib/scripts/convertDefault.py
+++ b/lib/scripts/convertDefault.py
@@ -19,8 +19,6 @@
 from __future__ import print_function
 import os, re, sys
 
-PY2 = sys.version_info[0] == 2
-
 # We may need some extra options only supported by recent convert versions
 re_version = re.compile(r'^Version:.*ImageMagick\s*(\d*)\.(\d*)\.(\d*).*$')
 # imagemagick 7
@@ -34,8 +32,6 @@ if fout.close() != None:
     fout = os.popen('convert -version 2>&1')
     output = fout.readline()
     fout.close()
-if not PY2:
-    output = output.decode()
 
 version = re_version.match(output)
 
@@ -47,7 +43,7 @@ if version != None:
     major = int(version.group(1))
     minor = int(version.group(2))
     patch = int(version.group(3))
-    version = hex(major * 65536 + minor * 256 + patch)
+    version = (major, minor, patch)
     im = True
 else:
     # Try GraphicsMagick
@@ -55,22 +51,27 @@ else:
     version = re_version.match(output)
     if version != None:
         gm = True
+        # we need version to be a valid integer 3-tuple
+        version = (1,0,0)
 
+# 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 = ""
+    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
+if sys.argv[1] == 'pdf' and (version >= (6,2,6) or gm):
+    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'
+if sys.argv[3] == 'ppm' and (im and version >= (6,3,5) or gm):
+    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)