configure.py: Replace 'ltx' by 'log' case insensitively

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

diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index 54e4f213dc08c6b0fc0db357d960fbe2ddd6dcf3..deb1af08663ce87cfdd29795b647dad92ba5291b 100644 (file)
--- a/lib/scripts/convertDefault.py
+++ b/lib/scripts/convertDefault.py
@@ -17,21 +17,38 @@
 # replacement in ~/.lyx/scripts
 
 # converts an image from $1 to $2 format
-import os, sys
+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')
+output = fout.readline()
+fout.close()
+version = re_version.match(output)
+
+# Imagemagick by default
+gm = False
+
+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)
+else:
+    # Try GraphicsMagick
+    re_version = re.compile(r'^GraphicsMagick.*http:..www.GraphicsMagick.org.*$')
+    version = re_version.match(output)
+    if version != None:
+        gm = True
 
 opts = "-depth 8"
-# for pdf source formats, check whether convert supports the -define option
-if sys.argv[1][:4] == 'pdf:':
-    defopt = "-define pdf:use-cropbox=true"
-    fout = os.popen('convert ' + defopt + ' 2>&1')
-    output = fout.read()
-    fout.close()
-    if not 'unrecognized' in output.lower():
-        opts = defopt + ' ' + opts
-
-# for ppm target formats, we need to flatten image, as ppm has no support
-# for alpha channel, see bug 4749
-if sys.argv[2][:4] == 'ppm:':
+
+# If supported, add the -define option for pdf source formats 
+if sys.argv[1][:4] == 'pdf:' and (version >= 0x060206 or gm):
+    opts = '-define pdf:use-cropbox=true ' + opts
+
+# If supported, add the -flatten option for ppm target formats (see bug 4749)
+if sys.argv[2][:4] == 'ppm:' and (version >= 0x060305 or gm):
     opts = opts + ' -flatten'
 
 if os.system(r'convert %s "%s" "%s"' % (opts, sys.argv[1], sys.argv[2])) != 0: