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

Fix bug #2896: UnicodeError when writing some images to pdb ereader file.

Browse Source
This commit is contained in:
John Schember 2009-07-21 18:40:20 -04:00
parent 405485f126
commit 73aaebe947
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/calibre/ebooks/pdb/ereader/writer.py
View File

@ -46,13 +46,17 @@ class Writer(FormatWriter):
sections = hr+text+images+metadata+['MeTaInFo\x00'] sections = hr+text+images+metadata+['MeTaInFo\x00']
lengths = [len(i) for i in sections] lengths = [len(i) if i not in images else len(i[0]) + len(i[1]) for i in sections]
pdbHeaderBuilder = PdbHeaderBuilder(IDENTITY, metadata[0].partition('\x00')[0]) pdbHeaderBuilder = PdbHeaderBuilder(IDENTITY, metadata[0].partition('\x00')[0])
pdbHeaderBuilder.build_header(lengths, out_stream) pdbHeaderBuilder.build_header(lengths, out_stream)
for item in sections: for item in sections:
out_stream.write(item) if item in images:
out_stream.write(item[0])
out_stream.write(item[1])
else:
out_stream.write(item)
def _text(self, oeb_book): def _text(self, oeb_book):
pmlmlizer = PMLMLizer(self.log) pmlmlizer = PMLMLizer(self.log)
@ -69,10 +73,10 @@ class Writer(FormatWriter):
for item in manifest: for item in manifest:
if item.media_type in OEB_IMAGES: if item.media_type in OEB_IMAGES:
image = 'PNG ' header = 'PNG '
image += image_name(item.href) header += image_name(item.href)
image = image.ljust(62, '\x00') header = header.ljust(62, '\x00')
im = Image.open(cStringIO.StringIO(item.data)).convert('P') im = Image.open(cStringIO.StringIO(item.data)).convert('P')
im.thumbnail((300,300), Image.ANTIALIAS) im.thumbnail((300,300), Image.ANTIALIAS)
@ -81,10 +85,8 @@ class Writer(FormatWriter):
im.save(data, 'PNG') im.save(data, 'PNG')
data = data.getvalue() data = data.getvalue()
image += data if len(data) + len(header) < 65505:
images.append((header, data))
if len(image) < 65505:
images.append(image)
return images return images