Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 18:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of ImageMagick from WMF

Browse Source
This commit is contained in:
Kovid Goyal 2016-05-04 17:47:20 +05:30
parent bf7effcfe3
commit 77d35120be
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/calibre/utils/wmf/__init__.py
View File

@ -57,23 +57,12 @@ def create_bmp_from_dib(raw):
return b''.join(parts) + raw return b''.join(parts) + raw
def to_png(bmp): def to_png(bmp):
# ImageMagick does not convert some bmp files correctly, while Qt does,
# so try Qt first. See for instance:
# https://bugs.launchpad.net/calibre/+bug/934167
# ImageMagick bug report:
# http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=20350
from PyQt5.Qt import QImage, QByteArray, QBuffer from PyQt5.Qt import QImage, QByteArray, QBuffer
i = QImage() i = QImage()
if i.loadFromData(bmp): if not i.loadFromData(bmp):
ba = QByteArray() raise ValueError('Invalid image data')
buf = QBuffer(ba) ba = QByteArray()
buf.open(QBuffer.WriteOnly) buf = QBuffer(ba)
i.save(buf, 'png') buf.open(QBuffer.WriteOnly)
return bytes(ba.data()) i.save(buf, 'png')
return bytes(ba.data())
from calibre.utils.magick import Image
img = Image()
img.load(bmp)
return img.export('png')