Fixes for Japanese documents

[lyx.git] / lib / scripts / convertDefault.py

diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index 8678965013a5aa22b0d0d73ab1c3779efebab848..418b553758ed6d95bbdea33ede7549840c8305c2 100644 (file)
--- a/lib/scripts/convertDefault.py
+++ b/lib/scripts/convertDefault.py
@@ -35,7 +35,10 @@ if fout.close() != None:
     output = fout.readline()
     fout.close()
 if not PY2:
-    output = output.decode()
+    # Ensure we have a (unicode) string object in Python3
+    # (not required for version >= 3.5).
+    # FIXME: Check whether this is required with any supported 3.x version!
+    output = str(output)
 
 version = re_version.match(output)
 
@@ -59,7 +62,7 @@ else:
 # IM >= 5.5.8 separates options for source and target files
 # See http://www.imagemagick.org/Usage/basics/#why
 if im or gm:
-    sopts = "-depth 8"
+    sopts = ""
     topts = ""
 elif sys.platform == 'darwin':
     command = 'lyxconvert'