Added strip_size as TIFF encoder argument

python-pillow · Aug 1, 2022 · 2b14d83 · 2b14d83
1 parent f5b27f9
commit 2b14d83
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py
@@ -1011,14 +1011,18 @@ def test_save_multistrip(self, compression, tmp_path):
             # Assert that there are multiple strips
             assert len(im.tag_v2[STRIPOFFSETS]) > 1
 
-    def test_save_single_strip(self, tmp_path):
+    @pytest.mark.parametrize("argument", (True, False))
+    def test_save_single_strip(self, argument, tmp_path):
         im = hopper("RGB").resize((256, 256))
         out = str(tmp_path / "temp.tif")
 
-        TiffImagePlugin.STRIP_SIZE = 2**18
+        if not argument:
+            TiffImagePlugin.STRIP_SIZE = 2**18
         try:
-
-            im.save(out, compression="tiff_adobe_deflate")
+            arguments = {"compression": "tiff_adobe_deflate"}
+            if argument:
+                arguments["strip_size"] = 2**18
+            im.save(out, **arguments)
 
             with Image.open(out) as im:
                 assert len(im.tag_v2[STRIPOFFSETS]) == 1

diff --git a/src/PIL/PdfImagePlugin.py b/src/PIL/PdfImagePlugin.py
@@ -25,7 +25,7 @@
 import os
 import time
 
-from . import Image, ImageFile, ImageSequence, PdfParser, TiffImagePlugin, __version__
+from . import Image, ImageFile, ImageSequence, PdfParser, __version__
 
 #
 # --------------------------------------------------------------------
@@ -181,10 +181,13 @@ def _save(im, fp, filename, save_all=False):
             if filter == "ASCIIHexDecode":
                 ImageFile._save(im, op, [("hex", (0, 0) + im.size, 0, im.mode)])
             elif filter == "CCITTFaxDecode":
-                original_strip_size = TiffImagePlugin.STRIP_SIZE
-                TiffImagePlugin.STRIP_SIZE = math.ceil(im.width / 8) * im.height
-                im.save(op, "TIFF", compression="group4")
-                TiffImagePlugin.STRIP_SIZE = original_strip_size
+                im.save(
+                    op,
+                    "TIFF",
+                    compression="group4",
+                    # use a single strip
+                    strip_size=math.ceil(im.width / 8) * im.height,
+                )
             elif filter == "DCTDecode":
                 Image.SAVE["JPEG"](im, op, filename)
             elif filter == "FlateDecode":

diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py
@@ -1684,7 +1684,8 @@ def _save(im, fp, filename):
     stride = len(bits) * ((im.size[0] * bits[0] + 7) // 8)
     # aim for given strip size (64 KB by default) when using libtiff writer
     if libtiff:
-        rows_per_strip = 1 if stride == 0 else min(STRIP_SIZE // stride, im.size[1])
+        im_strip_size = encoderinfo.get("strip_size", STRIP_SIZE)
+        rows_per_strip = 1 if stride == 0 else min(im_strip_size // stride, im.size[1])
         # JPEG encoder expects multiple of 8 rows
         if compression == "jpeg":
             rows_per_strip = min(((rows_per_strip + 7) // 8) * 8, im.size[1])