If palette is present but not needed, do not use global palette

This commit is contained in:
Andrew Murray 2022-10-06 08:46:31 +11:00
parent ae6520ccd6
commit e6ffbfd8df
3 changed files with 9 additions and 1 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -92,6 +92,12 @@ def test_l_mode_after_rgb():
assert im.mode == "RGB" assert im.mode == "RGB"
def test_palette_not_needed_for_second_frame():
with Image.open("Tests/images/palette_not_needed_for_second_frame.gif") as im:
im.seek(1)
assert_image_similar(im, hopper("L").convert("RGB"), 8)
def test_strategy(): def test_strategy():
with Image.open("Tests/images/chi.gif") as im: with Image.open("Tests/images/chi.gif") as im:
expected_zero = im.convert("RGB") expected_zero = im.convert("RGB")

View File

@ -274,6 +274,8 @@ class GifImageFile(ImageFile.ImageFile):
p = self.fp.read(3 << bits) p = self.fp.read(3 << bits)
if self._is_palette_needed(p): if self._is_palette_needed(p):
palette = ImagePalette.raw("RGB", p) palette = ImagePalette.raw("RGB", p)
else:
palette = False
# image data # image data
bits = self.fp.read(1)[0] bits = self.fp.read(1)[0]
@ -298,7 +300,7 @@ class GifImageFile(ImageFile.ImageFile):
if self.dispose: if self.dispose:
self.im.paste(self.dispose, self.dispose_extent) self.im.paste(self.dispose, self.dispose_extent)
self._frame_palette = palette or self.global_palette self._frame_palette = palette if palette is not None else self.global_palette
if frame == 0: if frame == 0:
if self._frame_palette: if self._frame_palette:
self.mode = ( self.mode = (