mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-08-09 23:04:45 +03:00
Convert hex values to RGB beforehand instead of on demand
This commit is contained in:
Andrew Murray
parent
bfbfff0b78
commit
ac13810a06
|
|
@ -39,9 +39,6 @@ def getrgb(color):
|
||||||
|
|
||||||
rgb = colormap.get(color, None)
|
rgb = colormap.get(color, None)
|
||||||
if rgb:
|
if rgb:
|
||||||
if isinstance(rgb, tuple):
|
|
||||||
return rgb
|
|
||||||
colormap[color] = rgb = getrgb(rgb)
|
|
||||||
return rgb
|
return rgb
|
||||||
|
|
||||||
# check for known string formats
|
# check for known string formats
|
||||||
|
|
@ -162,152 +159,152 @@ colormap = {
|
||||||
# X11 colour table from https://drafts.csswg.org/css-color-4/, with
|
# X11 colour table from https://drafts.csswg.org/css-color-4/, with
|
||||||
# gray/grey spelling issues fixed. This is a superset of HTML 4.0
|
# gray/grey spelling issues fixed. This is a superset of HTML 4.0
|
||||||
# colour names used in CSS 1.
|
# colour names used in CSS 1.
|
||||||
"aliceblue": "#f0f8ff",
|
"aliceblue": (240, 248, 255),
|
||||||
"antiquewhite": "#faebd7",
|
"antiquewhite": (250, 235, 215),
|
||||||
"aqua": "#00ffff",
|
"aqua": (0, 255, 255),
|
||||||
"aquamarine": "#7fffd4",
|
"aquamarine": (127, 255, 212),
|
||||||
"azure": "#f0ffff",
|
"azure": (240, 255, 255),
|
||||||
"beige": "#f5f5dc",
|
"beige": (245, 245, 220),
|
||||||
"bisque": "#ffe4c4",
|
"bisque": (255, 228, 196),
|
||||||
"black": "#000000",
|
"black": (0, 0, 0),
|
||||||
"blanchedalmond": "#ffebcd",
|
"blanchedalmond": (255, 235, 205),
|
||||||
"blue": "#0000ff",
|
"blue": (0, 0, 255),
|
||||||
"blueviolet": "#8a2be2",
|
"blueviolet": (138, 43, 226),
|
||||||
"brown": "#a52a2a",
|
"brown": (165, 42, 42),
|
||||||
"burlywood": "#deb887",
|
"burlywood": (222, 184, 135),
|
||||||
"cadetblue": "#5f9ea0",
|
"cadetblue": (95, 158, 160),
|
||||||
"chartreuse": "#7fff00",
|
"chartreuse": (127, 255, 0),
|
||||||
"chocolate": "#d2691e",
|
"chocolate": (210, 105, 30),
|
||||||
"coral": "#ff7f50",
|
"coral": (255, 127, 80),
|
||||||
"cornflowerblue": "#6495ed",
|
"cornflowerblue": (100, 149, 237),
|
||||||
"cornsilk": "#fff8dc",
|
"cornsilk": (255, 248, 220),
|
||||||
"crimson": "#dc143c",
|
"crimson": (220, 20, 60),
|
||||||
"cyan": "#00ffff",
|
"cyan": (0, 255, 255),
|
||||||
"darkblue": "#00008b",
|
"darkblue": (0, 0, 139),
|
||||||
"darkcyan": "#008b8b",
|
"darkcyan": (0, 139, 139),
|
||||||
"darkgoldenrod": "#b8860b",
|
"darkgoldenrod": (184, 134, 11),
|
||||||
"darkgray": "#a9a9a9",
|
"darkgray": (169, 169, 169),
|
||||||
"darkgrey": "#a9a9a9",
|
"darkgrey": (169, 169, 169),
|
||||||
"darkgreen": "#006400",
|
"darkgreen": (0, 100, 0),
|
||||||
"darkkhaki": "#bdb76b",
|
"darkkhaki": (189, 183, 107),
|
||||||
"darkmagenta": "#8b008b",
|
"darkmagenta": (139, 0, 139),
|
||||||
"darkolivegreen": "#556b2f",
|
"darkolivegreen": (85, 107, 47),
|
||||||
"darkorange": "#ff8c00",
|
"darkorange": (255, 140, 0),
|
||||||
"darkorchid": "#9932cc",
|
"darkorchid": (153, 50, 204),
|
||||||
"darkred": "#8b0000",
|
"darkred": (139, 0, 0),
|
||||||
"darksalmon": "#e9967a",
|
"darksalmon": (233, 150, 122),
|
||||||
"darkseagreen": "#8fbc8f",
|
"darkseagreen": (143, 188, 143),
|
||||||
"darkslateblue": "#483d8b",
|
"darkslateblue": (72, 61, 139),
|
||||||
"darkslategray": "#2f4f4f",
|
"darkslategray": (47, 79, 79),
|
||||||
"darkslategrey": "#2f4f4f",
|
"darkslategrey": (47, 79, 79),
|
||||||
"darkturquoise": "#00ced1",
|
"darkturquoise": (0, 206, 209),
|
||||||
"darkviolet": "#9400d3",
|
"darkviolet": (148, 0, 211),
|
||||||
"deeppink": "#ff1493",
|
"deeppink": (255, 20, 147),
|
||||||
"deepskyblue": "#00bfff",
|
"deepskyblue": (0, 191, 255),
|
||||||
"dimgray": "#696969",
|
"dimgray": (105, 105, 105),
|
||||||
"dimgrey": "#696969",
|
"dimgrey": (105, 105, 105),
|
||||||
"dodgerblue": "#1e90ff",
|
"dodgerblue": (30, 144, 255),
|
||||||
"firebrick": "#b22222",
|
"firebrick": (178, 34, 34),
|
||||||
"floralwhite": "#fffaf0",
|
"floralwhite": (255, 250, 240),
|
||||||
"forestgreen": "#228b22",
|
"forestgreen": (34, 139, 34),
|
||||||
"fuchsia": "#ff00ff",
|
"fuchsia": (255, 0, 255),
|
||||||
"gainsboro": "#dcdcdc",
|
"gainsboro": (220, 220, 220),
|
||||||
"ghostwhite": "#f8f8ff",
|
"ghostwhite": (248, 248, 255),
|
||||||
"gold": "#ffd700",
|
"gold": (255, 215, 0),
|
||||||
"goldenrod": "#daa520",
|
"goldenrod": (218, 165, 32),
|
||||||
"gray": "#808080",
|
"gray": (128, 128, 128),
|
||||||
"grey": "#808080",
|
"grey": (128, 128, 128),
|
||||||
"green": "#008000",
|
"green": (0, 128, 0),
|
||||||
"greenyellow": "#adff2f",
|
"greenyellow": (173, 255, 47),
|
||||||
"honeydew": "#f0fff0",
|
"honeydew": (240, 255, 240),
|
||||||
"hotpink": "#ff69b4",
|
"hotpink": (255, 105, 180),
|
||||||
"indianred": "#cd5c5c",
|
"indianred": (205, 92, 92),
|
||||||
"indigo": "#4b0082",
|
"indigo": (75, 0, 130),
|
||||||
"ivory": "#fffff0",
|
"ivory": (255, 255, 240),
|
||||||
"khaki": "#f0e68c",
|
"khaki": (240, 230, 140),
|
||||||
"lavender": "#e6e6fa",
|
"lavender": (230, 230, 250),
|
||||||
"lavenderblush": "#fff0f5",
|
"lavenderblush": (255, 240, 245),
|
||||||
"lawngreen": "#7cfc00",
|
"lawngreen": (124, 252, 0),
|
||||||
"lemonchiffon": "#fffacd",
|
"lemonchiffon": (255, 250, 205),
|
||||||
"lightblue": "#add8e6",
|
"lightblue": (173, 216, 230),
|
||||||
"lightcoral": "#f08080",
|
"lightcoral": (240, 128, 128),
|
||||||
"lightcyan": "#e0ffff",
|
"lightcyan": (224, 255, 255),
|
||||||
"lightgoldenrodyellow": "#fafad2",
|
"lightgoldenrodyellow": (250, 250, 210),
|
||||||
"lightgreen": "#90ee90",
|
"lightgreen": (144, 238, 144),
|
||||||
"lightgray": "#d3d3d3",
|
"lightgray": (211, 211, 211),
|
||||||
"lightgrey": "#d3d3d3",
|
"lightgrey": (211, 211, 211),
|
||||||
"lightpink": "#ffb6c1",
|
"lightpink": (255, 182, 193),
|
||||||
"lightsalmon": "#ffa07a",
|
"lightsalmon": (255, 160, 122),
|
||||||
"lightseagreen": "#20b2aa",
|
"lightseagreen": (32, 178, 170),
|
||||||
"lightskyblue": "#87cefa",
|
"lightskyblue": (135, 206, 250),
|
||||||
"lightslategray": "#778899",
|
"lightslategray": (119, 136, 153),
|
||||||
"lightslategrey": "#778899",
|
"lightslategrey": (119, 136, 153),
|
||||||
"lightsteelblue": "#b0c4de",
|
"lightsteelblue": (176, 196, 222),
|
||||||
"lightyellow": "#ffffe0",
|
"lightyellow": (255, 255, 224),
|
||||||
"lime": "#00ff00",
|
"lime": (0, 255, 0),
|
||||||
"limegreen": "#32cd32",
|
"limegreen": (50, 205, 50),
|
||||||
"linen": "#faf0e6",
|
"linen": (250, 240, 230),
|
||||||
"magenta": "#ff00ff",
|
"magenta": (255, 0, 255),
|
||||||
"maroon": "#800000",
|
"maroon": (128, 0, 0),
|
||||||
"mediumaquamarine": "#66cdaa",
|
"mediumaquamarine": (102, 205, 170),
|
||||||
"mediumblue": "#0000cd",
|
"mediumblue": (0, 0, 205),
|
||||||
"mediumorchid": "#ba55d3",
|
"mediumorchid": (186, 85, 211),
|
||||||
"mediumpurple": "#9370db",
|
"mediumpurple": (147, 112, 219),
|
||||||
"mediumseagreen": "#3cb371",
|
"mediumseagreen": (60, 179, 113),
|
||||||
"mediumslateblue": "#7b68ee",
|
"mediumslateblue": (123, 104, 238),
|
||||||
"mediumspringgreen": "#00fa9a",
|
"mediumspringgreen": (0, 250, 154),
|
||||||
"mediumturquoise": "#48d1cc",
|
"mediumturquoise": (72, 209, 204),
|
||||||
"mediumvioletred": "#c71585",
|
"mediumvioletred": (199, 21, 133),
|
||||||
"midnightblue": "#191970",
|
"midnightblue": (25, 25, 112),
|
||||||
"mintcream": "#f5fffa",
|
"mintcream": (245, 255, 250),
|
||||||
"mistyrose": "#ffe4e1",
|
"mistyrose": (255, 228, 225),
|
||||||
"moccasin": "#ffe4b5",
|
"moccasin": (255, 228, 181),
|
||||||
"navajowhite": "#ffdead",
|
"navajowhite": (255, 222, 173),
|
||||||
"navy": "#000080",
|
"navy": (0, 0, 128),
|
||||||
"oldlace": "#fdf5e6",
|
"oldlace": (253, 245, 230),
|
||||||
"olive": "#808000",
|
"olive": (128, 128, 0),
|
||||||
"olivedrab": "#6b8e23",
|
"olivedrab": (107, 142, 35),
|
||||||
"orange": "#ffa500",
|
"orange": (255, 165, 0),
|
||||||
"orangered": "#ff4500",
|
"orangered": (255, 69, 0),
|
||||||
"orchid": "#da70d6",
|
"orchid": (218, 112, 214),
|
||||||
"palegoldenrod": "#eee8aa",
|
"palegoldenrod": (238, 232, 170),
|
||||||
"palegreen": "#98fb98",
|
"palegreen": (152, 251, 152),
|
||||||
"paleturquoise": "#afeeee",
|
"paleturquoise": (175, 238, 238),
|
||||||
"palevioletred": "#db7093",
|
"palevioletred": (219, 112, 147),
|
||||||
"papayawhip": "#ffefd5",
|
"papayawhip": (255, 239, 213),
|
||||||
"peachpuff": "#ffdab9",
|
"peachpuff": (255, 218, 185),
|
||||||
"peru": "#cd853f",
|
"peru": (205, 133, 63),
|
||||||
"pink": "#ffc0cb",
|
"pink": (255, 192, 203),
|
||||||
"plum": "#dda0dd",
|
"plum": (221, 160, 221),
|
||||||
"powderblue": "#b0e0e6",
|
"powderblue": (176, 224, 230),
|
||||||
"purple": "#800080",
|
"purple": (128, 0, 128),
|
||||||
"rebeccapurple": "#663399",
|
"rebeccapurple": (102, 51, 153),
|
||||||
"red": "#ff0000",
|
"red": (255, 0, 0),
|
||||||
"rosybrown": "#bc8f8f",
|
"rosybrown": (188, 143, 143),
|
||||||
"royalblue": "#4169e1",
|
"royalblue": (65, 105, 225),
|
||||||
"saddlebrown": "#8b4513",
|
"saddlebrown": (139, 69, 19),
|
||||||
"salmon": "#fa8072",
|
"salmon": (250, 128, 114),
|
||||||
"sandybrown": "#f4a460",
|
"sandybrown": (244, 164, 96),
|
||||||
"seagreen": "#2e8b57",
|
"seagreen": (46, 139, 87),
|
||||||
"seashell": "#fff5ee",
|
"seashell": (255, 245, 238),
|
||||||
"sienna": "#a0522d",
|
"sienna": (160, 82, 45),
|
||||||
"silver": "#c0c0c0",
|
"silver": (192, 192, 192),
|
||||||
"skyblue": "#87ceeb",
|
"skyblue": (135, 206, 235),
|
||||||
"slateblue": "#6a5acd",
|
"slateblue": (106, 90, 205),
|
||||||
"slategray": "#708090",
|
"slategray": (112, 128, 144),
|
||||||
"slategrey": "#708090",
|
"slategrey": (112, 128, 144),
|
||||||
"snow": "#fffafa",
|
"snow": (255, 250, 250),
|
||||||
"springgreen": "#00ff7f",
|
"springgreen": (0, 255, 127),
|
||||||
"steelblue": "#4682b4",
|
"steelblue": (70, 130, 180),
|
||||||
"tan": "#d2b48c",
|
"tan": (210, 180, 140),
|
||||||
"teal": "#008080",
|
"teal": (0, 128, 128),
|
||||||
"thistle": "#d8bfd8",
|
"thistle": (216, 191, 216),
|
||||||
"tomato": "#ff6347",
|
"tomato": (255, 99, 71),
|
||||||
"turquoise": "#40e0d0",
|
"turquoise": (64, 224, 208),
|
||||||
"violet": "#ee82ee",
|
"violet": (238, 130, 238),
|
||||||
"wheat": "#f5deb3",
|
"wheat": (245, 222, 179),
|
||||||
"white": "#ffffff",
|
"white": (255, 255, 255),
|
||||||
"whitesmoke": "#f5f5f5",
|
"whitesmoke": (245, 245, 245),
|
||||||
"yellow": "#ffff00",
|
"yellow": (255, 255, 0),
|
||||||
"yellowgreen": "#9acd32",
|
"yellowgreen": (154, 205, 50),
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user