Determine MPO size from markers, not EXIF data #7884
Merged
Conversation
This file contains 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
radarhere
changed the title
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 #7879
From my reading, Page 10 of the MPO specification shows that the APP1 marker should contain EXIF data. However, a user has found an image where it does not. This lead to an error when the not-EXIF data was treated as EXIF data, and an error when the size of the second frame wasn't read from the EXIF data.
This PR updates the code to use JpegImagePlugin's reading of markers. This allows for the possibility of APP1 markers without EXIF data, and reads the size from SOF-like markers instead of from EXIF data.