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

Merge pull request #5744 from kmilos/patch-2

Browse Source
This commit is contained in:
Hugo van Kemenade 2021-10-14 17:13:31 +03:00 committed by GitHub
commit e04f2ed55b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tests/test_file_libtiff.py
View File

@ -987,6 +987,20 @@ class TestFileLibTiff(LibTiffTestCase):
# Assert that there are multiple strips # Assert that there are multiple strips
assert len(im.tag_v2[STRIPOFFSETS]) > 1 assert len(im.tag_v2[STRIPOFFSETS]) > 1
def test_save_single_strip(self, tmp_path):
im = hopper("RGB").resize((256, 256))
out = str(tmp_path / "temp.tif")
TiffImagePlugin.STRIP_SIZE = 2 ** 18
try:
im.save(out, compression="tiff_adobe_deflate")
with Image.open(out) as im:
assert len(im.tag_v2[STRIPOFFSETS]) == 1
finally:
TiffImagePlugin.STRIP_SIZE = 65536
@pytest.mark.parametrize("compression", ("tiff_adobe_deflate", None)) @pytest.mark.parametrize("compression", ("tiff_adobe_deflate", None))
def test_save_zero(self, compression, tmp_path): def test_save_zero(self, compression, tmp_path):
im = Image.new("RGB", (0, 0)) im = Image.new("RGB", (0, 0))

7
src/PIL/TiffImagePlugin.py
View File

@ -58,6 +58,7 @@ logger = logging.getLogger(__name__)
READ_LIBTIFF = False READ_LIBTIFF = False
WRITE_LIBTIFF = False WRITE_LIBTIFF = False
IFD_LEGACY_API = True IFD_LEGACY_API = True
STRIP_SIZE = 65536
II = b"II" # little-endian (Intel style) II = b"II" # little-endian (Intel style)
MM = b"MM" # big-endian (Motorola style) MM = b"MM" # big-endian (Motorola style)
@ -1617,11 +1618,9 @@ def _save(im, fp, filename):
ifd[COLORMAP] = tuple(v * 256 for v in lut) ifd[COLORMAP] = tuple(v * 256 for v in lut)
# data orientation # data orientation
stride = len(bits) * ((im.size[0] * bits[0] + 7) // 8) stride = len(bits) * ((im.size[0] * bits[0] + 7) // 8)
# aim for 64 KB strips when using libtiff writer # aim for given strip size (64 KB by default) when using libtiff writer
if libtiff: if libtiff:
rows_per_strip = ( rows_per_strip = 1 if stride == 0 else min(STRIP_SIZE // stride, im.size[1])
1 if stride == 0 else min((2 ** 16 + stride - 1) // stride, im.size[1])
)
# JPEG encoder expects multiple of 8 rows # JPEG encoder expects multiple of 8 rows
if compression == "jpeg": if compression == "jpeg":
rows_per_strip = min(((rows_per_strip + 7) // 8) * 8, im.size[1]) rows_per_strip = min(((rows_per_strip + 7) // 8) * 8, im.size[1])