Merge pull request #7111 from radarhere/tiff

Support reading signed 8-bit TIFF images
python-pillow · May 4, 2023 · 1e7c77c · 1e7c77c
2 parents 2467db4 + 9154a6b
commit 1e7c77c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/Tests/images/8bit.s.tif b/Tests/images/8bit.s.tif
diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py
@@ -198,6 +198,12 @@ def test_save_unsupported_mode(self, tmp_path):
         with pytest.raises(OSError):
             im.save(outfile)
 
+    def test_8bit_s(self):
+        with Image.open("Tests/images/8bit.s.tif") as im:
+            im.load()
+            assert im.mode == "L"
+            assert im.getpixel((50, 50)) == 184
+
     def test_little_endian(self):
         with Image.open("Tests/images/16bit.cropped.tif") as im:
             assert im.getpixel((0, 0)) == 480

diff --git a/docs/releasenotes/10.0.0.rst b/docs/releasenotes/10.0.0.rst
@@ -159,7 +159,8 @@ TODO
 Other Changes
 =============
 
-TODO
-^^^^
+Support reading signed 8-bit TIFF images
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-TODO
+TIFF images with signed integer data, 8 bits per sample and a photometric
+interpretaton of BlackIsZero can now be read.
diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py
@@ -170,6 +170,8 @@
     (MM, 0, (1,), 2, (8,), ()): ("L", "L;IR"),
     (II, 1, (1,), 1, (8,), ()): ("L", "L"),
     (MM, 1, (1,), 1, (8,), ()): ("L", "L"),
+    (II, 1, (2,), 1, (8,), ()): ("L", "L"),
+    (MM, 1, (2,), 1, (8,), ()): ("L", "L"),
     (II, 1, (1,), 2, (8,), ()): ("L", "L;R"),
     (MM, 1, (1,), 2, (8,), ()): ("L", "L;R"),
     (II, 1, (1,), 1, (12,), ()): ("I;16", "I;12"),