|
I recently downloaded the Python Imaging Library (PIL 1.1.5), and I have been trying to use it to convert several hundred XPM files into GIFs (I also tried converting into PNGs which may be useful in the future). During this process, I ran into various problems which appear to be caused by bugs. Most of the difficulties were related to XPMs -- not being able to load XPM files which other applications were quite happy with. But there were also a couple of minor issues with transparency in GIF and PNG formats. Attached is a diff file containing the changes I had to make to the code to fix these problems. This fixes things for the vast majority of the XPM files I have. There are still some XPMs that can't be loaded (those which use more than one character per pixel for example), but these are far less common. Because I am not a regular contributer to this project I thought I should include more information than just the diffs, so here is a list of the bugs I found and what I changed as a result: Bug: PIL could not open some XPM files because it failed to cope with some features of XPM syntax. Fix: Various changes in XpmImagePlugin.py:
Bug: PIL could not open some XPM files, because the color names were not recognized. Fix: various changes to ImageColor.py:
Note: before this change, the colormap apparently contained colours taken from CSS3 -- the comment reads 'X11 colour table (from "CSS3 module: Color working draft")'. However some of the standard X11 colours clashed with existing colours in the map. In the end, I removed all the CSS3 colours and just included the X11 colours. The comment does say "X11 colour table" after all.
Bug: PIL loaded all XPM files incorrectly, shifting the entire image several pixels to the right (truncating it on the right, and adding a a band of incorrect pixels on the left). This is caused by trying to use memory mapping to read the file, which prevents the proper XPM decoder from being used. Memory mapping does not work because of the structure of XPM files -- the file includes characters (such as the opening and closing quotes on each line) which do not correspond to pixel values. Fix: Changed load() in ImageFile.py to explicitly exclude XPM files from the memory mapping. There may be a more elegent way to do this, perhaps by changing the value of ImageFile.tile for XPMs. But I tried the obvious thing -- changing the "raw" designation to something else, and that seemed to break things even more. Perhaps someone more familiar with this code could do better. Bug: Could not write GIFs with transparency. The pixels which should have been transparent were not. Fix: Changed _save() in GifImagePlugin.py. The code was looking in the wrong dictionary for the transparency value. Bug: Could not write PNGs with transparency. The pixels which should have been transparent were not. Fix: Changed _save() in PngImagePlugin.py. The code was looking in the wrong dictionary for the transparency value. -- Tom Heathcote -- Tom Heathcote Petris Technology [EMAIL PROTECTED] 154 Brent Street Tel +44 20 8202 2433 London NW4 2DR Fax +44 20 8202 2287 England |
*** GifImagePlugin.py.orig Wed Oct 6 11:57:44 2004
--- GifImagePlugin.py Wed Oct 26 22:22:29 2005
***************
*** 265,271 ****
flags = flags | 64
try:
! transparency = im.encoderinfo["transparency"]
except KeyError:
pass
else:
--- 265,271 ----
flags = flags | 64
try:
! transparency = im.info["transparency"]
except KeyError:
pass
else:
*** PngImagePlugin.py.orig Sun Dec 19 16:32:36 2004
--- PngImagePlugin.py Wed Oct 26 22:08:48 2005
***************
*** 481,492 ****
if im.mode == "P":
chunk(fp, "PLTE", im.im.getpalette("RGB"))
! if im.encoderinfo.has_key("transparency"):
if im.mode == "P":
! transparency = max(0, min(255, im.encoderinfo["transparency"]))
chunk(fp, "tRNS", chr(255) * transparency + chr(0))
elif im.mode == "L":
! transparency = max(0, min(65535, im.encoderinfo["transparency"]))
chunk(fp, "tRNS", o16(transparency))
else:
raise IOError, "cannot use transparency for this mode"
--- 481,492 ----
if im.mode == "P":
chunk(fp, "PLTE", im.im.getpalette("RGB"))
! if im.info.has_key("transparency"):
if im.mode == "P":
! transparency = max(0, min(255, im.info["transparency"]))
chunk(fp, "tRNS", chr(255) * transparency + chr(0))
elif im.mode == "L":
! transparency = max(0, min(65535, im.info["transparency"]))
chunk(fp, "tRNS", o16(transparency))
else:
raise IOError, "cannot use transparency for this mode"
*** XpmImagePlugin.py.orig Wed Oct 6 11:57:44 2004
--- XpmImagePlugin.py Mon Jan 16 23:59:28 2006
***************
*** 19,28 ****
import re, string
! import Image, ImageFile, ImagePalette
# XPM header
! xpm_head = re.compile("\"([0-9]*) ([0-9]*) ([0-9]*) ([0-9]*)")
def _accept(prefix):
--- 19,28 ----
import re, string
! import Image, ImageFile, ImagePalette, ImageColor
# XPM header
! xpm_head = re.compile("\s*\"\s*([0-9]*)\s+([0-9]*)\s+([0-9]*)\s+([0-9]*)")
def _accept(prefix):
***************
*** 37,43 ****
format_description = "X11 Pixel Map"
def _open(self):
-
if not _accept(self.fp.read(9)):
raise SyntaxError, "not an XPM file"
--- 37,42 ----
***************
*** 48,71 ****
raise SyntaxError, "broken XPM file"
m = xpm_head.match(s)
if m:
! break
!
! self.size = int(m.group(1)), int(m.group(2))
!
pal = int(m.group(3))
bpp = int(m.group(4))
if pal > 256 or bpp != 1:
raise ValueError, "cannot read this XPM file"
- #
- # load palette description
palette = ["\0\0\0"] * 256
for i in range(pal):
!
! s = self.fp.readline()
if s[-2:] == '\r\n':
s = s[:-2]
elif s[-1:] in '\r\n':
--- 47,70 ----
raise SyntaxError, "broken XPM file"
m = xpm_head.match(s)
if m:
! break
!
! self.size = int(m.group(1)), int(m.group(2))
pal = int(m.group(3))
bpp = int(m.group(4))
if pal > 256 or bpp != 1:
raise ValueError, "cannot read this XPM file"
+ # load palette description
palette = ["\0\0\0"] * 256
for i in range(pal):
! while 1:
! s = string.strip(self.fp.readline())
! if s[0:2] != '/*': break
!
if s[-2:] == '\r\n':
s = s[:-2]
elif s[-1:] in '\r\n':
***************
*** 73,129 ****
c = ord(s[1])
s = string.split(s[2:-2])
!
for i in range(0, len(s), 2):
-
if s[i] == "c":
!
# process colour key
! rgb = s[i+1]
! if rgb == "None":
self.info["transparency"] = c
! elif rgb[0] == "#":
! # FIXME: handle colour names (see ImagePalette.py)
! rgb = string.atoi(rgb[1:], 16)
! palette[c] = chr((rgb >> 16) & 255) +\
! chr((rgb >> 8) & 255) +\
! chr(rgb & 255)
else:
! # unknown colour
! raise ValueError, "cannot read this XPM file"
break
-
else:
-
# missing colour key
raise ValueError, "cannot read this XPM file"
self.mode = "P"
self.palette = ImagePalette.raw("RGB", string.join(palette, ""))
-
self.tile = [("raw", (0, 0)+self.size, self.fp.tell(), ("P", 0, 1))]
- def load_read(self, bytes):
#
# load all image data in one chunk
xsize, ysize = self.size
-
s = [None] * ysize
for i in range(ysize):
! s[i] = string.ljust(self.fp.readline()[1:xsize+1], xsize)
self.fp = None
-
return string.join(s, "")
#
# Registry
-
Image.register_open("XPM", XpmImageFile, _accept)
-
Image.register_extension("XPM", ".xpm")
-
Image.register_mime("XPM", "image/xpm")
--- 72,132 ----
c = ord(s[1])
s = string.split(s[2:-2])
!
for i in range(0, len(s), 2):
if s[i] == "c":
! # Color name can be multiple words, so we need to look
ahead
! # for extra words. Single letter denotes the start of
another
! # color specifier (usually m or s for monocrome or
symbolic).
! color = []
! for colorstring in s[i+1:]:
! if len(colorstring) > 1:
! color.append(colorstring)
! else:
! break
!
! if len(color) > 0:
! color = string.join(color, ' ')
! else:
! break
!
# process colour key
! if string.lower(color) == "none":
self.info["transparency"] = c
! palette[c] = chr(255) + chr(255) + chr(255)
else:
! rgb = ImageColor.getrgb(color)
! palette[c] = chr(rgb[0]) + chr(rgb[1]) + chr(rgb[2])
break
else:
# missing colour key
raise ValueError, "cannot read this XPM file"
self.mode = "P"
self.palette = ImagePalette.raw("RGB", string.join(palette, ""))
self.tile = [("raw", (0, 0)+self.size, self.fp.tell(), ("P", 0, 1))]
+ def load_read(self, bytes):
#
# load all image data in one chunk
xsize, ysize = self.size
s = [None] * ysize
for i in range(ysize):
! # Skip past comment lines
! while 1:
! line = string.strip(self.fp.readline())
! if line[0:2] != '/*': break
!
! s[i] = string.ljust(line[1:xsize+1], xsize)
self.fp = None
return string.join(s, "")
#
# Registry
Image.register_open("XPM", XpmImageFile, _accept)
Image.register_extension("XPM", ".xpm")
Image.register_mime("XPM", "image/xpm")
*** ImageFile.py.orig Wed Oct 6 11:57:44 2004
--- ImageFile.py Wed Oct 26 22:17:04 2005
***************
*** 125,156 ****
self.map = None
readonly = 0
!
if self.filename and len(self.tile) == 1:
# try memory mapping
d, e, o, a = self.tile[0]
! if d == "raw" and a[0] == self.mode and a[0] in Image._MAPMODES:
! try:
! if hasattr(Image.core, "map"):
! # use built-in mapper
! self.map = Image.core.map(self.filename)
! self.map.seek(o)
! self.im = self.map.readimage(
! self.mode, self.size, a[1], a[2]
! )
! else:
! # use mmap, if possible
! import mmap
! file = open(self.filename, "r+")
! size = os.path.getsize(self.filename)
! # FIXME: on Unix, use PROT_READ etc
! self.map = mmap.mmap(file.fileno(), size)
! self.im = Image.core.map_buffer(
! self.map, self.size, d, e, o, a
! )
! readonly = 1
! except (AttributeError, IOError, ImportError):
! self.map = None
self.load_prepare()
--- 125,157 ----
self.map = None
readonly = 0
!
if self.filename and len(self.tile) == 1:
# try memory mapping
d, e, o, a = self.tile[0]
! if not self.format == "XPM":
! if d == "raw" and a[0] == self.mode and a[0] in
Image._MAPMODES:
! try:
! if hasattr(Image.core, "map"):
! # use built-in mapper
! self.map = Image.core.map(self.filename)
! self.map.seek(o)
! self.im = self.map.readimage(
! self.mode, self.size, a[1], a[2]
! )
! else:
! # use mmap, if possible
! import mmap
! file = open(self.filename, "r+")
! size = os.path.getsize(self.filename)
! # FIXME: on Unix, use PROT_READ etc
! self.map = mmap.mmap(file.fileno(), size)
! self.im = Image.core.map_buffer(
! self.map, self.size, d, e, o, a
! )
! readonly = 1
! except (AttributeError, IOError, ImportError):
! self.map = None
self.load_prepare()
***************
*** 166,172 ****
seek = self.fp.seek
if not self.map:
!
# sort tiles in file order
self.tile.sort(_tilesort)
--- 167,173 ----
seek = self.fp.seek
if not self.map:
!
# sort tiles in file order
self.tile.sort(_tilesort)
*** ImageColor.py.orig Mon Feb 7 22:42:24 2005
--- ImageColor.py Wed Nov 9 21:34:03 2005
***************
*** 42,48 ****
except KeyError:
try:
# fall back on case-insensitive lookup
! rgb = colormap[string.lower(color)]
except KeyError:
rgb = None
# found color in cache
--- 42,48 ----
except KeyError:
try:
# fall back on case-insensitive lookup
! rgb = colormap[string.replace(string.lower(color), ' ', '')]
except KeyError:
rgb = None
# found color in cache
***************
*** 65,71 ****
str2int(color[1:3], 16),
str2int(color[3:5], 16),
str2int(color[5:7], 16)
! )
m = re.match("rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$", color)
if m:
return (
--- 65,78 ----
str2int(color[1:3], 16),
str2int(color[3:5], 16),
str2int(color[5:7], 16)
! )
! m = re.match("#\w\w\w\w\w\w\w\w\w\w\w\w$", color)
! if m:
! return (
! str2int(color[1:3], 16),
! str2int(color[5:7], 16),
! str2int(color[9:11], 16)
! )
m = re.match("rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$", color)
if m:
return (
***************
*** 109,208 ****
return color
colormap = {
! # X11 colour table (from "CSS3 module: Color working draft"), with
! # gray/grey spelling issues fixed. This is a superset of HTML 4.0
! # colour names used in CSS 1.
"aliceblue": "#f0f8ff",
"antiquewhite": "#faebd7",
! "aqua": "#00ffff",
"aquamarine": "#7fffd4",
"azure": "#f0ffff",
"beige": "#f5f5dc",
"bisque": "#ffe4c4",
"black": "#000000",
"blanchedalmond": "#ffebcd",
"blue": "#0000ff",
"blueviolet": "#8a2be2",
"brown": "#a52a2a",
"burlywood": "#deb887",
"cadetblue": "#5f9ea0",
"chartreuse": "#7fff00",
"chocolate": "#d2691e",
"coral": "#ff7f50",
"cornflowerblue": "#6495ed",
"cornsilk": "#fff8dc",
! "crimson": "#dc143c",
"cyan": "#00ffff",
"darkblue": "#00008b",
"darkcyan": "#008b8b",
"darkgoldenrod": "#b8860b",
"darkgray": "#a9a9a9",
- "darkgrey": "#a9a9a9",
"darkgreen": "#006400",
"darkkhaki": "#bdb76b",
"darkmagenta": "#8b008b",
"darkolivegreen": "#556b2f",
"darkorange": "#ff8c00",
"darkorchid": "#9932cc",
"darkred": "#8b0000",
"darksalmon": "#e9967a",
"darkseagreen": "#8fbc8f",
"darkslateblue": "#483d8b",
"darkslategray": "#2f4f4f",
"darkslategrey": "#2f4f4f",
"darkturquoise": "#00ced1",
"darkviolet": "#9400d3",
"deeppink": "#ff1493",
"deepskyblue": "#00bfff",
"dimgray": "#696969",
"dimgrey": "#696969",
"dodgerblue": "#1e90ff",
"firebrick": "#b22222",
"floralwhite": "#fffaf0",
"forestgreen": "#228b22",
- "fuchsia": "#ff00ff",
"gainsboro": "#dcdcdc",
"ghostwhite": "#f8f8ff",
"gold": "#ffd700",
"goldenrod": "#daa520",
! "gray": "#808080",
! "grey": "#808080",
! "green": "#008000",
"greenyellow": "#adff2f",
"honeydew": "#f0fff0",
"hotpink": "#ff69b4",
"indianred": "#cd5c5c",
! "indigo": "#4b0082",
"ivory": "#fffff0",
"khaki": "#f0e68c",
"lavender": "#e6e6fa",
"lavenderblush": "#fff0f5",
"lawngreen": "#7cfc00",
"lemonchiffon": "#fffacd",
"lightblue": "#add8e6",
"lightcoral": "#f08080",
"lightcyan": "#e0ffff",
"lightgoldenrodyellow": "#fafad2",
- "lightgreen": "#90ee90",
"lightgray": "#d3d3d3",
"lightgrey": "#d3d3d3",
"lightpink": "#ffb6c1",
"lightsalmon": "#ffa07a",
"lightseagreen": "#20b2aa",
"lightskyblue": "#87cefa",
"lightslategray": "#778899",
"lightslategrey": "#778899",
"lightsteelblue": "#b0c4de",
"lightyellow": "#ffffe0",
"lime": "#00ff00",
"limegreen": "#32cd32",
"linen": "#faf0e6",
"magenta": "#ff00ff",
! "maroon": "#800000",
"mediumaquamarine": "#66cdaa",
"mediumblue": "#0000cd",
"mediumorchid": "#ba55d3",
"mediumpurple": "#9370db",
"mediumseagreen": "#3cb371",
"mediumslateblue": "#7b68ee",
"mediumspringgreen": "#00fa9a",
--- 116,593 ----
return color
colormap = {
! # X11 colour table
"aliceblue": "#f0f8ff",
"antiquewhite": "#faebd7",
! "antiquewhite1": "#ffefdb",
! "antiquewhite2": "#eedfcc",
! "antiquewhite3": "#cdc0b0",
! "antiquewhite4": "#8b8378",
"aquamarine": "#7fffd4",
+ "aquamarine1": "#7fffd4",
+ "aquamarine2": "#76eec6",
+ "aquamarine3": "#66cdaa",
+ "aquamarine4": "#458b74",
"azure": "#f0ffff",
+ "azure1": "#f0ffff",
+ "azure2": "#e0eeee",
+ "azure3": "#c1cdcd",
+ "azure4": "#838b8b",
"beige": "#f5f5dc",
"bisque": "#ffe4c4",
+ "bisque1": "#ffe4c4",
+ "bisque2": "#eed5b7",
+ "bisque3": "#cdb79e",
+ "bisque4": "#8b7d6b",
"black": "#000000",
"blanchedalmond": "#ffebcd",
"blue": "#0000ff",
+ "blue1": "#0000ff",
+ "blue2": "#0000ee",
+ "blue3": "#0000cd",
+ "blue4": "#00008b",
"blueviolet": "#8a2be2",
"brown": "#a52a2a",
+ "brown1": "#ff4040",
+ "brown2": "#ee3b3b",
+ "brown3": "#cd3333",
+ "brown4": "#8b2323",
"burlywood": "#deb887",
+ "burlywood1": "#ffd39b",
+ "burlywood2": "#eec591",
+ "burlywood3": "#cdaa7d",
+ "burlywood4": "#8b7355",
"cadetblue": "#5f9ea0",
+ "cadetblue1": "#98f5ff",
+ "cadetblue2": "#8ee5ee",
+ "cadetblue3": "#7ac5cd",
+ "cadetblue4": "#53868b",
"chartreuse": "#7fff00",
+ "chartreuse1": "#7fff00",
+ "chartreuse2": "#76ee00",
+ "chartreuse3": "#66cd00",
+ "chartreuse4": "#458b00",
"chocolate": "#d2691e",
+ "chocolate1": "#ff7f24",
+ "chocolate2": "#ee7621",
+ "chocolate3": "#cd661d",
+ "chocolate4": "#8b4513",
"coral": "#ff7f50",
+ "coral1": "#ff7256",
+ "coral2": "#ee6a50",
+ "coral3": "#cd5b45",
+ "coral4": "#8b3e2f",
"cornflowerblue": "#6495ed",
"cornsilk": "#fff8dc",
! "cornsilk1": "#fff8dc",
! "cornsilk2": "#eee8cd",
! "cornsilk3": "#cdc8b1",
! "cornsilk4": "#8b8878",
"cyan": "#00ffff",
+ "cyan1": "#00ffff",
+ "cyan2": "#00eeee",
+ "cyan3": "#00cdcd",
+ "cyan4": "#008b8b",
"darkblue": "#00008b",
"darkcyan": "#008b8b",
"darkgoldenrod": "#b8860b",
+ "darkgoldenrod1": "#ffb90f",
+ "darkgoldenrod2": "#eead0e",
+ "darkgoldenrod3": "#cd950c",
+ "darkgoldenrod4": "#8b6508",
"darkgray": "#a9a9a9",
"darkgreen": "#006400",
+ "darkgrey": "#a9a9a9",
"darkkhaki": "#bdb76b",
"darkmagenta": "#8b008b",
"darkolivegreen": "#556b2f",
+ "darkolivegreen1": "#caff70",
+ "darkolivegreen2": "#bcee68",
+ "darkolivegreen3": "#a2cd5a",
+ "darkolivegreen4": "#6e8b3d",
"darkorange": "#ff8c00",
+ "darkorange1": "#ff7f00",
+ "darkorange2": "#ee7600",
+ "darkorange3": "#cd6600",
+ "darkorange4": "#8b4500",
"darkorchid": "#9932cc",
+ "darkorchid1": "#bf3eff",
+ "darkorchid2": "#b23aee",
+ "darkorchid3": "#9a32cd",
+ "darkorchid4": "#68228b",
"darkred": "#8b0000",
"darksalmon": "#e9967a",
"darkseagreen": "#8fbc8f",
+ "darkseagreen1": "#c1ffc1",
+ "darkseagreen2": "#b4eeb4",
+ "darkseagreen3": "#9bcd9b",
+ "darkseagreen4": "#698b69",
"darkslateblue": "#483d8b",
"darkslategray": "#2f4f4f",
+ "darkslategray1": "#97ffff",
+ "darkslategray2": "#8deeee",
+ "darkslategray3": "#79cdcd",
+ "darkslategray4": "#528b8b",
"darkslategrey": "#2f4f4f",
"darkturquoise": "#00ced1",
"darkviolet": "#9400d3",
"deeppink": "#ff1493",
+ "deeppink1": "#ff1493",
+ "deeppink2": "#ee1289",
+ "deeppink3": "#cd1076",
+ "deeppink4": "#8b0a50",
"deepskyblue": "#00bfff",
+ "deepskyblue1": "#00bfff",
+ "deepskyblue2": "#00b2ee",
+ "deepskyblue3": "#009acd",
+ "deepskyblue4": "#00688b",
"dimgray": "#696969",
"dimgrey": "#696969",
"dodgerblue": "#1e90ff",
+ "dodgerblue1": "#1e90ff",
+ "dodgerblue2": "#1c86ee",
+ "dodgerblue3": "#1874cd",
+ "dodgerblue4": "#104e8b",
"firebrick": "#b22222",
+ "firebrick1": "#ff3030",
+ "firebrick2": "#ee2c2c",
+ "firebrick3": "#cd2626",
+ "firebrick4": "#8b1a1a",
"floralwhite": "#fffaf0",
"forestgreen": "#228b22",
"gainsboro": "#dcdcdc",
"ghostwhite": "#f8f8ff",
"gold": "#ffd700",
+ "gold1": "#ffd700",
+ "gold2": "#eec900",
+ "gold3": "#cdad00",
+ "gold4": "#8b7500",
"goldenrod": "#daa520",
! "goldenrod1": "#ffc125",
! "goldenrod2": "#eeb422",
! "goldenrod3": "#cd9b1d",
! "goldenrod4": "#8b6914",
! "gray": "#bebebe",
! "gray0": "#000000",
! "gray1": "#030303",
! "gray2": "#050505",
! "gray3": "#080808",
! "gray4": "#0a0a0a",
! "gray5": "#0d0d0d",
! "gray6": "#0f0f0f",
! "gray7": "#121212",
! "gray8": "#141414",
! "gray9": "#171717",
! "gray10": "#1a1a1a",
! "gray11": "#1c1c1c",
! "gray12": "#1f1f1f",
! "gray13": "#212121",
! "gray14": "#242424",
! "gray15": "#262626",
! "gray16": "#292929",
! "gray17": "#2b2b2b",
! "gray18": "#2e2e2e",
! "gray19": "#303030",
! "gray20": "#333333",
! "gray21": "#363636",
! "gray22": "#383838",
! "gray23": "#3b3b3b",
! "gray24": "#3d3d3d",
! "gray25": "#404040",
! "gray26": "#424242",
! "gray27": "#454545",
! "gray28": "#474747",
! "gray29": "#4a4a4a",
! "gray30": "#4d4d4d",
! "gray31": "#4f4f4f",
! "gray32": "#525252",
! "gray33": "#545454",
! "gray34": "#575757",
! "gray35": "#595959",
! "gray36": "#5c5c5c",
! "gray37": "#5e5e5e",
! "gray38": "#616161",
! "gray39": "#636363",
! "gray40": "#666666",
! "gray41": "#696969",
! "gray42": "#6b6b6b",
! "gray43": "#6e6e6e",
! "gray44": "#707070",
! "gray45": "#737373",
! "gray46": "#757575",
! "gray47": "#787878",
! "gray48": "#7a7a7a",
! "gray49": "#7d7d7d",
! "gray50": "#7f7f7f",
! "gray51": "#828282",
! "gray52": "#858585",
! "gray53": "#878787",
! "gray54": "#8a8a8a",
! "gray55": "#8c8c8c",
! "gray56": "#8f8f8f",
! "gray57": "#919191",
! "gray58": "#949494",
! "gray59": "#969696",
! "gray60": "#999999",
! "gray61": "#9c9c9c",
! "gray62": "#9e9e9e",
! "gray63": "#a1a1a1",
! "gray64": "#a3a3a3",
! "gray65": "#a6a6a6",
! "gray66": "#a8a8a8",
! "gray67": "#ababab",
! "gray68": "#adadad",
! "gray69": "#b0b0b0",
! "gray70": "#b3b3b3",
! "gray71": "#b5b5b5",
! "gray72": "#b8b8b8",
! "gray73": "#bababa",
! "gray74": "#bdbdbd",
! "gray75": "#bfbfbf",
! "gray76": "#c2c2c2",
! "gray77": "#c4c4c4",
! "gray78": "#c7c7c7",
! "gray79": "#c9c9c9",
! "gray80": "#cccccc",
! "gray81": "#cfcfcf",
! "gray82": "#d1d1d1",
! "gray83": "#d4d4d4",
! "gray84": "#d6d6d6",
! "gray85": "#d9d9d9",
! "gray86": "#dbdbdb",
! "gray87": "#dedede",
! "gray88": "#e0e0e0",
! "gray89": "#e3e3e3",
! "gray90": "#e5e5e5",
! "gray91": "#e8e8e8",
! "gray92": "#ebebeb",
! "gray93": "#ededed",
! "gray94": "#f0f0f0",
! "gray95": "#f2f2f2",
! "gray96": "#f5f5f5",
! "gray97": "#f7f7f7",
! "gray98": "#fafafa",
! "gray99": "#fcfcfc",
! "gray100": "#ffffff",
! "green": "#00ff00",
! "green1": "#00ff00",
! "green2": "#00ee00",
! "green3": "#00cd00",
! "green4": "#008b00",
"greenyellow": "#adff2f",
+ "grey": "#bebebe",
+ "grey0": "#000000",
+ "grey1": "#030303",
+ "grey2": "#050505",
+ "grey3": "#080808",
+ "grey4": "#0a0a0a",
+ "grey5": "#0d0d0d",
+ "grey6": "#0f0f0f",
+ "grey7": "#121212",
+ "grey8": "#141414",
+ "grey9": "#171717",
+ "grey10": "#1a1a1a",
+ "grey11": "#1c1c1c",
+ "grey12": "#1f1f1f",
+ "grey13": "#212121",
+ "grey14": "#242424",
+ "grey15": "#262626",
+ "grey16": "#292929",
+ "grey17": "#2b2b2b",
+ "grey18": "#2e2e2e",
+ "grey19": "#303030",
+ "grey20": "#333333",
+ "grey21": "#363636",
+ "grey22": "#383838",
+ "grey23": "#3b3b3b",
+ "grey24": "#3d3d3d",
+ "grey25": "#404040",
+ "grey26": "#424242",
+ "grey27": "#454545",
+ "grey28": "#474747",
+ "grey29": "#4a4a4a",
+ "grey30": "#4d4d4d",
+ "grey31": "#4f4f4f",
+ "grey32": "#525252",
+ "grey33": "#545454",
+ "grey34": "#575757",
+ "grey35": "#595959",
+ "grey36": "#5c5c5c",
+ "grey37": "#5e5e5e",
+ "grey38": "#616161",
+ "grey39": "#636363",
+ "grey40": "#666666",
+ "grey41": "#696969",
+ "grey42": "#6b6b6b",
+ "grey43": "#6e6e6e",
+ "grey44": "#707070",
+ "grey45": "#737373",
+ "grey46": "#757575",
+ "grey47": "#787878",
+ "grey48": "#7a7a7a",
+ "grey49": "#7d7d7d",
+ "grey50": "#7f7f7f",
+ "grey51": "#828282",
+ "grey52": "#858585",
+ "grey53": "#878787",
+ "grey54": "#8a8a8a",
+ "grey55": "#8c8c8c",
+ "grey56": "#8f8f8f",
+ "grey57": "#919191",
+ "grey58": "#949494",
+ "grey59": "#969696",
+ "grey60": "#999999",
+ "grey61": "#9c9c9c",
+ "grey62": "#9e9e9e",
+ "grey63": "#a1a1a1",
+ "grey64": "#a3a3a3",
+ "grey65": "#a6a6a6",
+ "grey66": "#a8a8a8",
+ "grey67": "#ababab",
+ "grey68": "#adadad",
+ "grey69": "#b0b0b0",
+ "grey70": "#b3b3b3",
+ "grey71": "#b5b5b5",
+ "grey72": "#b8b8b8",
+ "grey73": "#bababa",
+ "grey74": "#bdbdbd",
+ "grey75": "#bfbfbf",
+ "grey76": "#c2c2c2",
+ "grey77": "#c4c4c4",
+ "grey78": "#c7c7c7",
+ "grey79": "#c9c9c9",
+ "grey80": "#cccccc",
+ "grey81": "#cfcfcf",
+ "grey82": "#d1d1d1",
+ "grey83": "#d4d4d4",
+ "grey84": "#d6d6d6",
+ "grey85": "#d9d9d9",
+ "grey86": "#dbdbdb",
+ "grey87": "#dedede",
+ "grey88": "#e0e0e0",
+ "grey89": "#e3e3e3",
+ "grey90": "#e5e5e5",
+ "grey91": "#e8e8e8",
+ "grey92": "#ebebeb",
+ "grey93": "#ededed",
+ "grey94": "#f0f0f0",
+ "grey95": "#f2f2f2",
+ "grey96": "#f5f5f5",
+ "grey97": "#f7f7f7",
+ "grey98": "#fafafa",
+ "grey99": "#fcfcfc",
+ "grey100": "#ffffff",
"honeydew": "#f0fff0",
+ "honeydew1": "#f0fff0",
+ "honeydew2": "#e0eee0",
+ "honeydew3": "#c1cdc1",
+ "honeydew4": "#838b83",
"hotpink": "#ff69b4",
+ "hotpink1": "#ff6eb4",
+ "hotpink2": "#ee6aa7",
+ "hotpink3": "#cd6090",
+ "hotpink4": "#8b3a62",
"indianred": "#cd5c5c",
! "indianred1": "#ff6a6a",
! "indianred2": "#ee6363",
! "indianred3": "#cd5555",
! "indianred4": "#8b3a3a",
"ivory": "#fffff0",
+ "ivory1": "#fffff0",
+ "ivory2": "#eeeee0",
+ "ivory3": "#cdcdc1",
+ "ivory4": "#8b8b83",
"khaki": "#f0e68c",
+ "khaki1": "#fff68f",
+ "khaki2": "#eee685",
+ "khaki3": "#cdc673",
+ "khaki4": "#8b864e",
"lavender": "#e6e6fa",
"lavenderblush": "#fff0f5",
+ "lavenderblush1": "#fff0f5",
+ "lavenderblush2": "#eee0e5",
+ "lavenderblush3": "#cdc1c5",
+ "lavenderblush4": "#8b8386",
"lawngreen": "#7cfc00",
"lemonchiffon": "#fffacd",
+ "lemonchiffon1": "#fffacd",
+ "lemonchiffon2": "#eee9bf",
+ "lemonchiffon3": "#cdc9a5",
+ "lemonchiffon4": "#8b8970",
"lightblue": "#add8e6",
+ "lightblue1": "#bfefff",
+ "lightblue2": "#b2dfee",
+ "lightblue3": "#9ac0cd",
+ "lightblue4": "#68838b",
"lightcoral": "#f08080",
"lightcyan": "#e0ffff",
+ "lightcyan1": "#e0ffff",
+ "lightcyan2": "#d1eeee",
+ "lightcyan3": "#b4cdcd",
+ "lightcyan4": "#7a8b8b",
+ "lightgoldenrod": "#eedd82",
+ "lightgoldenrod1": "#ffec8b",
+ "lightgoldenrod2": "#eedc82",
+ "lightgoldenrod3": "#cdbe70",
+ "lightgoldenrod4": "#8b814c",
"lightgoldenrodyellow": "#fafad2",
"lightgray": "#d3d3d3",
+ "lightgreen": "#90ee90",
"lightgrey": "#d3d3d3",
"lightpink": "#ffb6c1",
+ "lightpink1": "#ffaeb9",
+ "lightpink2": "#eea2ad",
+ "lightpink3": "#cd8c95",
+ "lightpink4": "#8b5f65",
"lightsalmon": "#ffa07a",
+ "lightsalmon1": "#ffa07a",
+ "lightsalmon2": "#ee9572",
+ "lightsalmon3": "#cd8162",
+ "lightsalmon4": "#8b5742",
"lightseagreen": "#20b2aa",
"lightskyblue": "#87cefa",
+ "lightskyblue1": "#b0e2ff",
+ "lightskyblue2": "#a4d3ee",
+ "lightskyblue3": "#8db6cd",
+ "lightskyblue4": "#607b8b",
+ "lightslateblue": "#8470ff",
"lightslategray": "#778899",
"lightslategrey": "#778899",
"lightsteelblue": "#b0c4de",
+ "lightsteelblue1": "#cae1ff",
+ "lightsteelblue2": "#bcd2ee",
+ "lightsteelblue3": "#a2b5cd",
+ "lightsteelblue4": "#6e7b8b",
"lightyellow": "#ffffe0",
+ "lightyellow1": "#ffffe0",
+ "lightyellow2": "#eeeed1",
+ "lightyellow3": "#cdcdb4",
+ "lightyellow4": "#8b8b7a",
"lime": "#00ff00",
"limegreen": "#32cd32",
"linen": "#faf0e6",
"magenta": "#ff00ff",
! "magenta1": "#ff00ff",
! "magenta2": "#ee00ee",
! "magenta3": "#cd00cd",
! "magenta4": "#8b008b",
! "maroon": "#b03060",
! "maroon1": "#ff34b3",
! "maroon2": "#ee30a7",
! "maroon3": "#cd2990",
! "maroon4": "#8b1c62",
"mediumaquamarine": "#66cdaa",
"mediumblue": "#0000cd",
"mediumorchid": "#ba55d3",
+ "mediumorchid1": "#e066ff",
+ "mediumorchid2": "#d15fee",
+ "mediumorchid3": "#b452cd",
+ "mediumorchid4": "#7a378b",
"mediumpurple": "#9370db",
+ "mediumpurple1": "#ab82ff",
+ "mediumpurple2": "#9f79ee",
+ "mediumpurple3": "#8968cd",
+ "mediumpurple4": "#5d478b",
"mediumseagreen": "#3cb371",
"mediumslateblue": "#7b68ee",
"mediumspringgreen": "#00fa9a",
***************
*** 211,263 ****
"midnightblue": "#191970",
"mintcream": "#f5fffa",
"mistyrose": "#ffe4e1",
"moccasin": "#ffe4b5",
"navajowhite": "#ffdead",
"navy": "#000080",
"oldlace": "#fdf5e6",
- "olive": "#808000",
"olivedrab": "#6b8e23",
"orange": "#ffa500",
"orangered": "#ff4500",
"orchid": "#da70d6",
"palegoldenrod": "#eee8aa",
"palegreen": "#98fb98",
"paleturquoise": "#afeeee",
"palevioletred": "#db7093",
"papayawhip": "#ffefd5",
"peachpuff": "#ffdab9",
"peru": "#cd853f",
"pink": "#ffc0cb",
"plum": "#dda0dd",
"powderblue": "#b0e0e6",
! "purple": "#800080",
"red": "#ff0000",
"rosybrown": "#bc8f8f",
"royalblue": "#4169e1",
"saddlebrown": "#8b4513",
"salmon": "#fa8072",
"sandybrown": "#f4a460",
"seagreen": "#2e8b57",
"seashell": "#fff5ee",
"sienna": "#a0522d",
! "silver": "#c0c0c0",
"skyblue": "#87ceeb",
"slateblue": "#6a5acd",
"slategray": "#708090",
"slategrey": "#708090",
"snow": "#fffafa",
"springgreen": "#00ff7f",
"steelblue": "#4682b4",
"tan": "#d2b48c",
! "teal": "#008080",
"thistle": "#d8bfd8",
"tomato": "#ff6347",
"turquoise": "#40e0d0",
"violet": "#ee82ee",
"wheat": "#f5deb3",
"white": "#ffffff",
"whitesmoke": "#f5f5f5",
"yellow": "#ffff00",
"yellowgreen": "#9acd32",
}
--- 596,779 ----
"midnightblue": "#191970",
"mintcream": "#f5fffa",
"mistyrose": "#ffe4e1",
+ "mistyrose1": "#ffe4e1",
+ "mistyrose2": "#eed5d2",
+ "mistyrose3": "#cdb7b5",
+ "mistyrose4": "#8b7d7b",
"moccasin": "#ffe4b5",
"navajowhite": "#ffdead",
+ "navajowhite1": "#ffdead",
+ "navajowhite2": "#eecfa1",
+ "navajowhite3": "#cdb38b",
+ "navajowhite4": "#8b795e",
"navy": "#000080",
+ "navyblue": "#000080",
"oldlace": "#fdf5e6",
"olivedrab": "#6b8e23",
+ "olivedrab1": "#c0ff3e",
+ "olivedrab2": "#b3ee3a",
+ "olivedrab3": "#9acd32",
+ "olivedrab4": "#698b22",
"orange": "#ffa500",
+ "orange1": "#ffa500",
+ "orange2": "#ee9a00",
+ "orange3": "#cd8500",
+ "orange4": "#8b5a00",
"orangered": "#ff4500",
+ "orangered1": "#ff4500",
+ "orangered2": "#ee4000",
+ "orangered3": "#cd3700",
+ "orangered4": "#8b2500",
"orchid": "#da70d6",
+ "orchid1": "#ff83fa",
+ "orchid2": "#ee7ae9",
+ "orchid3": "#cd69c9",
+ "orchid4": "#8b4789",
"palegoldenrod": "#eee8aa",
"palegreen": "#98fb98",
+ "palegreen1": "#9aff9a",
+ "palegreen2": "#90ee90",
+ "palegreen3": "#7ccd7c",
+ "palegreen4": "#548b54",
"paleturquoise": "#afeeee",
+ "paleturquoise1": "#bbffff",
+ "paleturquoise2": "#aeeeee",
+ "paleturquoise3": "#96cdcd",
+ "paleturquoise4": "#668b8b",
"palevioletred": "#db7093",
+ "palevioletred1": "#ff82ab",
+ "palevioletred2": "#ee799f",
+ "palevioletred3": "#cd6889",
+ "palevioletred4": "#8b475d",
"papayawhip": "#ffefd5",
"peachpuff": "#ffdab9",
+ "peachpuff1": "#ffdab9",
+ "peachpuff2": "#eecbad",
+ "peachpuff3": "#cdaf95",
+ "peachpuff4": "#8b7765",
"peru": "#cd853f",
"pink": "#ffc0cb",
+ "pink1": "#ffb5c5",
+ "pink2": "#eea9b8",
+ "pink3": "#cd919e",
+ "pink4": "#8b636c",
"plum": "#dda0dd",
+ "plum1": "#ffbbff",
+ "plum2": "#eeaeee",
+ "plum3": "#cd96cd",
+ "plum4": "#8b668b",
"powderblue": "#b0e0e6",
! "purple": "#a020f0",
! "purple1": "#9b30ff",
! "purple2": "#912cee",
! "purple3": "#7d26cd",
! "purple4": "#551a8b",
"red": "#ff0000",
+ "red1": "#ff0000",
+ "red2": "#ee0000",
+ "red3": "#cd0000",
+ "red4": "#8b0000",
"rosybrown": "#bc8f8f",
+ "rosybrown1": "#ffc1c1",
+ "rosybrown2": "#eeb4b4",
+ "rosybrown3": "#cd9b9b",
+ "rosybrown4": "#8b6969",
"royalblue": "#4169e1",
+ "royalblue1": "#4876ff",
+ "royalblue2": "#436eee",
+ "royalblue3": "#3a5fcd",
+ "royalblue4": "#27408b",
"saddlebrown": "#8b4513",
"salmon": "#fa8072",
+ "salmon1": "#ff8c69",
+ "salmon2": "#ee8262",
+ "salmon3": "#cd7054",
+ "salmon4": "#8b4c39",
"sandybrown": "#f4a460",
"seagreen": "#2e8b57",
+ "seagreen1": "#54ff9f",
+ "seagreen2": "#4eee94",
+ "seagreen3": "#43cd80",
+ "seagreen4": "#2e8b57",
"seashell": "#fff5ee",
+ "seashell1": "#fff5ee",
+ "seashell2": "#eee5de",
+ "seashell3": "#cdc5bf",
+ "seashell4": "#8b8682",
"sienna": "#a0522d",
! "sienna1": "#ff8247",
! "sienna2": "#ee7942",
! "sienna3": "#cd6839",
! "sienna4": "#8b4726",
"skyblue": "#87ceeb",
+ "skyblue1": "#87ceff",
+ "skyblue2": "#7ec0ee",
+ "skyblue3": "#6ca6cd",
+ "skyblue4": "#4a708b",
"slateblue": "#6a5acd",
+ "slateblue1": "#836fff",
+ "slateblue2": "#7a67ee",
+ "slateblue3": "#6959cd",
+ "slateblue4": "#473c8b",
"slategray": "#708090",
+ "slategray1": "#c6e2ff",
+ "slategray2": "#b9d3ee",
+ "slategray3": "#9fb6cd",
+ "slategray4": "#6c7b8b",
"slategrey": "#708090",
"snow": "#fffafa",
+ "snow1": "#fffafa",
+ "snow2": "#eee9e9",
+ "snow3": "#cdc9c9",
+ "snow4": "#8b8989",
"springgreen": "#00ff7f",
+ "springgreen1": "#00ff7f",
+ "springgreen2": "#00ee76",
+ "springgreen3": "#00cd66",
+ "springgreen4": "#008b45",
"steelblue": "#4682b4",
+ "steelblue1": "#63b8ff",
+ "steelblue2": "#5cacee",
+ "steelblue3": "#4f94cd",
+ "steelblue4": "#36648b",
"tan": "#d2b48c",
! "tan1": "#ffa54f",
! "tan2": "#ee9a49",
! "tan3": "#cd853f",
! "tan4": "#8b5a2b",
"thistle": "#d8bfd8",
+ "thistle1": "#ffe1ff",
+ "thistle2": "#eed2ee",
+ "thistle3": "#cdb5cd",
+ "thistle4": "#8b7b8b",
"tomato": "#ff6347",
+ "tomato1": "#ff6347",
+ "tomato2": "#ee5c42",
+ "tomato3": "#cd4f39",
+ "tomato4": "#8b3626",
"turquoise": "#40e0d0",
+ "turquoise1": "#00f5ff",
+ "turquoise2": "#00e5ee",
+ "turquoise3": "#00c5cd",
+ "turquoise4": "#00868b",
"violet": "#ee82ee",
+ "violetred": "#d02090",
+ "violetred1": "#ff3e96",
+ "violetred2": "#ee3a8c",
+ "violetred3": "#cd3278",
+ "violetred4": "#8b2252",
"wheat": "#f5deb3",
+ "wheat1": "#ffe7ba",
+ "wheat2": "#eed8ae",
+ "wheat3": "#cdba96",
+ "wheat4": "#8b7e66",
"white": "#ffffff",
"whitesmoke": "#f5f5f5",
"yellow": "#ffff00",
+ "yellow1": "#ffff00",
+ "yellow2": "#eeee00",
+ "yellow3": "#cdcd00",
+ "yellow4": "#8b8b00",
"yellowgreen": "#9acd32",
}
_______________________________________________ Image-SIG maillist - [email protected] http://mail.python.org/mailman/listinfo/image-sig
