Skip to content

Fix logged tag name when loading Exif data #7842

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

Merged
hugovk merged 2 commits into from
Mar 11, 2024
Merged

Fix logged tag name when loading Exif data #7842

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
492943a
Fix logged tag name when loading with getexif()
radarhere Feb 29, 2024
10b48a6
Merge branch 'main' into exif
radarhere Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/PIL/Image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3714,7 +3714,7 @@ def _fixup_dict(self, src_dict):
# returns a dict with any single item tuples/lists as individual values
return {k: self._fixup(v) for k, v in src_dict.items()}

def _get_ifd_dict(self, offset):
def _get_ifd_dict(self, offset, group=None):
try:
# an offset pointer to the location of the nested embedded IFD.
# It should be a long, but may be corrupted.
Expand All @@ -3724,7 +3724,7 @@ def _get_ifd_dict(self, offset):
else:
from . import TiffImagePlugin

info = TiffImagePlugin.ImageFileDirectory_v2(self.head)
info = TiffImagePlugin.ImageFileDirectory_v2(self.head, group=group)
info.load(self.fp)
return self._fixup_dict(info)

Expand Down Expand Up @@ -3796,14 +3796,14 @@ def _get_merged_dict(self):

# get EXIF extension
if ExifTags.IFD.Exif in self:
ifd = self._get_ifd_dict(self[ExifTags.IFD.Exif])
ifd = self._get_ifd_dict(self[ExifTags.IFD.Exif], ExifTags.IFD.Exif)
if ifd:
merged_dict.update(ifd)

# GPS
if ExifTags.IFD.GPSInfo in self:
merged_dict[ExifTags.IFD.GPSInfo] = self._get_ifd_dict(
self[ExifTags.IFD.GPSInfo]
self[ExifTags.IFD.GPSInfo], ExifTags.IFD.GPSInfo
)

return merged_dict
Expand Down Expand Up @@ -3837,7 +3837,7 @@ def get_ifd(self, tag):
elif tag in [ExifTags.IFD.Exif, ExifTags.IFD.GPSInfo]:
offset = self._hidden_data.get(tag, self.get(tag))
if offset is not None:
self._ifds[tag] = self._get_ifd_dict(offset)
self._ifds[tag] = self._get_ifd_dict(offset, tag)
elif tag in [ExifTags.IFD.Interop, ExifTags.IFD.Makernote]:
if ExifTags.IFD.Exif not in self._ifds:
self.get_ifd(ExifTags.IFD.Exif)
Expand Down Expand Up @@ -3919,7 +3919,7 @@ def get_ifd(self, tag):
self._ifds[tag] = makernote
else:
# Interop
self._ifds[tag] = self._get_ifd_dict(tag_data)
self._ifds[tag] = self._get_ifd_dict(tag_data, tag)
ifd = self._ifds.get(tag, {})
if tag == ExifTags.IFD.Exif and self._hidden_data:
ifd = {
Expand Down