updates

Backend/venv/lib/python3.12/site-packages/PIL/XpmImagePlugin.py

@@ -13,7 +13,7 @@
 #
 # See the README file for information on usage and redistribution.
 #
-
+from __future__ import annotations
 
 import re
 
@@ -24,8 +24,8 @@ from ._binary import o8
 xpm_head = re.compile(b'"([0-9]*) ([0-9]*) ([0-9]*) ([0-9]*)')
 
 
-def _accept(prefix):
-    return prefix[:9] == b"/* XPM */"
+def _accept(prefix: bytes) -> bool:
+    return prefix.startswith(b"/* XPM */")
 
 
 ##
@@ -36,44 +36,37 @@ class XpmImageFile(ImageFile.ImageFile):
     format = "XPM"
     format_description = "X11 Pixel Map"
 
-    def _open(self):
+    def _open(self) -> None:
+        assert self.fp is not None
         if not _accept(self.fp.read(9)):
             msg = "not an XPM file"
             raise SyntaxError(msg)
 
         # skip forward to next string
         while True:
-            s = self.fp.readline()
-            if not s:
+            line = self.fp.readline()
+            if not line:
                 msg = "broken XPM file"
                 raise SyntaxError(msg)
-            m = xpm_head.match(s)
+            m = xpm_head.match(line)
             if m:
                 break
 
         self._size = int(m.group(1)), int(m.group(2))
 
-        pal = int(m.group(3))
+        palette_length = int(m.group(3))
         bpp = int(m.group(4))
 
-        if pal > 256 or bpp != 1:
-            msg = "cannot read this XPM file"
-            raise ValueError(msg)
-
         #
         # load palette description
 
-        palette = [b"\0\0\0"] * 256
+        palette = {}
 
-        for _ in range(pal):
-            s = self.fp.readline()
-            if s[-2:] == b"\r\n":
-                s = s[:-2]
-            elif s[-1:] in b"\r\n":
-                s = s[:-1]
+        for _ in range(palette_length):
+            line = self.fp.readline().rstrip()
 
-            c = s[1]
-            s = s[2:-2].split()
+            c = line[1 : bpp + 1]
+            s = line[bpp + 1 : -2].split()
 
             for i in range(0, len(s), 2):
                 if s[i] == b"c":
@@ -81,11 +74,12 @@ class XpmImageFile(ImageFile.ImageFile):
                     rgb = s[i + 1]
                     if rgb == b"None":
                         self.info["transparency"] = c
-                    elif rgb[:1] == b"#":
-                        # FIXME: handle colour names (see ImagePalette.py)
-                        rgb = int(rgb[1:], 16)
+                    elif rgb.startswith(b"#"):
+                        rgb_int = int(rgb[1:], 16)
                         palette[c] = (
-                            o8((rgb >> 16) & 255) + o8((rgb >> 8) & 255) + o8(rgb & 255)
+                            o8((rgb_int >> 16) & 255)
+                            + o8((rgb_int >> 8) & 255)
+                            + o8(rgb_int & 255)
                         )
                     else:
                         # unknown colour
@@ -98,30 +92,65 @@ class XpmImageFile(ImageFile.ImageFile):
                 msg = "cannot read this XPM file"
                 raise ValueError(msg)
 
-        self._mode = "P"
-        self.palette = ImagePalette.raw("RGB", b"".join(palette))
+        args: tuple[int, dict[bytes, bytes] | tuple[bytes, ...]]
+        if palette_length > 256:
+            self._mode = "RGB"
+            args = (bpp, palette)
+        else:
+            self._mode = "P"
+            self.palette = ImagePalette.raw("RGB", b"".join(palette.values()))
+            args = (bpp, tuple(palette.keys()))
 
-        self.tile = [("raw", (0, 0) + self.size, self.fp.tell(), ("P", 0, 1))]
+        self.tile = [ImageFile._Tile("xpm", (0, 0) + self.size, self.fp.tell(), args)]
 
-    def load_read(self, bytes):
+    def load_read(self, read_bytes: int) -> bytes:
         #
         # load all image data in one chunk
 
         xsize, ysize = self.size
 
-        s = [None] * ysize
-
-        for i in range(ysize):
-            s[i] = self.fp.readline()[1 : xsize + 1].ljust(xsize)
+        assert self.fp is not None
+        s = [self.fp.readline()[1 : xsize + 1].ljust(xsize) for i in range(ysize)]
 
         return b"".join(s)
 
 
+class XpmDecoder(ImageFile.PyDecoder):
+    _pulls_fd = True
+
+    def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
+        assert self.fd is not None
+
+        data = bytearray()
+        bpp, palette = self.args
+        dest_length = self.state.xsize * self.state.ysize
+        if self.mode == "RGB":
+            dest_length *= 3
+        pixel_header = False
+        while len(data) < dest_length:
+            line = self.fd.readline()
+            if not line:
+                break
+            if line.rstrip() == b"/* pixels */" and not pixel_header:
+                pixel_header = True
+                continue
+            line = b'"'.join(line.split(b'"')[1:-1])
+            for i in range(0, len(line), bpp):
+                key = line[i : i + bpp]
+                if self.mode == "RGB":
+                    data += palette[key]
+                else:
+                    data += o8(palette.index(key))
+        self.set_as_raw(bytes(data))
+        return -1, 0
+
+
 #
 # Registry
 
 
 Image.register_open(XpmImageFile.format, XpmImageFile, _accept)
+Image.register_decoder("xpm", XpmDecoder)
 
 Image.register_extension(XpmImageFile.format, ".xpm")