X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2FconvertDefault.py;h=9a460b7cf3031e11495f3f68a24e35831ae4dd3d;hb=1a36fee79dc2f4ce83f47db44c8093831d20e6c0;hp=54e4f213dc08c6b0fc0db357d960fbe2ddd6dcf3;hpb=b8f7bc90c61be5a4287cd4b1f7ee1fd7c7c577ba;p=lyx.git

diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index 54e4f213dc..9a460b7cf3 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,25 +15,66 @@
 # 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()
+PY2 = sys.version_info[0] == 2
+
+# 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 not PY2:
+    output = output.decode()
+
+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 = hex(major * 65536 + minor * 256 + 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
 
-# for ppm target formats, we need to flatten image, as ppm has no support
-# for alpha channel, see bug 4749
-if sys.argv[2][:4] == 'ppm:':
+if im or gm:
+    opts = "-depth 8"
+elif sys.platform == 'darwin':
+    command = 'lyxconvert'
+
+# If supported, add the -define option for pdf source formats
+if sys.argv[1] == '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[3] == 'ppm' and (im 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.'
+# print (command, sys.argv[2], sys.argv[4], file= sys.stdout)
+if (im or gm) and os.system(r'%s %s "%s" "%s"' % (command, opts, sys.argv[2], 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)