From: Enrico Forestieri <forenr@lyx.org>
Date: Mon, 21 Jul 2008 10:54:12 +0000 (+0000)
Subject: According to Pavel:
X-Git-Tag: 1.6.10~3975
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=bc1b6917c0a06474c799e4bea237e2b21583ef6b;p=lyx.git

According to Pavel:
http://studio.imagemagick.org/pipermail/magick-developers/2008-July/002997.html
the -flatten option is necessary starting from IM 6.3.5


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25762 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index 26a506a104..fb6f8b6ba3 100644
--- a/lib/scripts/convertDefault.py
+++ b/lib/scripts/convertDefault.py
@@ -37,7 +37,7 @@ if sys.argv[1][:4] == 'pdf:' and version >= 0x060206:
     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 >= 0x060000:
+if sys.argv[2][:4] == 'ppm:' and version >= 0x060305:
     opts = opts + ' -flatten'
 
 if os.system(r'convert %s "%s" "%s"' % (opts, sys.argv[1], sys.argv[2])) != 0: