From 6fc039a21c683b13c311e1759c3570bc4dc5f459 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 4 May 2021 16:50:12 +1000 Subject: [PATCH] Updated default value for SAMPLESPERPIXEL tag Conflict:NA Reference:https://github.com/python-pillow/Pillow/commit/6fc039a21c683b13c311e1759c3570bc4dc5f459 --- src/PIL/TiffImagePlugin.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index ced414f..860d870 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1250,7 +1250,10 @@ class TiffImageFile(ImageFile.ImageFile): if bps_count > len(bps_tuple) and len(bps_tuple) == 1: bps_tuple = bps_tuple * bps_count - samplesPerPixel = self.tag_v2.get(SAMPLESPERPIXEL, 1) + samplesPerPixel = self.tag_v2.get( + SAMPLESPERPIXEL, + 3 if self._compression == "tiff_jpeg" and photo in (2, 6) else 1, + ) if len(bps_tuple) != samplesPerPixel: raise SyntaxError("unknown data organization") -- 2.27.0