python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-27 02:16:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow saving L mode TIFF with PhotometricInterpretation 0

Browse Source
This commit is contained in:
Andrew Murray 2021-08-06 23:50:52 +10:00
parent 2dab52b8a8
commit 9bf7dae03d
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tests/test_file_tiff.py
View File

@ -447,9 +447,10 @@ class TestFileTiff:
im.seek(1) im.seek(1)
assert im.getexif()[273] == (1408, 1907) assert im.getexif()[273] == (1408, 1907)
def test_photometric(self, tmp_path): @pytest.mark.parametrize("mode", ("1", "L"))
def test_photometric(self, mode, tmp_path):
filename = str(tmp_path / "temp.tif") filename = str(tmp_path / "temp.tif")
im = hopper("1") im = hopper(mode)
im.save(filename, tiffinfo={262: 0}) im.save(filename, tiffinfo={262: 0})
with Image.open(filename) as reloaded: with Image.open(filename) as reloaded:
assert reloaded.tag_v2[262] == 0 assert reloaded.tag_v2[262] == 0

7
src/PIL/TiffImagePlugin.py
View File

@ -48,7 +48,7 @@ from collections.abc import MutableMapping
from fractions import Fraction from fractions import Fraction
from numbers import Number, Rational from numbers import Number, Rational
from . import Image, ImageFile, ImagePalette, TiffTags from . import Image, ImageFile, ImageOps, ImagePalette, TiffTags
from ._binary import o8 from ._binary import o8
from .TiffTags import TYPES from .TiffTags import TYPES
@ -1572,13 +1572,16 @@ def _save(im, fp, filename):
if PHOTOMETRIC_INTERPRETATION not in ifd: if PHOTOMETRIC_INTERPRETATION not in ifd:
ifd[PHOTOMETRIC_INTERPRETATION] = photo ifd[PHOTOMETRIC_INTERPRETATION] = photo
elif im.mode == "1" and ifd[PHOTOMETRIC_INTERPRETATION] == 0: elif im.mode in ("1", "L") and ifd[PHOTOMETRIC_INTERPRETATION] == 0:
if im.mode == "1":
inverted_im = im.copy() inverted_im = im.copy()
px = inverted_im.load() px = inverted_im.load()
for y in range(inverted_im.height): for y in range(inverted_im.height):
for x in range(inverted_im.width): for x in range(inverted_im.width):
px[x, y] = 0 if px[x, y] == 255 else 255 px[x, y] = 0 if px[x, y] == 255 else 255
im = inverted_im im = inverted_im
else:
im = ImageOps.invert(im)
if im.mode in ["P", "PA"]: if im.mode in ["P", "PA"]:
lut = im.im.getpalette("RGB", "RGB;L") lut = im.im.getpalette("RGB", "RGB;L")