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

MOBI Output: Fix JPEG images without any JFIF metadata not being rendered on the Kindle

Browse Source
This commit is contained in:
Kovid Goyal 2021-08-20 11:36:46 +05:30
parent 30c411acd1
commit 9e2a7fca94
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/ebooks/mobi/writer2/resources.py
View File

@ -7,6 +7,8 @@ __copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
import os
from PIL import Image
from io import BytesIO
from calibre.ebooks.mobi import MAX_THUMB_DIMEN, MAX_THUMB_SIZE
from calibre.ebooks.mobi.utils import (rescale_image, mobify_image,
@ -20,6 +22,16 @@ from polyglot.builtins import iteritems, unicode_type
PLACEHOLDER_GIF = b'GIF89a\x01\x00\x01\x00\xf0\x00\x00\x00\x00\x00\xff\xff\xff!\xf9\x04\x01\x00\x00\x00\x00!\xfe calibre-placeholder-gif-for-azw3\x00,\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02D\x01\x00;' # noqa
def ensure_jpeg_has_jfif(data: bytes) -> bytes:
# Amazon's MOBI renderer can render JPEG images without JFIF metadata
img = Image.open(BytesIO(data))
if img.format == 'JPEG' and not img.info:
out = BytesIO()
img.save(out, img.format)
data = out.getvalue()
return data
class Resources(object):
def __init__(self, oeb, opts, is_periodical, add_fonts=False,
@ -44,7 +56,7 @@ class Resources(object):
return data
func = mobify_image if self.opts.mobi_keep_original_images else rescale_image
try:
return func(data)
return ensure_jpeg_has_jfif(func(data))
except Exception:
if 'png' != what(None, data):
raise