X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2FconvertDefault.py;h=c9277131ac8811cdfcfa1ff764d6d5a7526edee3;hb=d6ce4abd40b2e45d5b3b4344c555cf5712135b31;hp=1806b2ecc534834616b4ba87996c6d3e84a3db45;hpb=b343446bd42ccba62ecb0664c757c10c03c545cd;p=lyx.git

diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index 1806b2ecc5..c9277131ac 100644
--- a/lib/scripts/convertDefault.py
+++ b/lib/scripts/convertDefault.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # file convertDefault.py
@@ -16,20 +15,67 @@
 # The user can also redefine this default converter, placing their
 # replacement in ~/.lyx/scripts
 
-# converts an image from $1 to $2 format
-import os, sys
+# converts an image $2 (format $1) to $4 (format $3)
+from __future__ import print_function
+import os, re, sys
 
-opts = "-depth 8"
-# for pdf source formats, check whether convert supports the -define option
-if sys.argv[1][:4] == 'pdf:':
-    defopt = "-define pdf:use-cropbox=true"
-    fout = os.popen('convert ' + defopt + ' 2>&1')
-    output = fout.read()
+# We may need some extra options only supported by recent convert versions
+re_version = re.compile(r'^Version:.*ImageMagick\s*(\d*)\.(\d*)\.(\d*).*$')
+# imagemagick 7
+command = 'magick'
+fout = os.popen('magick -version 2>&1')
+output = fout.readline()
+if fout.close() != None:
+    # older versions
+    # caution: windows has a convert.exe for converting file systems
+    command = 'convert'
+    fout = os.popen('convert -version 2>&1')
+    output = fout.readline()
     fout.close()
-    if not 'unrecognized' in output.lower():
-        opts = defopt + ' ' + opts
 
-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.'
+version = re_version.match(output)
+
+# Imagemagick by default
+im = False
+gm = False
+
+if version != None:
+    major = int(version.group(1))
+    minor = int(version.group(2))
+    patch = int(version.group(3))
+    version = (major, minor, patch)
+    im = True
+else:
+    # Try GraphicsMagick
+    re_version = re.compile(r'^GraphicsMagick.*http:..www.GraphicsMagick.org.*$')
+    version = re_version.match(output)
+    if version != None:
+        gm = True
+        # we need version to be a valid integer 3-tuple
+        version = (1,0,0)
+
+# IM >= 5.5.8 separates options for source and target files
+# See http://www.imagemagick.org/Usage/basics/#why
+if im or gm:
+    sopts = ""
+    topts = ""
+elif sys.platform == 'darwin':
+    command = 'lyxconvert'
+
+# If supported, add the -define option for pdf source formats
+if sys.argv[1] == 'pdf' and (version >= (6,2,6) or gm):
+    sopts = '-define pdf:use-cropbox=true ' + sopts
+
+# If supported, add the -flatten option for ppm target formats (see bug 4749)
+if sys.argv[3] == 'ppm' and (im and version >= (6,3,5) or gm):
+    topts = '-flatten'
+
+# print (command, sys.argv[2], sys.argv[4], file= sys.stdout)
+if (im or gm) and os.system(r'%s %s "%s" %s "%s"' % (command, sopts, sys.argv[2], topts, sys.argv[3] + ':' + sys.argv[4])) != 0:
+    print (sys.argv[0], 'ERROR', file= sys.stderr)
+    print ('Execution of "%s" failed.' % command, file= sys.stderr)
+    sys.exit(1)
+elif not im and not gm and sys.platform == 'darwin' and os.system(r'%s "%s" "%s"' % (command, sys.argv[2], sys.argv[4])) != 0:
+    print (sys.argv[0], 'ERROR', file= sys.stderr)
+    print ('Execution of "%s" failed.' % command, file= sys.stderr)
     sys.exit(1)