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

#f0f0 and #ff00ff00 colors

Browse Source
This commit is contained in:
homm 2016-09-17 12:11:06 +03:00
parent 6e7553fb0f
commit 951143c936
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
PIL/ImageColor.py
View File

@ -45,21 +45,38 @@ def getrgb(color):
return rgb
colormap[color] = rgb = getrgb(rgb)
return rgb
# check for known string formats
m = re.match("#\w\w\w$", color)
if m:
if re.match('#[a-f0-9]{3}$', color, re.I):
return (
int(color[1]*2, 16),
int(color[2]*2, 16),
int(color[3]*2, 16)
int(color[3]*2, 16),
)
m = re.match("#\w\w\w\w\w\w$", color)
if m:
if re.match('#[a-f0-9]{4}$', color, re.I):
return (
int(color[1]*2, 16),
int(color[2]*2, 16),
int(color[3]*2, 16),
int(color[4]*2, 16),
)
if re.match('#[a-f0-9]{6}$', color, re.I):
return (
int(color[1:3], 16),
int(color[3:5], 16),
int(color[5:7], 16)
int(color[5:7], 16),
)
if re.match('#[a-f0-9]{8}$', color, re.I):
return (
int(color[1:3], 16),
int(color[3:5], 16),
int(color[5:7], 16),
int(color[7:9], 16),
)
m = re.match("rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$", color)
if m:
return (