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

DOCX Output: Ignore corrupted images in the input instead of erroring out on them.

Browse Source
This commit is contained in:
Kovid Goyal 2015-10-11 22:35:48 +05:30
parent 23a6c43552
commit 2ba85a0869
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/ebooks/docx/writer/images.py
View File

@ -49,7 +49,12 @@ class ImagesManager(object):
item = self.oeb.manifest.hrefs.get(href) item = self.oeb.manifest.hrefs.get(href)
if item is None or not isinstance(item.data, bytes): if item is None or not isinstance(item.data, bytes):
return return
width, height, fmt = identify_data(item.data) try:
width, height, fmt = identify_data(item.data)
except Exception:
self.log.warning('Replacing corrupted image with blank: %s' % href)
item.data = I('blank.png', data=True, allow_user_override=False)
width, height, fmt = identify_data(item.data)
image_fname = 'media/' + self.create_filename(href, fmt) image_fname = 'media/' + self.create_filename(href, fmt)
image_rid = self.document_relationships.add_image(image_fname) image_rid = self.document_relationships.add_image(image_fname)
self.images[href] = Image(image_rid, image_fname, width, height, fmt, item) self.images[href] = Image(image_rid, image_fname, width, height, fmt, item)