mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpo-44539: Support recognizing JPEG files without JFIF or Exif markers (GH-26964) 

Co-authored-by: moemansour03@gmail.com <m.mansour@tecfrac.com>
Co-authored-by: Éric Araujo <merwok@netwok.org>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
This commit is contained in:
Mohamad Mansour 2021-07-20 21:56:57 +03:00 committed by GitHub
parent 6564656495
commit 3b56b3b97d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/imghdr.py
View File

@ -35,9 +35,11 @@ def what(file, h=None):
tests = [] tests = []
def test_jpeg(h, f): 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'): if h[6:10] in (b'JFIF', b'Exif'):
return 'jpeg' return 'jpeg'
elif h[:4] == b'\xff\xd8\xff\xdb':
return 'jpeg'
tests.append(test_jpeg) tests.append(test_jpeg)

BIN
Lib/test/imghdrdata/python-raw.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 525 B

1
Lib/test/test_imghdr.py
View File

@ -16,6 +16,7 @@
('python.pgm', 'pgm'), ('python.pgm', 'pgm'),
('python.pbm', 'pbm'), ('python.pbm', 'pbm'),
('python.jpg', 'jpeg'), ('python.jpg', 'jpeg'),
('python-raw.jpg', 'jpeg'), # raw JPEG without JFIF/EXIF markers
('python.ras', 'rast'), ('python.ras', 'rast'),
('python.sgi', 'rgb'), ('python.sgi', 'rgb'),
('python.tiff', 'tiff'), ('python.tiff', 'tiff'),

1
Misc/NEWS.d/next/Library/2021-06-30-11-34-35.bpo-44539.nP0Xi4.rst Normal file
View File

@ -0,0 +1 @@
Added support for recognizing JPEG files without JFIF or Exif markers.