Fixed reading APP13 marker without Photoshop data

This commit is contained in:
Andrew Murray 2019-04-05 20:02:45 +11:00
parent d61ab018fe
commit 2274c2afc7
3 changed files with 5 additions and 1 deletions

BIN
Tests/images/app13.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 563 B

View File

@ -620,6 +620,10 @@ class TestFileJpeg(PillowTestCase):
'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")
class TestFileCloseW32(PillowTestCase):

View File

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