From f39d3bbc4416402b7538dbaf5970e5525765deee Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 7 Jun 2024 13:10:53 +1000 Subject: [PATCH] Do not preserve EXIFIFD tag by default --- Tests/test_file_libtiff.py | 13 +++++++++---- src/PIL/TiffImagePlugin.py | 12 ++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py index 22bcd285622..20c0bae9218 100644 --- a/Tests/test_file_libtiff.py +++ b/Tests/test_file_libtiff.py @@ -685,13 +685,18 @@ def test_save_ycbcr(self, tmp_path: Path) -> None: assert reloaded.tag_v2[530] == (1, 1) assert reloaded.tag_v2[532] == (0, 255, 128, 255, 128, 255) - def test_exif_ifd(self, tmp_path: Path) -> None: - outfile = str(tmp_path / "temp.tif") + def test_exif_ifd(self) -> None: + out = io.BytesIO() with Image.open("Tests/images/tiff_adobe_deflate.tif") as im: assert im.tag_v2[34665] == 125456 - im.save(outfile) + im.save(out, "TIFF") - with Image.open(outfile) as reloaded: + with Image.open(out) as reloaded: + assert 34665 not in reloaded.tag_v2 + + im.save(out, "TIFF", tiffinfo={34665: 125456}) + + with Image.open(out) as reloaded: if Image.core.libtiff_support_custom_tags: assert reloaded.tag_v2[34665] == 125456 diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 04f36744bed..953fc2c0f8d 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1816,11 +1816,15 @@ def _save(im, fp, filename): if hasattr(im, "tag"): legacy_ifd = im.tag.to_v2() - # SAMPLEFORMAT is determined by the image format and should not be copied - # from legacy_ifd. supplied_tags = {**getattr(im, "tag_v2", {}), **legacy_ifd} - if SAMPLEFORMAT in supplied_tags: - del supplied_tags[SAMPLEFORMAT] + for tag in ( + # IFD offset that may not be correct in the saved image + EXIFIFD, + # Determined by the image format and should not be copied from legacy_ifd. + SAMPLEFORMAT + ): + if tag in supplied_tags: + del supplied_tags[tag] for tag, value in itertools.chain(ifd.items(), supplied_tags.items()): # Libtiff can only process certain core items without adding