Skip to content

Commit

Permalink
Limit TIFF strip size when saving with libtiff
Browse files Browse the repository at this point in the history
  • Loading branch information
kmilos committed Jun 2, 2021
1 parent 22e1fff commit 4b5488c
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions src/PIL/TiffImagePlugin.py
Expand Up @@ -1553,12 +1553,18 @@ def _save(im, fp, filename):
ifd[COLORMAP] = tuple(v * 256 for v in lut)
# data orientation
stride = len(bits) * ((im.size[0] * bits[0] + 7) // 8)
ifd[ROWSPERSTRIP] = im.size[1]
rows_per_strip = im.size[1]
strip_byte_counts = stride * im.size[1]
# aim for 64 KB strips when using libtiff writer
while libtiff and strip_byte_counts > 2 ** 16 and rows_per_strip > 1:
rows_per_strip = (rows_per_strip + 1) // 2
strip_byte_counts = stride * rows_per_strip
strips_per_image = (im.size[1] + rows_per_strip - 1) // rows_per_strip
ifd[ROWSPERSTRIP] = rows_per_strip
if strip_byte_counts >= 2 ** 16:
ifd.tagtype[STRIPBYTECOUNTS] = TiffTags.LONG
ifd[STRIPBYTECOUNTS] = strip_byte_counts
ifd[STRIPOFFSETS] = 0 # this is adjusted by IFD writer
ifd[STRIPBYTECOUNTS] = (strip_byte_counts,) * (strips_per_image - 1) + (stride * im.size[1] - strip_byte_counts * (strips_per_image - 1),)
ifd[STRIPOFFSETS] = tuple(range(0, strip_byte_counts * strips_per_image, strip_byte_counts)) # this is adjusted by IFD writer
# no compression by default:
ifd[COMPRESSION] = COMPRESSION_INFO_REV.get(compression, 1)

Expand Down

0 comments on commit 4b5488c

Please sign in to comment.