mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-01-19 22:04:24 +03:00
Fix count of BITSPERSAMPLE items in broken TIFF files
This commit is contained in:
parent
636dc62f0e
commit
c4cd036dd8
|
@ -1186,12 +1186,23 @@ class TiffImageFile(ImageFile.ImageFile):
|
||||||
# for more exotic images.
|
# for more exotic images.
|
||||||
sampleFormat = (1,)
|
sampleFormat = (1,)
|
||||||
|
|
||||||
|
bps_tuple = self.tag_v2.get(BITSPERSAMPLE, (1,))
|
||||||
|
extra_tuple = self.tag_v2.get(EXTRASAMPLES, ())
|
||||||
|
if photo in (2, 6, 8): # RGB, YCbCr, LAB
|
||||||
|
bps_count = 3
|
||||||
|
elif photo == 5:
|
||||||
|
bps_count = 4
|
||||||
|
else:
|
||||||
|
bps_count = 1
|
||||||
|
bps_count += len(extra_tuple)
|
||||||
|
# Some files have only one value in bps_tuple,
|
||||||
|
# while should have more. Fix it
|
||||||
|
if bps_count > len(bps_tuple) and len(bps_tuple) == 1:
|
||||||
|
bps_tuple = bps_tuple * bps_count
|
||||||
|
|
||||||
# mode: check photometric interpretation and bits per pixel
|
# mode: check photometric interpretation and bits per pixel
|
||||||
key = (
|
key = (self.tag_v2.prefix, photo, sampleFormat, fillorder,
|
||||||
self.tag_v2.prefix, photo, sampleFormat, fillorder,
|
bps_tuple, extra_tuple)
|
||||||
self.tag_v2.get(BITSPERSAMPLE, (1,)),
|
|
||||||
self.tag_v2.get(EXTRASAMPLES, ())
|
|
||||||
)
|
|
||||||
if DEBUG:
|
if DEBUG:
|
||||||
print("format key:", key)
|
print("format key:", key)
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user