X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2FconvertDefault.py;h=6cd01632af9ec69e338a421dc5439f759e874e68;hb=be8cf7c98c465264c765279ef97720ce04081f78;hp=183007a854177c20932405e56473c175a51f5482;hpb=4ae87a3bb8503b5a672bb85448b11f08ebcfeffd;p=lyx.git

diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index 183007a854..6cd01632af 100644
--- a/lib/scripts/convertDefault.py
+++ b/lib/scripts/convertDefault.py
@@ -1,11 +1,11 @@
-#!/usr/bin/env python -tt
-# -*- coding: iso-8859-15 -*-
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 # file convertDefault.py
 # This file is part of LyX, the document processor.
 # Licence details can be found in the file COPYING.
 
-# \author Herbert Voß
+# \author Herbert Voß
 # \author Bo Peng
 
 # Full author contact details are available in file CREDITS.
@@ -17,8 +17,41 @@
 # replacement in ~/.lyx/scripts
 
 # converts an image from $1 to $2 format
-import os, sys
-if os.system(r'convert -depth 8 "%s" "%s"' % (sys.argv[1], sys.argv[2])) != 0:
+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 = 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 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:
     print >> sys.stderr, sys.argv[0], 'ERROR'
     print >> sys.stderr, 'Execution of "convert" failed.'
     sys.exit(1)