python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-03 19:33:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7641 from hugovk/optimise-imagemode

Browse Source 
Optimise `ImageMode.getmode` using `functools.lru_cache`
This commit is contained in:
Andrew Murray 2023-12-27 09:42:26 +11:00 committed by GitHub
commit 1e8bad805e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
src/PIL/ImageMode.py
View File

@ -15,9 +15,7 @@
from __future__ import annotations from __future__ import annotations
import sys import sys
from functools import lru_cache
# mode descriptor cache
_modes = None
class ModeDescriptor: class ModeDescriptor:
@ -41,58 +39,58 @@ class ModeDescriptor:
return self.mode return self.mode
@lru_cache
def getmode(mode: str) -> ModeDescriptor: def getmode(mode: str) -> ModeDescriptor:
"""Gets a mode descriptor for the given mode.""" """Gets a mode descriptor for the given mode."""
global _modes # initialize mode cache
if not _modes: endian = "<" if sys.byteorder == "little" else ">"
# initialize mode cache
modes = {} modes = {
endian = "<" if sys.byteorder == "little" else ">" # core modes
for m, (basemode, basetype, bands, typestr) in { # Bits need to be extended to bytes
# core modes "1": ("L", "L", ("1",), "|b1"),
# Bits need to be extended to bytes "L": ("L", "L", ("L",), "|u1"),
"1": ("L", "L", ("1",), "|b1"), "I": ("L", "I", ("I",), endian + "i4"),
"L": ("L", "L", ("L",), "|u1"), "F": ("L", "F", ("F",), endian + "f4"),
"I": ("L", "I", ("I",), endian + "i4"), "P": ("P", "L", ("P",), "|u1"),
"F": ("L", "F", ("F",), endian + "f4"), "RGB": ("RGB", "L", ("R", "G", "B"), "|u1"),
"P": ("P", "L", ("P",), "|u1"), "RGBX": ("RGB", "L", ("R", "G", "B", "X"), "|u1"),
"RGB": ("RGB", "L", ("R", "G", "B"), "|u1"), "RGBA": ("RGB", "L", ("R", "G", "B", "A"), "|u1"),
"RGBX": ("RGB", "L", ("R", "G", "B", "X"), "|u1"), "CMYK": ("RGB", "L", ("C", "M", "Y", "K"), "|u1"),
"RGBA": ("RGB", "L", ("R", "G", "B", "A"), "|u1"), "YCbCr": ("RGB", "L", ("Y", "Cb", "Cr"), "|u1"),
"CMYK": ("RGB", "L", ("C", "M", "Y", "K"), "|u1"), # UNDONE - unsigned |u1i1i1
"YCbCr": ("RGB", "L", ("Y", "Cb", "Cr"), "|u1"), "LAB": ("RGB", "L", ("L", "A", "B"), "|u1"),
# UNDONE - unsigned |u1i1i1 "HSV": ("RGB", "L", ("H", "S", "V"), "|u1"),
"LAB": ("RGB", "L", ("L", "A", "B"), "|u1"), # extra experimental modes
"HSV": ("RGB", "L", ("H", "S", "V"), "|u1"), "RGBa": ("RGB", "L", ("R", "G", "B", "a"), "|u1"),
# extra experimental modes "BGR;15": ("RGB", "L", ("B", "G", "R"), "|u1"),
"RGBa": ("RGB", "L", ("R", "G", "B", "a"), "|u1"), "BGR;16": ("RGB", "L", ("B", "G", "R"), "|u1"),
"BGR;15": ("RGB", "L", ("B", "G", "R"), "|u1"), "BGR;24": ("RGB", "L", ("B", "G", "R"), "|u1"),
"BGR;16": ("RGB", "L", ("B", "G", "R"), "|u1"), "LA": ("L", "L", ("L", "A"), "|u1"),
"BGR;24": ("RGB", "L", ("B", "G", "R"), "|u1"), "La": ("L", "L", ("L", "a"), "|u1"),
"LA": ("L", "L", ("L", "A"), "|u1"), "PA": ("RGB", "L", ("P", "A"), "|u1"),
"La": ("L", "L", ("L", "a"), "|u1"), }
"PA": ("RGB", "L", ("P", "A"), "|u1"), if mode in modes:
}.items(): base_mode, base_type, bands, type_str = modes[mode]
modes[m] = ModeDescriptor(m, bands, basemode, basetype, typestr) return ModeDescriptor(mode, bands, base_mode, base_type, type_str)
# mapping modes
for i16mode, typestr in { mapping_modes = {
# I;16 == I;16L, and I;32 == I;32L # I;16 == I;16L, and I;32 == I;32L
"I;16": "<u2", "I;16": "<u2",
"I;16S": "<i2", "I;16S": "<i2",
"I;16L": "<u2", "I;16L": "<u2",
"I;16LS": "<i2", "I;16LS": "<i2",
"I;16B": ">u2", "I;16B": ">u2",
"I;16BS": ">i2", "I;16BS": ">i2",
"I;16N": endian + "u2", "I;16N": endian + "u2",
"I;16NS": endian + "i2", "I;16NS": endian + "i2",
"I;32": "<u4", "I;32": "<u4",
"I;32B": ">u4", "I;32B": ">u4",
"I;32L": "<u4", "I;32L": "<u4",
"I;32S": "<i4", "I;32S": "<i4",
"I;32BS": ">i4", "I;32BS": ">i4",
"I;32LS": "<i4", "I;32LS": "<i4",
}.items(): }
modes[i16mode] = ModeDescriptor(i16mode, ("I",), "L", "L", typestr)
# set global mode cache atomically type_str = mapping_modes[mode]
_modes = modes return ModeDescriptor(mode, ("I",), "L", "L", type_str)
return _modes[mode]