Skip to content

bpo-44539: Support recognizing JPEG files without JFIF or Exif markers #26964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Lib/imghdr.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ def what(file, h=None):
tests = []

def test_jpeg(h, f):
"""JPEG data in JFIF or Exif format"""
"""JPEG data with JFIF or Exif markers; and raw JPEG"""
if h[6:10] in (b'JFIF', b'Exif'):
return 'jpeg'
elif h[:4] == b'\xff\xd8\xff\xdb':
return 'jpeg'

tests.append(test_jpeg)

Expand Down
Binary file added Lib/test/imghdrdata/python-raw.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Lib/test/test_imghdr.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
('python.pgm', 'pgm'),
('python.pbm', 'pbm'),
('python.jpg', 'jpeg'),
('python-raw.jpg', 'jpeg'), # raw JPEG without JFIF/EXIF markers
('python.ras', 'rast'),
('python.sgi', 'rgb'),
('python.tiff', 'tiff'),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added support for recognizing JPEG files without JFIF or Exif markers.