From: Enrico Forestieri <forenr@lyx.org>
Date: Mon, 21 Jul 2008 09:55:40 +0000 (+0000)
Subject: Correct check for IM version
X-Git-Tag: 1.6.10~3977
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9c87e40acec58a8d0cdbed8f72edfc9b6ce6faaf;p=features.git

Correct check for IM version


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25760 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index 5c6192c6b7..9969ba73de 100644
--- a/lib/scripts/convertDefault.py
+++ b/lib/scripts/convertDefault.py
@@ -25,18 +25,16 @@ fout = os.popen('convert -version 2>&1')
 output = fout.readline()
 fout.close()
 version = re_version.match(output)
-major = int(version.group(1))
-minor = int(version.group(2))
-patch = int(version.group(3))
+version = int(version.group(1) + version.group(2) + version.group(3))
 
 opts = "-depth 8"
 
 # If supported, add the -define option for pdf source formats 
-if sys.argv[1][:4] == 'pdf:' and major >= 6 and minor >= 2 and patch >= 6:
+if sys.argv[1][:4] == 'pdf:' and version >= 626:
     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 major >= 6 and minor >= 0 and patch >= 0:
+if sys.argv[2][:4] == 'ppm:' and version >= 600:
     opts = opts + ' -flatten'
 
 if os.system(r'convert %s "%s" "%s"' % (opts, sys.argv[1], sys.argv[2])) != 0: