mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-05-28 17:53:11 +03:00
Added Exif hide_offsets()
This commit is contained in:
parent
ad938d5421
commit
3473eb8e7f
|
@ -838,6 +838,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)
|
||||||
|
|
|
@ -3503,6 +3503,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
|
||||||
|
@ -3556,6 +3557,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:]
|
||||||
|
@ -3576,6 +3578,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
|
||||||
|
@ -3631,8 +3634,9 @@ class Exif(MutableMapping):
|
||||||
if tag not in self._ifds:
|
if tag not in self._ifds:
|
||||||
if tag in [0x8769, 0x8825]:
|
if tag in [0x8769, 0x8825]:
|
||||||
# exif, gpsinfo
|
# exif, 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 [0xA005, 0x927C]:
|
elif tag in [0xA005, 0x927C]:
|
||||||
# interop, makernote
|
# interop, makernote
|
||||||
if 0x8769 not in self._ifds:
|
if 0x8769 not in self._ifds:
|
||||||
|
@ -3717,7 +3721,16 @@ 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 == 0x8769 and self._hidden_data:
|
||||||
|
ifd = {k: v for (k, v) in ifd.items() if k not in (0xA005, 0x927C)}
|
||||||
|
return ifd
|
||||||
|
|
||||||
|
def hide_offsets(self):
|
||||||
|
for tag in (0x8769, 0x8825):
|
||||||
|
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:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user