Also take into account version number components >= 10 (but less than 256).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25761 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2008-07-21 10:31:26 +00:00
parent 9c87e40ace
commit 37bc93583e

View File

@ -25,16 +25,19 @@ fout = os.popen('convert -version 2>&1')
output = fout.readline() output = fout.readline()
fout.close() fout.close()
version = re_version.match(output) version = re_version.match(output)
version = int(version.group(1) + version.group(2) + version.group(3)) major = int(version.group(1))
minor = int(version.group(2))
patch = int(version.group(3))
version = hex(major * 65536 + minor * 256 + patch)
opts = "-depth 8" opts = "-depth 8"
# If supported, add the -define option for pdf source formats # If supported, add the -define option for pdf source formats
if sys.argv[1][:4] == 'pdf:' and version >= 626: if sys.argv[1][:4] == 'pdf:' and version >= 0x060206:
opts = '-define pdf:use-cropbox=true ' + opts opts = '-define pdf:use-cropbox=true ' + opts
# If supported, add the -flatten option for ppm target formats (see bug 4749) # If supported, add the -flatten option for ppm target formats (see bug 4749)
if sys.argv[2][:4] == 'ppm:' and version >= 600: if sys.argv[2][:4] == 'ppm:' and version >= 0x060000:
opts = opts + ' -flatten' opts = opts + ' -flatten'
if os.system(r'convert %s "%s" "%s"' % (opts, sys.argv[1], sys.argv[2])) != 0: if os.system(r'convert %s "%s" "%s"' % (opts, sys.argv[1], sys.argv[2])) != 0: