python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-14 03:21:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6762 from radarhere/exif_hide_offsets

Browse Source
This commit is contained in:
Hugo van Kemenade 2022-12-23 16:05:21 +02:00 committed by GitHub
commit 0934c25686
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Tests/test_image.py
View File

@ -851,6 +851,31 @@ class TestImage:
34665: 196, 34665: 196,
} }
def test_exif_hide_offsets(self):
with Image.open("Tests/images/flower.jpg") as im:
exif = im.getexif()
# Check offsets are present initially
assert 0x8769 in exif
for tag in (0xA005, 0x927C):
assert tag in exif.get_ifd(0x8769)
assert exif.get_ifd(0xA005)
loaded_exif = exif
with Image.open("Tests/images/flower.jpg") as im:
new_exif = im.getexif()
for exif in (loaded_exif, new_exif):
exif.hide_offsets()
# Assert they are hidden afterwards,
# but that the IFDs are still available
assert 0x8769 not in exif
assert exif.get_ifd(0x8769)
for tag in (0xA005, 0x927C):
assert tag not in exif.get_ifd(0x8769)
assert exif.get_ifd(0xA005)
@pytest.mark.parametrize("size", ((1, 0), (0, 1), (0, 0))) @pytest.mark.parametrize("size", ((1, 0), (0, 1), (0, 0)))
def test_zero_tobytes(self, size): def test_zero_tobytes(self, size):
im = Image.new("RGB", size) im = Image.new("RGB", size)

23
src/PIL/Image.py
View File

@ -3551,6 +3551,7 @@ class Exif(MutableMapping):
def __init__(self): def __init__(self):
self._data = {} self._data = {}
self._hidden_data = {}
self._ifds = {} self._ifds = {}
self._info = None self._info = None
self._loaded_exif = None self._loaded_exif = None
@ -3604,6 +3605,7 @@ class Exif(MutableMapping):
return return
self._loaded_exif = data self._loaded_exif = data
self._data.clear() self._data.clear()
self._hidden_data.clear()
self._ifds.clear() self._ifds.clear()
if data and data.startswith(b"Exif\x00\x00"): if data and data.startswith(b"Exif\x00\x00"):
data = data[6:] data = data[6:]
@ -3624,6 +3626,7 @@ class Exif(MutableMapping):
def load_from_fp(self, fp, offset=None): def load_from_fp(self, fp, offset=None):
self._loaded_exif = None self._loaded_exif = None
self._data.clear() self._data.clear()
self._hidden_data.clear()
self._ifds.clear() self._ifds.clear()
# process dictionary # process dictionary
@ -3686,8 +3689,9 @@ class Exif(MutableMapping):
if self._info is not None: if self._info is not None:
self._ifds[tag] = self._get_ifd_dict(self._info.next) self._ifds[tag] = self._get_ifd_dict(self._info.next)
elif tag in [ExifTags.IFD.Exif, ExifTags.IFD.GPSInfo]: elif tag in [ExifTags.IFD.Exif, ExifTags.IFD.GPSInfo]:
if tag in self: offset = self._hidden_data.get(tag, self.get(tag))
self._ifds[tag] = self._get_ifd_dict(self[tag]) if offset is not None:
self._ifds[tag] = self._get_ifd_dict(offset)
elif tag in [ExifTags.IFD.Interop, ExifTags.IFD.Makernote]: elif tag in [ExifTags.IFD.Interop, ExifTags.IFD.Makernote]:
if ExifTags.IFD.Exif not in self._ifds: if ExifTags.IFD.Exif not in self._ifds:
self.get_ifd(ExifTags.IFD.Exif) self.get_ifd(ExifTags.IFD.Exif)
@ -3770,7 +3774,20 @@ class Exif(MutableMapping):
else: else:
# Interop # Interop
self._ifds[tag] = self._get_ifd_dict(tag_data) self._ifds[tag] = self._get_ifd_dict(tag_data)
return self._ifds.get(tag, {}) ifd = self._ifds.get(tag, {})
if tag == ExifTags.IFD.Exif and self._hidden_data:
ifd = {
k: v
for (k, v) in ifd.items()
if k not in (ExifTags.IFD.Interop, ExifTags.IFD.Makernote)
}
return ifd
def hide_offsets(self):
for tag in (ExifTags.IFD.Exif, ExifTags.IFD.GPSInfo):
if tag in self:
self._hidden_data[tag] = self[tag]
del self[tag]
def __str__(self): def __str__(self):
if self._info is not None: if self._info is not None: