Skip to content

Start from zero index when reading GimpPaletteFile #8805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hugovk merged 5 commits into from
Mar 18, 2025
Merged

Start from zero index when reading GimpPaletteFile #8805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e1cd9ad
Use maxsplit
radarhere Mar 6, 2025
1f6fd3b
Only convert to int if there are enough items
radarhere Mar 6, 2025
6e597a1
Do not force palette length to be 256
radarhere Mar 6, 2025
ca0c940
Do not add palette entries when reading other lines
radarhere Mar 6, 2025
669a288
Convert all entries to bytes at once
radarhere Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Tests/test_file_gimppalette.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ def test_get_palette() -> None:

# Assert
assert mode == "RGB"
assert len(palette) / 3 == 8
15 changes: 6 additions & 9 deletions src/PIL/GimpPaletteFile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,19 @@
import re
from typing import IO

from ._binary import o8


class GimpPaletteFile:
"""File handler for GIMP's palette format."""

rawmode = "RGB"

def __init__(self, fp: IO[bytes]) -> None:
palette = [o8(i) * 3 for i in range(256)]

if not fp.readline().startswith(b"GIMP Palette"):
msg = "not a GIMP palette file"
raise SyntaxError(msg)

for i in range(256):
palette: list[int] = []
for _ in range(256):
s = fp.readline()
if not s:
break
Expand All @@ -45,14 +42,14 @@ def __init__(self, fp: IO[bytes]) -> None:
msg = "bad palette file"
raise SyntaxError(msg)

v = tuple(map(int, s.split()[:3]))
if len(v) != 3:
v = s.split(maxsplit=3)
if len(v) < 3:
msg = "bad palette entry"
raise ValueError(msg)

palette[i] = o8(v[0]) + o8(v[1]) + o8(v[2])
palette += (int(v[i]) for i in range(3))

self.palette = b"".join(palette)
self.palette = bytes(palette)

def getpalette(self) -> tuple[bytes, str]:
return self.palette, self.rawmode