python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-10-31 16:07:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3771 from radarhere/app13

Browse Source 
Fixed reading APP13 marker without Photoshop data
This commit is contained in:
Hugo 2019-05-04 16:10:02 +03:00 committed by GitHub
commit 0ccd887431
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/app13.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 563 B

4
Tests/test_file_jpeg.py
View File

@ -620,6 +620,10 @@ class TestFileJpeg(PillowTestCase):
'DisplayedUnitsY': 1, 'DisplayedUnitsY': 1,
}) })
# This image does not contain a Photoshop header string
im = Image.open("Tests/images/app13.jpg")
self.assertNotIn("photoshop", im.info)
@unittest.skipUnless(sys.platform.startswith('win32'), "Windows only") @unittest.skipUnless(sys.platform.startswith('win32'), "Windows only")
class TestFileCloseW32(PillowTestCase): class TestFileCloseW32(PillowTestCase):

2
src/PIL/JpegImagePlugin.py
View File

@ -136,7 +136,7 @@ def APP(self, marker):
offset = offset + size offset = offset + size
if offset & 1: if offset & 1:
offset += 1 offset += 1
self.info["photoshop"] = photoshop self.info["photoshop"] = photoshop
elif marker == 0xFFEE and s[:5] == b"Adobe": elif marker == 0xFFEE and s[:5] == b"Adobe":
self.info["adobe"] = i16(s, 5) self.info["adobe"] = i16(s, 5)
# extract Adobe custom properties # extract Adobe custom properties