Seek to IFD offset #3584
Merged
Seek to IFD offset #3584
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
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
hugovk
approved these changes
Feb 3, 2019
src/PIL/JpegImagePlugin.py
Outdated
| @@ -463,6 +463,7 @@ def _getexif(self): | |||
| head = file.read(8) | |||
| # process dictionary | |||
| info = TiffImagePlugin.ImageFileDirectory_v1(head) | |||
| file.seek(info.next) | |||
There was a problem hiding this comment.
Unrelated, but whilst this method is being edited, shall we rename the file variable so it's not shadowing the builtin?
There was a problem hiding this comment.
Okay, I've pushed a commit.
This was referenced Aug 24, 2019
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 #3337
The IFD offset is described in the table on page 16 (page 10 according to the bottom of the page numbering) of https://www.exif.org/Exif2-2.PDF. This is parsed at
Pillow/src/PIL/TiffImagePlugin.py
Line 491 in 7bf5246
In
TiffImageFile, this is used in_opento seek to the correct position beforeload(), throughPillow/src/PIL/TiffImagePlugin.py
Lines 972 to 978 in 7bf5246
Pillow/src/PIL/TiffImagePlugin.py
Line 1045 in 7bf5246
However, this is not done in
_getmp()and_getexif(). This PR fixes that.