python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-28 10:56:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removed Image._MODEINFO

Browse Source
This commit is contained in:
Andrew Murray 2021-03-07 14:21:27 +11:00
parent 1d7cbeb338
commit ca204ba04f
2 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/PIL/Image.py
View File

@ -213,28 +213,7 @@ DECODERS = {}
ENCODERS = {} ENCODERS = {}
# -------------------------------------------------------------------- # --------------------------------------------------------------------
# Modes supported by this version # Modes
_MODEINFO = {
# NOTE: this table will be removed in future versions. use
# getmode* functions or ImageMode descriptors instead.
# official modes
"1": ("L", "L", ("1",)),
"L": ("L", "L", ("L",)),
"I": ("L", "I", ("I",)),
"F": ("L", "F", ("F",)),
"P": ("P", "L", ("P",)),
"RGB": ("RGB", "L", ("R", "G", "B")),
"RGBX": ("RGB", "L", ("R", "G", "B", "X")),
"RGBA": ("RGB", "L", ("R", "G", "B", "A")),
"CMYK": ("RGB", "L", ("C", "M", "Y", "K")),
"YCbCr": ("RGB", "L", ("Y", "Cb", "Cr")),
"LAB": ("RGB", "L", ("L", "A", "B")),
"HSV": ("RGB", "L", ("H", "S", "V")),
# Experimental modes include I;16, I;16L, I;16B, RGBa, BGR;15, and
# BGR;24. Use these modes only if you know exactly what you're
# doing...
}
if sys.byteorder == "little": if sys.byteorder == "little":
_ENDIAN = "<" _ENDIAN = "<"
@ -280,7 +259,7 @@ def _conv_type_shape(im):
return (im.size[1], im.size[0], extra), typ return (im.size[1], im.size[0], extra), typ
MODES = sorted(_MODEINFO) MODES = ["1", "CMYK", "F", "HSV", "I", "L", "LAB", "P", "RGB", "RGBA", "RGBX", "YCbCr"]
# raw modes that may be memory mapped. NOTE: if you change this, you # raw modes that may be memory mapped. NOTE: if you change this, you
# may have to modify the stride calculation in map.c too! # may have to modify the stride calculation in map.c too!

28
src/PIL/ImageMode.py
View File

@ -35,18 +35,28 @@ def getmode(mode):
global _modes global _modes
if not _modes: if not _modes:
# initialize mode cache # initialize mode cache
from . import Image
modes = {} modes = {}
for m, (basemode, basetype, bands) in {
# core modes # core modes
for m, (basemode, basetype, bands) in Image._MODEINFO.items(): "1": ("L", "L", ("1",)),
modes[m] = ModeDescriptor(m, bands, basemode, basetype) "L": ("L", "L", ("L",)),
"I": ("L", "I", ("I",)),
"F": ("L", "F", ("F",)),
"P": ("P", "L", ("P",)),
"RGB": ("RGB", "L", ("R", "G", "B")),
"RGBX": ("RGB", "L", ("R", "G", "B", "X")),
"RGBA": ("RGB", "L", ("R", "G", "B", "A")),
"CMYK": ("RGB", "L", ("C", "M", "Y", "K")),
"YCbCr": ("RGB", "L", ("Y", "Cb", "Cr")),
"LAB": ("RGB", "L", ("L", "A", "B")),
"HSV": ("RGB", "L", ("H", "S", "V")),
# extra experimental modes # extra experimental modes
modes["RGBa"] = ModeDescriptor("RGBa", ("R", "G", "B", "a"), "RGB", "L") "RGBa": ("RGB", "L", ("R", "G", "B", "a")),
modes["LA"] = ModeDescriptor("LA", ("L", "A"), "L", "L") "LA": ("L", "L", ("L", "A")),
modes["La"] = ModeDescriptor("La", ("L", "a"), "L", "L") "La": ("L", "L", ("L", "a")),
modes["PA"] = ModeDescriptor("PA", ("P", "A"), "RGB", "L") "PA": ("RGB", "L", ("P", "A")),
}.items():
modes[m] = ModeDescriptor(m, bands, basemode, basetype)
# mapping modes # mapping modes
for i16mode in ( for i16mode in (
"I;16", "I;16",