diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py index fb6f8b6ba3..6cd01632af 100644 --- a/lib/scripts/convertDefault.py +++ b/lib/scripts/convertDefault.py @@ -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: diff --git a/status.16x b/status.16x index 2ce19ab107..90e9410315 100644 --- a/status.16x +++ b/status.16x @@ -26,6 +26,8 @@ What's new - Add support for Extended Greek characters (bug 4997). +- Support GraphicsMagic when ImageMagick is not found (bug 6056). + * USER INTERFACE @@ -57,7 +59,7 @@ What's new - Fix support for polytonic Greek with multiple diacritics (bug 5976). - Do not unnecessarily enquote brackets in the LaTeX output (bug 5988). - + * USER INTERFACE