Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fixed reading APP13 marker without Photoshop data #3771

Merged
merged 1 commit into from May 4, 2019
Merged

Fixed reading APP13 marker without Photoshop data #3771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added Tests/images/app13.jpg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions Tests/test_file_jpeg.py
View file
Open in desktop
Expand Up @@ -620,6 +620,10 @@ def test_photoshop(self):
'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):
Expand Down
2 changes: 1 addition & 1 deletion src/PIL/JpegImagePlugin.py
View file
Open in desktop
Expand Up @@ -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
Expand Down