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

Identify more JPEG images

Browse Source
This commit is contained in:
Kovid Goyal 2013-04-11 22:29:33 +05:30
parent 891b73c785
commit 63983214e0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/utils/imghdr.py
View File

@ -24,7 +24,8 @@ def what(file, h=None):
if res:
return res
finally:
if f: f.close()
if f:
f.close()
return None
@ -38,7 +39,7 @@ def test_jpeg(h, f):
"""JPEG data in JFIF format (Changed by Kovid to mimic the file utility,
the original code was failing with some jpegs that included ICC_PROFILE
data, for example: http://nationalpostnews.files.wordpress.com/2013/03/budget.jpeg?w=300&h=1571)"""
if (h[6:10] in (b'JFIF', b'Exif')) or (h[:2] == b'\xff\xd8' and b'JFIF' in h[:32]):
if (h[6:10] in (b'JFIF', b'Exif')) or (h[:2] == b'\xff\xd8' and (b'JFIF' in h[:32] or b'BIM' in h[:32])):
return 'jpeg'
tests.append(test_jpeg)