anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 11:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #6056. Recognize Graphicsmagick too.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30935 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2009-08-09 14:38:49 +00:00
parent 34fde774f8
commit fe1e5203c0
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/scripts/convertDefault.py
View File

@ -25,19 +25,30 @@ 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 = hex(major * 65536 + minor * 256 + patch)
# Imagemagick by default
gm = 0
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 = 1
opts = "-depth 8"
# If supported, add the -define option for pdf source formats
if sys.argv[1][:4] == 'pdf:' and version >= 0x060206:
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:
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: