Concatenate multiple JPEG EXIF markers#7496
Merged
hugovk merged 1 commit intopython-pillow:mainfrom Dec 31, 2023
Merged
Conversation
homm
reviewed
Nov 5, 2023
| if "exif" not in self.info: | ||
| # extract EXIF information (incomplete) | ||
| self.info["exif"] = s # FIXME: value will change | ||
| elif marker == 0xFFE1 and s[:6] == b"Exif\0\0": |
Member
Author
There was a problem hiding this comment.
Since I am removing 6 bytes of the EXIF prefix when concatenating subsequent markers, it makes sense to me to check that the 6-byte prefix is present.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves #7495
The issue has found an image where multiple EXIF markers are present. This is against the specification -
https://en.wikipedia.org/wiki/Exif
but this PR allows Pillow to be more flexible, and concatenates the two markers.
I created a test image with