python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-11-04 09:57:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5556 from radarhere/empty_subifd

Browse Source 
Fixed undefined variable in logging
This commit is contained in:
Hugo van Kemenade 2021-06-26 08:39:11 +03:00 committed by GitHub
commit 52856bceb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Tests/test_file_tiff_metadata.py
View File

@ -376,3 +376,16 @@ def test_too_many_entries():
# Should not raise ValueError. # Should not raise ValueError.
pytest.warns(UserWarning, lambda: ifd[277]) pytest.warns(UserWarning, lambda: ifd[277])
def test_empty_subifd(tmp_path):
out = str(tmp_path / "temp.jpg")
im = hopper()
exif = im.getexif()
exif[TiffImagePlugin.EXIFIFD] = {}
im.save(out, exif=exif)
with Image.open(out) as reloaded:
exif = reloaded.getexif()
assert exif.get_ifd(TiffImagePlugin.EXIFIFD) == {}

3
src/PIL/TiffImagePlugin.py
View File

@ -826,7 +826,8 @@ class ImageFileDirectory_v2(MutableMapping):
else: else:
ifh = b"MM\x00\x2A\x00\x00\x00\x08" ifh = b"MM\x00\x2A\x00\x00\x00\x08"
ifd = ImageFileDirectory_v2(ifh) ifd = ImageFileDirectory_v2(ifh)
for ifd_tag, ifd_value in self._tags_v2[tag].items(): values = self._tags_v2[tag]
for ifd_tag, ifd_value in values.items():
ifd[ifd_tag] = ifd_value ifd[ifd_tag] = ifd_value
data = ifd.tobytes(offset) data = ifd.tobytes(offset)
else: else: