Amend 212314ada71

[lyx.git] / lib / scripts / convertDefault.py

diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index e54b0668881af03fcd052cbbfabe64d1ffb1e62d..c9277131ac8811cdfcfa1ff764d6d5a7526edee3 100644 (file)
--- a/lib/scripts/convertDefault.py
+++ b/lib/scripts/convertDefault.py
@@ -16,6 +16,7 @@
 # replacement in ~/.lyx/scripts
 
 # converts an image $2 (format $1) to $4 (format $3)
+from __future__ import print_function
 import os, re, sys
 
 # We may need some extra options only supported by recent convert versions
@@ -31,6 +32,7 @@ if fout.close() != None:
     fout = os.popen('convert -version 2>&1')
     output = fout.readline()
     fout.close()
+
 version = re_version.match(output)
 
 # Imagemagick by default
@@ -41,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
@@ -49,26 +51,31 @@ 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 >> sys.stdout, command, sys.argv[2], sys.argv[4]
-if (im or gm) and 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 "%s" failed.' % command)
+# print (command, sys.argv[2], sys.argv[4], file= sys.stdout)
+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)
 elif not im and not gm and sys.platform == 'darwin' and os.system(r'%s "%s" "%s"' % (command, sys.argv[2], sys.argv[4])) != 0:
-    print >> sys.stderr, sys.argv[0], 'ERROR'
-    print >> sys.stderr, ('Execution of "%s" failed.' % command)
+    print (sys.argv[0], 'ERROR', file= sys.stderr)
+    print ('Execution of "%s" failed.' % command, file= sys.stderr)
     sys.exit(1)