From e3e77a19c40caafb77339e5a126c532bf2984c01 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 16 Oct 2009 00:47:21 +0000 Subject: [PATCH] --- config/coder.xml | 151 +------ config/colors.xml | 698 +----------------------------- magick/coder.c | 359 +++++++++------- magick/coder.h | 1 + magick/color.c | 1028 +++++++++++++++++++++++++++++++++------------ magick/color.h | 1 + magick/magic.c | 258 ++++++------ 7 files changed, 1138 insertions(+), 1358 deletions(-) diff --git a/config/coder.xml b/config/coder.xml index 650e46c57..9507fceac 100644 --- a/config/coder.xml +++ b/config/coder.xml @@ -5,143 +5,18 @@ ]> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/config/colors.xml b/config/colors.xml index ac76e2492..6af18c2f6 100644 --- a/config/colors.xml +++ b/config/colors.xml @@ -6,685 +6,23 @@ ]> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/magick/coder.c b/magick/coder.c index 134b79d35..8943ae702 100644 --- a/magick/coder.c +++ b/magick/coder.c @@ -63,150 +63,160 @@ */ #define MagickCoderFilename "coder.xml" -/* - Declare coder map. -*/ -static const char - *CoderMap = (const char *) - "" - "" - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - ""; - /* Static declarations. */ +typedef struct _CoderMapInfo +{ + const char + *magick, + *name; +} CoderMapInfo; + +static const CoderMapInfo + CoderMap[] = + { + { "3FR", "DNG" }, + { "8BIM", "META" }, + { "8BIMTEXT", "META" }, + { "8BIMWTEXT", "META" }, + { "AFM", "TTF" }, + { "A", "RAW" }, + { "AI", "PDF" }, + { "APP1JPEG", "META" }, + { "APP1", "META" }, + { "ARW", "DNG" }, + { "BIE", "JBIG" }, + { "BMP2", "BMP" }, + { "BMP3", "BMP" }, + { "B", "RAW" }, + { "BRF", "BRAILLE" }, + { "BGR", "RGB" }, + { "BRG", "RGB" }, + { "CMYKA", "CMYK" }, + { "C", "RAW" }, + { "CAL", "CALS" }, + { "CR2", "DNG" }, + { "CRW", "DNG" }, + { "CUR", "ICON" }, + { "DCR", "DNG" }, + { "DCX", "PCX" }, + { "DFONT", "TTF" }, + { "EPDF", "PDF" }, + { "EPI", "PS" }, + { "EPS2", "PS2" }, + { "EPS3", "PS3" }, + { "EPSF", "PS" }, + { "EPSI", "PS" }, + { "EPS", "PS" }, + { "EPT2", "EPT" }, + { "EPT3", "EPT" }, + { "ERF", "DNG" }, + { "EXIF", "META" }, + { "FILE", "URL" }, + { "FRACTAL", "PLASMA" }, + { "FTP", "URL" }, + { "FTS", "FITS" }, + { "G3", "FAX" }, + { "GIF87", "GIF" }, + { "G", "RAW" }, + { "GBR", "RGB" }, + { "GRB", "RGB" }, + { "GRANITE", "MAGICK" }, + { "GROUP4", "TIFF" }, + { "K25", "DNG" }, + { "KDC", "DNG" }, + { "H", "MAGICK" }, + { "HTM", "HTML" }, + { "HTTP", "URL" }, + { "ICB", "TGA" }, + { "ICC", "META" }, + { "ICM", "META" }, + { "ICO", "ICON" }, + { "IMPLICIT", "***" }, + { "IPTC", "META" }, + { "IPTCTEXT", "META" }, + { "IPTCWTEXT", "META" }, + { "ISOBRL", "BRAILLE" }, + { "JBG", "JBIG" }, + { "JNG", "PNG" }, + { "JPC", "JP2" }, + { "JPG", "JPEG" }, + { "JPX", "JP2" }, + { "K", "RAW" }, + { "LOGO", "MAGICK" }, + { "M2V", "MPEG" }, + { "M4V", "MPEG" }, + { "M", "RAW" }, + { "MNG", "PNG" }, + { "MOV", "PNG" }, + { "MP4", "MPEG" }, + { "MPG", "MPEG" }, + { "MPRI", "MPR" }, + { "MRW", "DNG" }, + { "MSVG", "SVG" }, + { "NEF", "DNG" }, + { "NETSCAPE", "MAGICK" }, + { "O", "RAW" }, + { "ORF", "DNG" }, + { "OTF", "TTF" }, + { "P7", "PNM" }, + { "PAL", "UYVY" }, + { "PAM", "PNM" }, + { "PBM", "PNM" }, + { "PCDS", "PCD" }, + { "PDFA", "PDF" }, + { "PEF", "DNG" }, + { "PEF", "DNG" }, + { "PFA", "TTF" }, + { "PFB", "TTF" }, + { "PFM", "PNM" }, + { "PGM", "PNM" }, + { "PGX", "JP2" }, + { "PICON", "XPM" }, + { "PJPEG", "JPEG" }, + { "PM", "XPM" }, + { "PNG24", "PNG" }, + { "PNG32", "PNG" }, + { "PNG8", "PNG" }, + { "PPM", "PNM" }, + { "PTIF", "TIFF" }, + { "RADIAL-GRADIENT", "GRADIENT" }, + { "RAF", "DNG" }, + { "RAS", "SUN" }, + { "RBG", "RGB" }, + { "RGBA", "RGB" }, + { "RGBO", "RGB" }, + { "R", "RAW" }, + { "ROSE", "MAGICK" }, + { "SHTML", "HTML" }, + { "SR2", "DNG" }, + { "SRF", "DNG" }, + { "SVGZ", "SVG" }, + { "TEXT", "TXT" }, + { "TIFF64", "TIFF" }, + { "TIF", "TIFF" }, + { "TTC", "TTF" }, + { "UBRL", "BRAILLE" }, + { "VDA", "TGA" }, + { "VST", "TGA" }, + { "WMV", "MPEG" }, + { "WMFWIN32", "EMF" }, + { "WMZ", "WMF" }, + { "X3f", "DNG" }, + { "XMP", "META" }, + { "XTRNARRAY", "XTRN" }, + { "XTRNBLOB", "XTRN" }, + { "XTRNBSTR", "XTRN" }, + { "XTRNFILE", "XTRN" }, + { "XTRNIMAGE", "XTRN" }, + { "XTRNSTREAM", "XTRN" }, + { "XV", "VIFF" }, + { "Y", "RAW" }, + { "YCbCrA", "YCbCr" }, + { (const char *) NULL, (const char *) NULL } + }; + static SemaphoreInfo *coder_semaphore = (SemaphoreInfo *) NULL; @@ -616,12 +626,15 @@ static void *DestroyCoderNode(void *coder_info) *p; p=(CoderInfo *) coder_info; - if (p->path != (char *) NULL) - p->path=DestroyString(p->path); - if (p->name != (char *) NULL) - p->name=DestroyString(p->name); - if (p->magick != (char *) NULL) - p->magick=DestroyString(p->magick); + if (p->exempt == MagickFalse) + { + if (p->path != (char *) NULL) + p->path=DestroyString(p->path); + if (p->name != (char *) NULL) + p->name=DestroyString(p->name); + if (p->magick != (char *) NULL) + p->magick=DestroyString(p->magick); + } return(RelinquishMagickMemory(p)); } @@ -741,6 +754,7 @@ static MagickBooleanType LoadCoderList(const char *xml,const char *filename, ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); (void) ResetMagickMemory(coder_info,0,sizeof(*coder_info)); coder_info->path=ConstantString(filename); + coder_info->exempt=MagickFalse; coder_info->signature=MagickSignature; continue; } @@ -830,9 +844,6 @@ static MagickBooleanType LoadCoderList(const char *xml,const char *filename, static MagickBooleanType LoadCoderLists(const char *filename, ExceptionInfo *exception) { -#if defined(MAGICKCORE_EMBEDDABLE_SUPPORT) - return(LoadCoderList(CoderMap,"built-in",0,exception)); -#else const StringInfo *option; @@ -842,7 +853,51 @@ static MagickBooleanType LoadCoderLists(const char *filename, MagickStatusType status; + register const CoderMapInfo + *p; + + /* + Load built-in coder map. + */ status=MagickFalse; + if (coder_list == (SplayTreeInfo *) NULL) + { + coder_list=NewSplayTree(CompareSplayTreeString,RelinquishMagickMemory, + DestroyCoderNode); + if (coder_list == (SplayTreeInfo *) NULL) + { + ThrowFileException(exception,ResourceLimitError, + "MemoryAllocationFailed",filename); + return(MagickFalse); + } + } + for (p=CoderMap; p->magick != (const char *) NULL; p++) + { + CoderInfo + *coder_info; + + coder_info=(CoderInfo *) AcquireMagickMemory(sizeof(*coder_info)); + if (coder_info == (CoderInfo *) NULL) + { + (void) ThrowMagickException(exception,GetMagickModule(), + ResourceLimitError,"MemoryAllocationFailed","`%s'",coder_info->name); + continue; + } + (void) ResetMagickMemory(coder_info,0,sizeof(*coder_info)); + coder_info->path="[built-in]"; + coder_info->magick=(char *) p->magick; + coder_info->name=(char *) p->name; + coder_info->exempt=MagickTrue; + coder_info->signature=MagickSignature; + status=AddValueToSplayTree(coder_list,ConstantString(coder_info->magick), + coder_info); + if (status == MagickFalse) + (void) ThrowMagickException(exception,GetMagickModule(), + ResourceLimitError,"MemoryAllocationFailed","`%s'",coder_info->name); + } + /* + Load external coder map. + */ options=GetConfigureOptions(filename,exception); option=(const StringInfo *) GetNextValueInLinkedList(options); while (option != (const StringInfo *) NULL) @@ -852,9 +907,5 @@ static MagickBooleanType LoadCoderLists(const char *filename, option=(const StringInfo *) GetNextValueInLinkedList(options); } options=DestroyConfigureOptions(options); - if ((coder_list == (SplayTreeInfo *) NULL) || - (GetNumberOfNodesInSplayTree(coder_list) == 0)) - status|=LoadCoderList(CoderMap,"built-in",0,exception); return(status != 0 ? MagickTrue : MagickFalse); -#endif } diff --git a/magick/coder.h b/magick/coder.h index f4b81bdf7..aba1684b2 100644 --- a/magick/coder.h +++ b/magick/coder.h @@ -30,6 +30,7 @@ typedef struct _CoderInfo *name; MagickBooleanType + exempt, stealth; struct _CoderInfo diff --git a/magick/color.c b/magick/color.c index e19c28ff5..214f894d6 100644 --- a/magick/color.c +++ b/magick/color.c @@ -72,267 +72,708 @@ #define ColorFilename "colors.xml" /* - Declare color map. + Static declarations. */ -static const char - *ColorMap = (const char *) - "" - "" - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - ""; +typedef struct _ColorMapInfo +{ + const char + *name; + + const double + red, + green, + blue, + alpha; + + const ComplianceType + compliance; +} ColorMapInfo; + +static const ColorMapInfo + ColorMap[] = + { + { "none", 0, 0, 0, 0, SVGCompliance }, + { "black", 0, 0, 0, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "red", 255, 0, 0, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "magenta", 255, 0, 255, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "green", 0, 128, 0, 1, SVGCompliance }, + { "cyan", 0, 255, 255, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "blue", 0, 0, 255, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "yellow", 255, 255, 0, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "white", 255, 255, 255, 1, SVGCompliance | X11Compliance }, + { "AliceBlue", 240, 248, 255, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "AntiqueWhite", 250, 235, 215, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "AntiqueWhite1", 255, 239, 219, 1, X11Compliance }, + { "AntiqueWhite2", 238, 223, 204, 1, X11Compliance }, + { "AntiqueWhite3", 205, 192, 176, 1, X11Compliance }, + { "AntiqueWhite4", 139, 131, 120, 1, X11Compliance }, + { "aqua", 0, 255, 255, 1, SVGCompliance }, + { "aquamarine", 127, 255, 212, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "aquamarine1", 127, 255, 212, 1, X11Compliance }, + { "aquamarine2", 118, 238, 198, 1, X11Compliance }, + { "aquamarine3", 102, 205, 170, 1, X11Compliance }, + { "aquamarine4", 69, 139, 116, 1, X11Compliance }, + { "azure", 240, 255, 255, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "azure1", 240, 255, 255, 1, X11Compliance }, + { "azure2", 224, 238, 238, 1, X11Compliance }, + { "azure3", 193, 205, 205, 1, X11Compliance }, + { "azure4", 131, 139, 139, 1, X11Compliance }, + { "beige", 245, 245, 220, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "bisque", 255, 228, 196, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "bisque1", 255, 228, 196, 1, X11Compliance }, + { "bisque2", 238, 213, 183, 1, X11Compliance }, + { "bisque3", 205, 183, 158, 1, X11Compliance }, + { "bisque4", 139, 125, 107, 1, X11Compliance }, + { "BlanchedAlmond", 255, 235, 205, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "blue1", 0, 0, 255, 1, X11Compliance }, + { "blue2", 0, 0, 238, 1, X11Compliance }, + { "blue3", 0, 0, 205, 1, X11Compliance }, + { "blue4", 0, 0, 139, 1, X11Compliance }, + { "BlueViolet", 138, 43, 226, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "brown", 165, 42, 42, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "brown1", 255, 64, 64, 1, X11Compliance }, + { "brown2", 238, 59, 59, 1, X11Compliance }, + { "brown3", 205, 51, 51, 1, X11Compliance }, + { "brown4", 139, 35, 35, 1, X11Compliance }, + { "burlywood", 222, 184, 135, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "burlywood1", 255, 211, 155, 1, X11Compliance }, + { "burlywood2", 238, 197, 145, 1, X11Compliance }, + { "burlywood3", 205, 170, 125, 1, X11Compliance }, + { "burlywood4", 139, 115, 85, 1, X11Compliance }, + { "cadet blue", 95, 158, 160, 1, X11Compliance }, + { "CadetBlue", 95, 158, 160, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "CadetBlue1", 152, 245, 255, 1, X11Compliance }, + { "CadetBlue2", 142, 229, 238, 1, X11Compliance }, + { "CadetBlue3", 122, 197, 205, 1, X11Compliance }, + { "CadetBlue4", 83, 134, 139, 1, X11Compliance }, + { "chartreuse", 127, 255, 0, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "chartreuse1", 127, 255, 0, 1, X11Compliance }, + { "chartreuse2", 118, 238, 0, 1, X11Compliance }, + { "chartreuse3", 102, 205, 0, 1, X11Compliance }, + { "chartreuse4", 69, 139, 0, 1, X11Compliance }, + { "chocolate", 210, 105, 30, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "chocolate1", 255, 127, 36, 1, X11Compliance }, + { "chocolate2", 238, 118, 33, 1, X11Compliance }, + { "chocolate3", 205, 102, 29, 1, X11Compliance }, + { "chocolate4", 139, 69, 19, 1, X11Compliance }, + { "coral", 255, 127, 80, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "coral1", 255, 114, 86, 1, X11Compliance }, + { "coral2", 238, 106, 80, 1, X11Compliance }, + { "coral3", 205, 91, 69, 1, X11Compliance }, + { "coral4", 139, 62, 47, 1, X11Compliance }, + { "CornflowerBlue", 100, 149, 237, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "cornsilk", 255, 248, 220, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "cornsilk1", 255, 248, 220, 1, X11Compliance }, + { "cornsilk2", 238, 232, 205, 1, X11Compliance }, + { "cornsilk3", 205, 200, 177, 1, X11Compliance }, + { "cornsilk4", 139, 136, 120, 1, X11Compliance }, + { "crimson", 220, 20, 60, 1, SVGCompliance }, + { "cyan1", 0, 255, 255, 1, X11Compliance }, + { "cyan2", 0, 238, 238, 1, X11Compliance }, + { "cyan3", 0, 205, 205, 1, X11Compliance }, + { "cyan4", 0, 139, 139, 1, X11Compliance }, + { "dark violet", 148, 0, 211, 1, X11Compliance }, + { "DarkBlue", 0, 0, 139, 1, SVGCompliance | X11Compliance }, + { "DarkCyan", 0, 139, 139, 1, SVGCompliance | X11Compliance }, + { "DarkGoldenrod", 184, 134, 11, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DarkGoldenrod1", 255, 185, 15, 1, X11Compliance }, + { "DarkGoldenrod2", 238, 173, 14, 1, X11Compliance }, + { "DarkGoldenrod3", 205, 149, 12, 1, X11Compliance }, + { "DarkGoldenrod4", 139, 101, 8, 1, X11Compliance }, + { "DarkGray", 169, 169, 169, 1, SVGCompliance | X11Compliance }, + { "DarkGreen", 0, 100, 0, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DarkGrey", 169, 169, 169, 1, SVGCompliance | X11Compliance }, + { "DarkKhaki", 189, 183, 107, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DarkMagenta", 139, 0, 139, 1, SVGCompliance | X11Compliance }, + { "DarkOliveGreen", 85, 107, 47, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DarkOliveGreen1", 202, 255, 112, 1, X11Compliance }, + { "DarkOliveGreen2", 188, 238, 104, 1, X11Compliance }, + { "DarkOliveGreen3", 162, 205, 90, 1, X11Compliance }, + { "DarkOliveGreen4", 110, 139, 61, 1, X11Compliance }, + { "DarkOrange", 255, 140, 0, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DarkOrange1", 255, 127, 0, 1, X11Compliance }, + { "DarkOrange2", 238, 118, 0, 1, X11Compliance }, + { "DarkOrange3", 205, 102, 0, 1, X11Compliance }, + { "DarkOrange4", 139, 69, 0, 1, X11Compliance }, + { "DarkOrchid", 153, 50, 204, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DarkOrchid1", 191, 62, 255, 1, X11Compliance }, + { "DarkOrchid2", 178, 58, 238, 1, X11Compliance }, + { "DarkOrchid3", 154, 50, 205, 1, X11Compliance }, + { "DarkOrchid4", 104, 34, 139, 1, X11Compliance }, + { "DarkRed", 139, 0, 0, 1, SVGCompliance | X11Compliance }, + { "DarkSalmon", 233, 150, 122, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DarkSeaGreen", 143, 188, 143, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DarkSeaGreen1", 193, 255, 193, 1, X11Compliance }, + { "DarkSeaGreen2", 180, 238, 180, 1, X11Compliance }, + { "DarkSeaGreen3", 155, 205, 155, 1, X11Compliance }, + { "DarkSeaGreen4", 105, 139, 105, 1, X11Compliance }, + { "DarkSlateBlue", 72, 61, 139, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DarkSlateGray", 47, 79, 79, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DarkSlateGray1", 151, 255, 255, 1, X11Compliance }, + { "DarkSlateGray2", 141, 238, 238, 1, X11Compliance }, + { "DarkSlateGray3", 121, 205, 205, 1, X11Compliance }, + { "DarkSlateGray4", 82, 139, 139, 1, X11Compliance }, + { "DarkSlateGrey", 47, 79, 79, 1, SVGCompliance | X11Compliance }, + { "DarkTurquoise", 0, 206, 209, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DarkViolet", 148, 0, 211, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DeepPink", 255, 20, 147, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DeepPink1", 255, 20, 147, 1, X11Compliance }, + { "DeepPink2", 238, 18, 137, 1, X11Compliance }, + { "DeepPink3", 205, 16, 118, 1, X11Compliance }, + { "DeepPink4", 139, 10, 80, 1, X11Compliance }, + { "DeepSkyBlue", 0, 191, 255, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DeepSkyBlue1", 0, 191, 255, 1, X11Compliance }, + { "DeepSkyBlue2", 0, 178, 238, 1, X11Compliance }, + { "DeepSkyBlue3", 0, 154, 205, 1, X11Compliance }, + { "DeepSkyBlue4", 0, 104, 139, 1, X11Compliance }, + { "DimGray", 105, 105, 105, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DimGrey", 105, 105, 105, 1, SVGCompliance | X11Compliance }, + { "DodgerBlue", 30, 144, 255, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "DodgerBlue1", 30, 144, 255, 1, X11Compliance }, + { "DodgerBlue2", 28, 134, 238, 1, X11Compliance }, + { "DodgerBlue3", 24, 116, 205, 1, X11Compliance }, + { "DodgerBlue4", 16, 78, 139, 1, X11Compliance }, + { "firebrick", 178, 34, 34, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "firebrick1", 255, 48, 48, 1, X11Compliance }, + { "firebrick2", 238, 44, 44, 1, X11Compliance }, + { "firebrick3", 205, 38, 38, 1, X11Compliance }, + { "firebrick4", 139, 26, 26, 1, X11Compliance }, + { "FloralWhite", 255, 250, 240, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "ForestGreen", 34, 139, 34, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "fractal", 128, 128, 128, 1, SVGCompliance }, + { "freeze", 0, 0, 0, 0, SVGCompliance }, + { "fuchsia", 255, 0, 255, 1, SVGCompliance }, + { "gainsboro", 220, 220, 220, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "GhostWhite", 248, 248, 255, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "gold", 255, 215, 0, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "gold1", 255, 215, 0, 1, X11Compliance }, + { "gold2", 238, 201, 0, 1, X11Compliance }, + { "gold3", 205, 173, 0, 1, X11Compliance }, + { "gold4", 139, 117, 0, 1, X11Compliance }, + { "goldenrod", 218, 165, 32, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "goldenrod1", 255, 193, 37, 1, X11Compliance }, + { "goldenrod2", 238, 180, 34, 1, X11Compliance }, + { "goldenrod3", 205, 155, 29, 1, X11Compliance }, + { "goldenrod4", 139, 105, 20, 1, X11Compliance }, + { "gray", 126, 126, 126, 1, SVGCompliance }, + { "gray", 190, 190, 190, 1, X11Compliance | XPMCompliance }, + { "gray0", 0, 0, 0, 1, X11Compliance | XPMCompliance }, + { "gray1", 3, 3, 3, 1, X11Compliance | XPMCompliance }, + { "gray10", 26, 26, 26, 1, X11Compliance | XPMCompliance }, + { "gray100", 255, 255, 255, 1, X11Compliance | XPMCompliance }, + { "gray100", 255, 255, 255, 1, X11Compliance | XPMCompliance }, + { "gray11", 28, 28, 28, 1, X11Compliance | XPMCompliance }, + { "gray12", 31, 31, 31, 1, X11Compliance | XPMCompliance }, + { "gray13", 33, 33, 33, 1, X11Compliance | XPMCompliance }, + { "gray14", 36, 36, 36, 1, X11Compliance | XPMCompliance }, + { "gray15", 38, 38, 38, 1, X11Compliance | XPMCompliance }, + { "gray16", 41, 41, 41, 1, X11Compliance | XPMCompliance }, + { "gray17", 43, 43, 43, 1, X11Compliance | XPMCompliance }, + { "gray18", 46, 46, 46, 1, X11Compliance | XPMCompliance }, + { "gray19", 48, 48, 48, 1, X11Compliance | XPMCompliance }, + { "gray2", 5, 5, 5, 1, X11Compliance | XPMCompliance }, + { "gray20", 51, 51, 51, 1, X11Compliance | XPMCompliance }, + { "gray21", 54, 54, 54, 1, X11Compliance | XPMCompliance }, + { "gray22", 56, 56, 56, 1, X11Compliance | XPMCompliance }, + { "gray23", 59, 59, 59, 1, X11Compliance | XPMCompliance }, + { "gray24", 61, 61, 61, 1, X11Compliance | XPMCompliance }, + { "gray25", 64, 64, 64, 1, X11Compliance | XPMCompliance }, + { "gray26", 66, 66, 66, 1, X11Compliance | XPMCompliance }, + { "gray27", 69, 69, 69, 1, X11Compliance | XPMCompliance }, + { "gray28", 71, 71, 71, 1, X11Compliance | XPMCompliance }, + { "gray29", 74, 74, 74, 1, X11Compliance | XPMCompliance }, + { "gray3", 8, 8, 8, 1, X11Compliance | XPMCompliance }, + { "gray30", 77, 77, 77, 1, X11Compliance | XPMCompliance }, + { "gray31", 79, 79, 79, 1, X11Compliance | XPMCompliance }, + { "gray32", 82, 82, 82, 1, X11Compliance | XPMCompliance }, + { "gray33", 84, 84, 84, 1, X11Compliance | XPMCompliance }, + { "gray34", 87, 87, 87, 1, X11Compliance | XPMCompliance }, + { "gray35", 89, 89, 89, 1, X11Compliance | XPMCompliance }, + { "gray36", 92, 92, 92, 1, X11Compliance | XPMCompliance }, + { "gray37", 94, 94, 94, 1, X11Compliance | XPMCompliance }, + { "gray38", 97, 97, 97, 1, X11Compliance | XPMCompliance }, + { "gray39", 99, 99, 99, 1, X11Compliance | XPMCompliance }, + { "gray4", 10, 10, 10, 1, X11Compliance | XPMCompliance }, + { "gray40", 102, 102, 102, 1, X11Compliance | XPMCompliance }, + { "gray41", 105, 105, 105, 1, X11Compliance | XPMCompliance }, + { "gray42", 107, 107, 107, 1, X11Compliance | XPMCompliance }, + { "gray43", 110, 110, 110, 1, X11Compliance | XPMCompliance }, + { "gray44", 112, 112, 112, 1, X11Compliance | XPMCompliance }, + { "gray45", 115, 115, 115, 1, X11Compliance | XPMCompliance }, + { "gray46", 117, 117, 117, 1, X11Compliance | XPMCompliance }, + { "gray47", 120, 120, 120, 1, X11Compliance | XPMCompliance }, + { "gray48", 122, 122, 122, 1, X11Compliance | XPMCompliance }, + { "gray49", 125, 125, 125, 1, X11Compliance | XPMCompliance }, + { "gray5", 13, 13, 13, 1, X11Compliance | XPMCompliance }, + { "gray50", 127.5, 127.5, 127.5, 1, X11Compliance | XPMCompliance }, + { "gray51", 130, 130, 130, 1, X11Compliance | XPMCompliance }, + { "gray52", 133, 133, 133, 1, X11Compliance | XPMCompliance }, + { "gray53", 135, 135, 135, 1, X11Compliance | XPMCompliance }, + { "gray54", 138, 138, 138, 1, X11Compliance | XPMCompliance }, + { "gray55", 140, 140, 140, 1, X11Compliance | XPMCompliance }, + { "gray56", 143, 143, 143, 1, X11Compliance | XPMCompliance }, + { "gray57", 145, 145, 145, 1, X11Compliance | XPMCompliance }, + { "gray58", 148, 148, 148, 1, X11Compliance | XPMCompliance }, + { "gray59", 150, 150, 150, 1, X11Compliance | XPMCompliance }, + { "gray6", 15, 15, 15, 1, X11Compliance | XPMCompliance }, + { "gray60", 153, 153, 153, 1, X11Compliance | XPMCompliance }, + { "gray61", 156, 156, 156, 1, X11Compliance | XPMCompliance }, + { "gray62", 158, 158, 158, 1, X11Compliance | XPMCompliance }, + { "gray63", 161, 161, 161, 1, X11Compliance | XPMCompliance }, + { "gray64", 163, 163, 163, 1, X11Compliance | XPMCompliance }, + { "gray65", 166, 166, 166, 1, X11Compliance | XPMCompliance }, + { "gray66", 168, 168, 168, 1, X11Compliance | XPMCompliance }, + { "gray67", 171, 171, 171, 1, X11Compliance | XPMCompliance }, + { "gray68", 173, 173, 173, 1, X11Compliance | XPMCompliance }, + { "gray69", 176, 176, 176, 1, X11Compliance | XPMCompliance }, + { "gray7", 18, 18, 18, 1, X11Compliance | XPMCompliance }, + { "gray70", 179, 179, 179, 1, X11Compliance | XPMCompliance }, + { "gray71", 181, 181, 181, 1, X11Compliance | XPMCompliance }, + { "gray72", 184, 184, 184, 1, X11Compliance | XPMCompliance }, + { "gray73", 186, 186, 186, 1, X11Compliance | XPMCompliance }, + { "gray74", 189, 189, 189, 1, X11Compliance | XPMCompliance }, + { "gray75", 191, 191, 191, 1, X11Compliance | XPMCompliance }, + { "gray76", 194, 194, 194, 1, X11Compliance | XPMCompliance }, + { "gray77", 196, 196, 196, 1, X11Compliance | XPMCompliance }, + { "gray78", 199, 199, 199, 1, X11Compliance | XPMCompliance }, + { "gray79", 201, 201, 201, 1, X11Compliance | XPMCompliance }, + { "gray8", 20, 20, 20, 1, X11Compliance | XPMCompliance }, + { "gray80", 204, 204, 204, 1, X11Compliance | XPMCompliance }, + { "gray81", 207, 207, 207, 1, X11Compliance | XPMCompliance }, + { "gray82", 209, 209, 209, 1, X11Compliance | XPMCompliance }, + { "gray83", 212, 212, 212, 1, X11Compliance | XPMCompliance }, + { "gray84", 214, 214, 214, 1, X11Compliance | XPMCompliance }, + { "gray85", 217, 217, 217, 1, X11Compliance | XPMCompliance }, + { "gray86", 219, 219, 219, 1, X11Compliance | XPMCompliance }, + { "gray87", 222, 222, 222, 1, X11Compliance | XPMCompliance }, + { "gray88", 224, 224, 224, 1, X11Compliance | XPMCompliance }, + { "gray89", 227, 227, 227, 1, X11Compliance | XPMCompliance }, + { "gray9", 23, 23, 23, 1, X11Compliance | XPMCompliance }, + { "gray90", 229, 229, 229, 1, X11Compliance | XPMCompliance }, + { "gray91", 232, 232, 232, 1, X11Compliance | XPMCompliance }, + { "gray92", 235, 235, 235, 1, X11Compliance | XPMCompliance }, + { "gray93", 237, 237, 237, 1, X11Compliance | XPMCompliance }, + { "gray94", 240, 240, 240, 1, X11Compliance | XPMCompliance }, + { "gray95", 242, 242, 242, 1, X11Compliance | XPMCompliance }, + { "gray96", 245, 245, 245, 1, X11Compliance | XPMCompliance }, + { "gray97", 247, 247, 247, 1, X11Compliance | XPMCompliance }, + { "gray98", 250, 250, 250, 1, X11Compliance | XPMCompliance }, + { "gray99", 252, 252, 252, 1, X11Compliance | XPMCompliance }, + { "green", 0, 255, 0, 1, X11Compliance | XPMCompliance }, + { "green1", 0, 255, 0, 1, X11Compliance }, + { "green2", 0, 238, 0, 1, X11Compliance }, + { "green3", 0, 205, 0, 1, X11Compliance }, + { "green4", 0, 139, 0, 1, X11Compliance }, + { "GreenYellow", 173, 255, 47, 1, X11Compliance | XPMCompliance }, + { "grey", 190, 190, 190, 1, SVGCompliance | X11Compliance }, + { "grey0", 0, 0, 0, 1, SVGCompliance | X11Compliance }, + { "grey1", 3, 3, 3, 1, SVGCompliance | X11Compliance }, + { "grey10", 26, 26, 26, 1, SVGCompliance | X11Compliance }, + { "grey100", 255, 255, 255, 1, SVGCompliance | X11Compliance }, + { "grey11", 28, 28, 28, 1, SVGCompliance | X11Compliance }, + { "grey12", 31, 31, 31, 1, SVGCompliance | X11Compliance }, + { "grey13", 33, 33, 33, 1, SVGCompliance | X11Compliance }, + { "grey14", 36, 36, 36, 1, SVGCompliance | X11Compliance }, + { "grey15", 38, 38, 38, 1, SVGCompliance | X11Compliance }, + { "grey16", 41, 41, 41, 1, SVGCompliance | X11Compliance }, + { "grey17", 43, 43, 43, 1, SVGCompliance | X11Compliance }, + { "grey18", 46, 46, 46, 1, SVGCompliance | X11Compliance }, + { "grey19", 48, 48, 48, 1, SVGCompliance | X11Compliance }, + { "grey2", 5, 5, 5, 1, SVGCompliance | X11Compliance }, + { "grey20", 51, 51, 51, 1, SVGCompliance | X11Compliance }, + { "grey21", 54, 54, 54, 1, SVGCompliance | X11Compliance }, + { "grey22", 56, 56, 56, 1, SVGCompliance | X11Compliance }, + { "grey23", 59, 59, 59, 1, SVGCompliance | X11Compliance }, + { "grey24", 61, 61, 61, 1, SVGCompliance | X11Compliance }, + { "grey25", 64, 64, 64, 1, SVGCompliance | X11Compliance }, + { "grey26", 66, 66, 66, 1, SVGCompliance | X11Compliance }, + { "grey27", 69, 69, 69, 1, SVGCompliance | X11Compliance }, + { "grey28", 71, 71, 71, 1, SVGCompliance | X11Compliance }, + { "grey29", 74, 74, 74, 1, SVGCompliance | X11Compliance }, + { "grey3", 8, 8, 8, 1, SVGCompliance | X11Compliance }, + { "grey30", 77, 77, 77, 1, SVGCompliance | X11Compliance }, + { "grey31", 79, 79, 79, 1, SVGCompliance | X11Compliance }, + { "grey32", 82, 82, 82, 1, SVGCompliance | X11Compliance }, + { "grey33", 84, 84, 84, 1, SVGCompliance | X11Compliance }, + { "grey34", 87, 87, 87, 1, SVGCompliance | X11Compliance }, + { "grey35", 89, 89, 89, 1, SVGCompliance | X11Compliance }, + { "grey36", 92, 92, 92, 1, SVGCompliance | X11Compliance }, + { "grey37", 94, 94, 94, 1, SVGCompliance | X11Compliance }, + { "grey38", 97, 97, 97, 1, SVGCompliance | X11Compliance }, + { "grey39", 99, 99, 99, 1, SVGCompliance | X11Compliance }, + { "grey4", 10, 10, 10, 1, SVGCompliance | X11Compliance }, + { "grey40", 102, 102, 102, 1, SVGCompliance | X11Compliance }, + { "grey41", 105, 105, 105, 1, SVGCompliance | X11Compliance }, + { "grey42", 107, 107, 107, 1, SVGCompliance | X11Compliance }, + { "grey43", 110, 110, 110, 1, SVGCompliance | X11Compliance }, + { "grey44", 112, 112, 112, 1, SVGCompliance | X11Compliance }, + { "grey45", 115, 115, 115, 1, SVGCompliance | X11Compliance }, + { "grey46", 117, 117, 117, 1, SVGCompliance | X11Compliance }, + { "grey47", 120, 120, 120, 1, SVGCompliance | X11Compliance }, + { "grey48", 122, 122, 122, 1, SVGCompliance | X11Compliance }, + { "grey49", 125, 125, 125, 1, SVGCompliance | X11Compliance }, + { "grey5", 13, 13, 13, 1, SVGCompliance | X11Compliance }, + { "grey50", 127, 127, 127, 1, SVGCompliance | X11Compliance }, + { "grey51", 130, 130, 130, 1, SVGCompliance | X11Compliance }, + { "grey52", 133, 133, 133, 1, SVGCompliance | X11Compliance }, + { "grey53", 135, 135, 135, 1, SVGCompliance | X11Compliance }, + { "grey54", 138, 138, 138, 1, SVGCompliance | X11Compliance }, + { "grey55", 140, 140, 140, 1, SVGCompliance | X11Compliance }, + { "grey56", 143, 143, 143, 1, SVGCompliance | X11Compliance }, + { "grey57", 145, 145, 145, 1, SVGCompliance | X11Compliance }, + { "grey58", 148, 148, 148, 1, SVGCompliance | X11Compliance }, + { "grey59", 150, 150, 150, 1, SVGCompliance | X11Compliance }, + { "grey6", 15, 15, 15, 1, SVGCompliance | X11Compliance }, + { "grey60", 153, 153, 153, 1, SVGCompliance | X11Compliance }, + { "grey61", 156, 156, 156, 1, SVGCompliance | X11Compliance }, + { "grey62", 158, 158, 158, 1, SVGCompliance | X11Compliance }, + { "grey63", 161, 161, 161, 1, SVGCompliance | X11Compliance }, + { "grey64", 163, 163, 163, 1, SVGCompliance | X11Compliance }, + { "grey65", 166, 166, 166, 1, SVGCompliance | X11Compliance }, + { "grey66", 168, 168, 168, 1, SVGCompliance | X11Compliance }, + { "grey67", 171, 171, 171, 1, SVGCompliance | X11Compliance }, + { "grey68", 173, 173, 173, 1, SVGCompliance | X11Compliance }, + { "grey69", 176, 176, 176, 1, SVGCompliance | X11Compliance }, + { "grey7", 18, 18, 18, 1, SVGCompliance | X11Compliance }, + { "grey70", 179, 179, 179, 1, SVGCompliance | X11Compliance }, + { "grey71", 181, 181, 181, 1, SVGCompliance | X11Compliance }, + { "grey72", 184, 184, 184, 1, SVGCompliance | X11Compliance }, + { "grey73", 186, 186, 186, 1, SVGCompliance | X11Compliance }, + { "grey74", 189, 189, 189, 1, SVGCompliance | X11Compliance }, + { "grey75", 191, 191, 191, 1, SVGCompliance | X11Compliance }, + { "grey76", 194, 194, 194, 1, SVGCompliance | X11Compliance }, + { "grey77", 196, 196, 196, 1, SVGCompliance | X11Compliance }, + { "grey78", 199, 199, 199, 1, SVGCompliance | X11Compliance }, + { "grey79", 201, 201, 201, 1, SVGCompliance | X11Compliance }, + { "grey8", 20, 20, 20, 1, SVGCompliance | X11Compliance }, + { "grey80", 204, 204, 204, 1, SVGCompliance | X11Compliance }, + { "grey81", 207, 207, 207, 1, SVGCompliance | X11Compliance }, + { "grey82", 209, 209, 209, 1, SVGCompliance | X11Compliance }, + { "grey83", 212, 212, 212, 1, SVGCompliance | X11Compliance }, + { "grey84", 214, 214, 214, 1, SVGCompliance | X11Compliance }, + { "grey85", 217, 217, 217, 1, SVGCompliance | X11Compliance }, + { "grey86", 219, 219, 219, 1, SVGCompliance | X11Compliance }, + { "grey87", 222, 222, 222, 1, SVGCompliance | X11Compliance }, + { "grey88", 224, 224, 224, 1, SVGCompliance | X11Compliance }, + { "grey89", 227, 227, 227, 1, SVGCompliance | X11Compliance }, + { "grey9", 23, 23, 23, 1, SVGCompliance | X11Compliance }, + { "grey90", 229, 229, 229, 1, SVGCompliance | X11Compliance }, + { "grey91", 232, 232, 232, 1, SVGCompliance | X11Compliance }, + { "grey92", 235, 235, 235, 1, SVGCompliance | X11Compliance }, + { "grey93", 237, 237, 237, 1, SVGCompliance | X11Compliance }, + { "grey94", 240, 240, 240, 1, SVGCompliance | X11Compliance }, + { "grey95", 242, 242, 242, 1, SVGCompliance | X11Compliance }, + { "grey96", 245, 245, 245, 1, SVGCompliance | X11Compliance }, + { "grey97", 247, 247, 247, 1, SVGCompliance | X11Compliance }, + { "grey98", 250, 250, 250, 1, SVGCompliance | X11Compliance }, + { "grey99", 252, 252, 252, 1, SVGCompliance | X11Compliance }, + { "honeydew", 240, 255, 240, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "honeydew1", 240, 255, 240, 1, X11Compliance }, + { "honeydew2", 224, 238, 224, 1, X11Compliance }, + { "honeydew3", 193, 205, 193, 1, X11Compliance }, + { "honeydew4", 131, 139, 131, 1, X11Compliance }, + { "HotPink", 255, 105, 180, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "HotPink1", 255, 110, 180, 1, X11Compliance }, + { "HotPink2", 238, 106, 167, 1, X11Compliance }, + { "HotPink3", 205, 96, 144, 1, X11Compliance }, + { "HotPink4", 139, 58, 98, 1, X11Compliance }, + { "IndianRed", 205, 92, 92, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "IndianRed1", 255, 106, 106, 1, X11Compliance }, + { "IndianRed2", 238, 99, 99, 1, X11Compliance }, + { "IndianRed3", 205, 85, 85, 1, X11Compliance }, + { "IndianRed4", 139, 58, 58, 1, X11Compliance }, + { "indigo", 75, 0, 130, 1, SVGCompliance }, + { "ivory", 255, 255, 240, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "ivory1", 255, 255, 240, 1, X11Compliance }, + { "ivory2", 238, 238, 224, 1, X11Compliance }, + { "ivory3", 205, 205, 193, 1, X11Compliance }, + { "ivory4", 139, 139, 131, 1, X11Compliance }, + { "khaki", 240, 230, 140, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "khaki1", 255, 246, 143, 1, X11Compliance }, + { "khaki2", 238, 230, 133, 1, X11Compliance }, + { "khaki3", 205, 198, 115, 1, X11Compliance }, + { "khaki4", 139, 134, 78, 1, X11Compliance }, + { "lavender", 230, 230, 250, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LavenderBlush", 255, 240, 245, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LavenderBlush1", 255, 240, 245, 1, X11Compliance }, + { "LavenderBlush2", 238, 224, 229, 1, X11Compliance }, + { "LavenderBlush3", 205, 193, 197, 1, X11Compliance }, + { "LavenderBlush4", 139, 131, 134, 1, X11Compliance }, + { "LawnGreen", 124, 252, 0, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LemonChiffon", 255, 250, 205, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LemonChiffon1", 255, 250, 205, 1, X11Compliance }, + { "LemonChiffon2", 238, 233, 191, 1, X11Compliance }, + { "LemonChiffon3", 205, 201, 165, 1, X11Compliance }, + { "LemonChiffon4", 139, 137, 112, 1, X11Compliance }, + { "LightBlue", 173, 216, 230, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LightBlue1", 191, 239, 255, 1, X11Compliance }, + { "LightBlue2", 178, 223, 238, 1, X11Compliance }, + { "LightBlue3", 154, 192, 205, 1, X11Compliance }, + { "LightBlue4", 104, 131, 139, 1, X11Compliance }, + { "LightCoral", 240, 128, 128, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LightCyan", 224, 255, 255, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LightCyan1", 224, 255, 255, 1, X11Compliance }, + { "LightCyan2", 209, 238, 238, 1, X11Compliance }, + { "LightCyan3", 180, 205, 205, 1, X11Compliance }, + { "LightCyan4", 122, 139, 139, 1, X11Compliance }, + { "LightGoldenrod", 238, 221, 130, 1, X11Compliance | XPMCompliance }, + { "LightGoldenrod1", 255, 236, 139, 1, X11Compliance }, + { "LightGoldenrod2", 238, 220, 130, 1, X11Compliance }, + { "LightGoldenrod3", 205, 190, 112, 1, X11Compliance }, + { "LightGoldenrod4", 139, 129, 76, 1, X11Compliance }, + { "LightGoldenrodYellow", 250, 250, 210, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LightGray", 211, 211, 211, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LightGreen", 144, 238, 144, 1, SVGCompliance | X11Compliance }, + { "LightGrey", 211, 211, 211, 1, SVGCompliance | X11Compliance }, + { "LightPink", 255, 182, 193, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LightPink1", 255, 174, 185, 1, X11Compliance }, + { "LightPink2", 238, 162, 173, 1, X11Compliance }, + { "LightPink3", 205, 140, 149, 1, X11Compliance }, + { "LightPink4", 139, 95, 101, 1, X11Compliance }, + { "LightSalmon", 255, 160, 122, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LightSalmon1", 255, 160, 122, 1, X11Compliance }, + { "LightSalmon2", 238, 149, 114, 1, X11Compliance }, + { "LightSalmon3", 205, 129, 98, 1, X11Compliance }, + { "LightSalmon4", 139, 87, 66, 1, X11Compliance }, + { "LightSeaGreen", 32, 178, 170, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LightSkyBlue", 135, 206, 250, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LightSkyBlue1", 176, 226, 255, 1, X11Compliance }, + { "LightSkyBlue2", 164, 211, 238, 1, X11Compliance }, + { "LightSkyBlue3", 141, 182, 205, 1, X11Compliance }, + { "LightSkyBlue4", 96, 123, 139, 1, X11Compliance }, + { "LightSlateBlue", 132, 112, 255, 1, X11Compliance | XPMCompliance }, + { "LightSlateGray", 119, 136, 153, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LightSlateGrey", 119, 136, 153, 1, SVGCompliance | X11Compliance }, + { "LightSteelBlue", 176, 196, 222, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LightSteelBlue1", 202, 225, 255, 1, X11Compliance }, + { "LightSteelBlue2", 188, 210, 238, 1, X11Compliance }, + { "LightSteelBlue3", 162, 181, 205, 1, X11Compliance }, + { "LightSteelBlue4", 110, 123, 139, 1, X11Compliance }, + { "LightYellow", 255, 255, 224, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "LightYellow1", 255, 255, 224, 1, X11Compliance }, + { "LightYellow2", 238, 238, 209, 1, X11Compliance }, + { "LightYellow3", 205, 205, 180, 1, X11Compliance }, + { "LightYellow4", 139, 139, 122, 1, X11Compliance }, + { "lime", 0, 255, 0, 1, SVGCompliance }, + { "LimeGreen", 50, 205, 50, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "linen", 250, 240, 230, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "magenta1", 255, 0, 255, 1, X11Compliance }, + { "magenta2", 238, 0, 238, 1, X11Compliance }, + { "magenta3", 205, 0, 205, 1, X11Compliance }, + { "magenta4", 139, 0, 139, 1, X11Compliance }, + { "maroon", 128, 0, 0, 1, SVGCompliance }, + { "maroon", 176, 48, 96, 1, X11Compliance | XPMCompliance }, + { "maroon1", 255, 52, 179, 1, X11Compliance }, + { "maroon2", 238, 48, 167, 1, X11Compliance }, + { "maroon3", 205, 41, 144, 1, X11Compliance }, + { "maroon4", 139, 28, 98, 1, X11Compliance }, + { "MediumAquamarine", 102, 205, 170, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "MediumBlue", 0, 0, 205, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "MediumForestGreen", 50, 129, 75, 1, X11Compliance | XPMCompliance }, + { "MediumGoldenRod", 209, 193, 102, 1, X11Compliance | XPMCompliance }, + { "MediumOrchid", 186, 85, 211, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "MediumOrchid1", 224, 102, 255, 1, X11Compliance }, + { "MediumOrchid2", 209, 95, 238, 1, X11Compliance }, + { "MediumOrchid3", 180, 82, 205, 1, X11Compliance }, + { "MediumOrchid4", 122, 55, 139, 1, X11Compliance }, + { "MediumPurple", 147, 112, 219, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "MediumPurple1", 171, 130, 255, 1, X11Compliance }, + { "MediumPurple2", 159, 121, 238, 1, X11Compliance }, + { "MediumPurple3", 137, 104, 205, 1, X11Compliance }, + { "MediumPurple4", 93, 71, 139, 1, X11Compliance }, + { "MediumSeaGreen", 60, 179, 113, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "MediumSlateBlue", 123, 104, 238, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "MediumSpringGreen", 0, 250, 154, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "MediumTurquoise", 72, 209, 204, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "MediumVioletRed", 199, 21, 133, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "MidnightBlue", 25, 25, 112, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "MintCream", 245, 255, 250, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "MistyRose", 255, 228, 225, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "MistyRose1", 255, 228, 225, 1, X11Compliance }, + { "MistyRose2", 238, 213, 210, 1, X11Compliance }, + { "MistyRose3", 205, 183, 181, 1, X11Compliance }, + { "MistyRose4", 139, 125, 123, 1, X11Compliance }, + { "moccasin", 255, 228, 181, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "NavajoWhite", 255, 222, 173, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "NavajoWhite1", 255, 222, 173, 1, X11Compliance }, + { "NavajoWhite2", 238, 207, 161, 1, X11Compliance }, + { "NavajoWhite3", 205, 179, 139, 1, X11Compliance }, + { "NavajoWhite4", 139, 121, 94, 1, X11Compliance }, + { "navy", 0, 0, 128, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "NavyBlue", 0, 0, 128, 1, X11Compliance | XPMCompliance }, + { "matte", 0, 0, 0, 0, SVGCompliance }, + { "OldLace", 253, 245, 230, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "olive", 128, 128, 0, 1, SVGCompliance }, + { "OliveDrab", 107, 142, 35, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "OliveDrab1", 192, 255, 62, 1, X11Compliance }, + { "OliveDrab2", 179, 238, 58, 1, X11Compliance }, + { "OliveDrab3", 154, 205, 50, 1, X11Compliance }, + { "OliveDrab4", 105, 139, 34, 1, X11Compliance }, + { "opaque", 0, 0, 0, 1, SVGCompliance }, + { "orange", 255, 165, 0, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "orange1", 255, 165, 0, 1, X11Compliance }, + { "orange2", 238, 154, 0, 1, X11Compliance }, + { "orange3", 205, 133, 0, 1, X11Compliance }, + { "orange4", 139, 90, 0, 1, X11Compliance }, + { "OrangeRed", 255, 69, 0, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "OrangeRed1", 255, 69, 0, 1, X11Compliance }, + { "OrangeRed2", 238, 64, 0, 1, X11Compliance }, + { "OrangeRed3", 205, 55, 0, 1, X11Compliance }, + { "OrangeRed4", 139, 37, 0, 1, X11Compliance }, + { "orchid", 218, 112, 214, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "orchid1", 255, 131, 250, 1, X11Compliance }, + { "orchid2", 238, 122, 233, 1, X11Compliance }, + { "orchid3", 205, 105, 201, 1, X11Compliance }, + { "orchid4", 139, 71, 137, 1, X11Compliance }, + { "PaleGoldenrod", 238, 232, 170, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "PaleGreen", 152, 251, 152, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "PaleGreen1", 154, 255, 154, 1, X11Compliance }, + { "PaleGreen2", 144, 238, 144, 1, X11Compliance }, + { "PaleGreen3", 124, 205, 124, 1, X11Compliance }, + { "PaleGreen4", 84, 139, 84, 1, X11Compliance }, + { "PaleTurquoise", 175, 238, 238, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "PaleTurquoise1", 187, 255, 255, 1, X11Compliance }, + { "PaleTurquoise2", 174, 238, 238, 1, X11Compliance }, + { "PaleTurquoise3", 150, 205, 205, 1, X11Compliance }, + { "PaleTurquoise4", 102, 139, 139, 1, X11Compliance }, + { "PaleVioletRed", 219, 112, 147, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "PaleVioletRed1", 255, 130, 171, 1, X11Compliance }, + { "PaleVioletRed2", 238, 121, 159, 1, X11Compliance }, + { "PaleVioletRed3", 205, 104, 137, 1, X11Compliance }, + { "PaleVioletRed4", 139, 71, 93, 1, X11Compliance }, + { "PapayaWhip", 255, 239, 213, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "PeachPuff", 255, 218, 185, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "PeachPuff1", 255, 218, 185, 1, X11Compliance }, + { "PeachPuff2", 238, 203, 173, 1, X11Compliance }, + { "PeachPuff3", 205, 175, 149, 1, X11Compliance }, + { "PeachPuff4", 139, 119, 101, 1, X11Compliance }, + { "peru", 205, 133, 63, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "pink", 255, 192, 203, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "pink1", 255, 181, 197, 1, X11Compliance }, + { "pink2", 238, 169, 184, 1, X11Compliance }, + { "pink3", 205, 145, 158, 1, X11Compliance }, + { "pink4", 139, 99, 108, 1, X11Compliance }, + { "plum", 221, 160, 221, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "plum1", 255, 187, 255, 1, X11Compliance }, + { "plum2", 238, 174, 238, 1, X11Compliance }, + { "plum3", 205, 150, 205, 1, X11Compliance }, + { "plum4", 139, 102, 139, 1, X11Compliance }, + { "PowderBlue", 176, 224, 230, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "purple", 128, 0, 128, 1, SVGCompliance }, + { "purple", 160, 32, 240, 1, X11Compliance | XPMCompliance }, + { "purple1", 155, 48, 255, 1, X11Compliance }, + { "purple2", 145, 44, 238, 1, X11Compliance }, + { "purple3", 125, 38, 205, 1, X11Compliance }, + { "purple4", 85, 26, 139, 1, X11Compliance }, + { "red1", 255, 0, 0, 1, X11Compliance }, + { "red2", 238, 0, 0, 1, X11Compliance }, + { "red3", 205, 0, 0, 1, X11Compliance }, + { "red4", 139, 0, 0, 1, X11Compliance }, + { "RosyBrown", 188, 143, 143, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "RosyBrown1", 255, 193, 193, 1, X11Compliance }, + { "RosyBrown2", 238, 180, 180, 1, X11Compliance }, + { "RosyBrown3", 205, 155, 155, 1, X11Compliance }, + { "RosyBrown4", 139, 105, 105, 1, X11Compliance }, + { "RoyalBlue", 65, 105, 225, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "RoyalBlue1", 72, 118, 255, 1, X11Compliance }, + { "RoyalBlue2", 67, 110, 238, 1, X11Compliance }, + { "RoyalBlue3", 58, 95, 205, 1, X11Compliance }, + { "RoyalBlue4", 39, 64, 139, 1, X11Compliance }, + { "SaddleBrown", 139, 69, 19, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "salmon", 250, 128, 114, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "salmon1", 255, 140, 105, 1, X11Compliance }, + { "salmon2", 238, 130, 98, 1, X11Compliance }, + { "salmon3", 205, 112, 84, 1, X11Compliance }, + { "salmon4", 139, 76, 57, 1, X11Compliance }, + { "SandyBrown", 244, 164, 96, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "SeaGreen", 46, 139, 87, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "SeaGreen1", 84, 255, 159, 1, X11Compliance }, + { "SeaGreen2", 78, 238, 148, 1, X11Compliance }, + { "SeaGreen3", 67, 205, 128, 1, X11Compliance }, + { "SeaGreen4", 46, 139, 87, 1, X11Compliance }, + { "seashell", 255, 245, 238, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "seashell1", 255, 245, 238, 1, X11Compliance }, + { "seashell2", 238, 229, 222, 1, X11Compliance }, + { "seashell3", 205, 197, 191, 1, X11Compliance }, + { "seashell4", 139, 134, 130, 1, X11Compliance }, + { "sienna", 160, 82, 45, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "sienna1", 255, 130, 71, 1, X11Compliance }, + { "sienna2", 238, 121, 66, 1, X11Compliance }, + { "sienna3", 205, 104, 57, 1, X11Compliance }, + { "sienna4", 139, 71, 38, 1, X11Compliance }, + { "silver", 192, 192, 192, 1, SVGCompliance }, + { "SkyBlue", 135, 206, 235, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "SkyBlue1", 135, 206, 255, 1, X11Compliance }, + { "SkyBlue2", 126, 192, 238, 1, X11Compliance }, + { "SkyBlue3", 108, 166, 205, 1, X11Compliance }, + { "SkyBlue4", 74, 112, 139, 1, X11Compliance }, + { "SlateBlue", 106, 90, 205, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "SlateBlue1", 131, 111, 255, 1, X11Compliance }, + { "SlateBlue2", 122, 103, 238, 1, X11Compliance }, + { "SlateBlue3", 105, 89, 205, 1, X11Compliance }, + { "SlateBlue4", 71, 60, 139, 1, X11Compliance }, + { "SlateGray", 112, 128, 144, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "SlateGray1", 198, 226, 255, 1, X11Compliance }, + { "SlateGray2", 185, 211, 238, 1, X11Compliance }, + { "SlateGray3", 159, 182, 205, 1, X11Compliance }, + { "SlateGray4", 108, 123, 139, 1, X11Compliance }, + { "SlateGrey", 112, 128, 144, 1, SVGCompliance | X11Compliance }, + { "snow", 255, 250, 250, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "snow1", 255, 250, 250, 1, X11Compliance }, + { "snow2", 238, 233, 233, 1, X11Compliance }, + { "snow3", 205, 201, 201, 1, X11Compliance }, + { "snow4", 139, 137, 137, 1, X11Compliance }, + { "SpringGreen", 0, 255, 127, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "SpringGreen1", 0, 255, 127, 1, X11Compliance }, + { "SpringGreen2", 0, 238, 118, 1, X11Compliance }, + { "SpringGreen3", 0, 205, 102, 1, X11Compliance }, + { "SpringGreen4", 0, 139, 69, 1, X11Compliance }, + { "SteelBlue", 70, 130, 180, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "SteelBlue1", 99, 184, 255, 1, X11Compliance }, + { "SteelBlue2", 92, 172, 238, 1, X11Compliance }, + { "SteelBlue3", 79, 148, 205, 1, X11Compliance }, + { "SteelBlue4", 54, 100, 139, 1, X11Compliance }, + { "tan", 210, 180, 140, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "tan1", 255, 165, 79, 1, X11Compliance }, + { "tan2", 238, 154, 73, 1, X11Compliance }, + { "tan3", 205, 133, 63, 1, X11Compliance }, + { "tan4", 139, 90, 43, 1, X11Compliance }, + { "teal", 0, 128, 128, 1, SVGCompliance }, + { "thistle", 216, 191, 216, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "thistle1", 255, 225, 255, 1, X11Compliance }, + { "thistle2", 238, 210, 238, 1, X11Compliance }, + { "thistle3", 205, 181, 205, 1, X11Compliance }, + { "thistle4", 139, 123, 139, 1, X11Compliance }, + { "tomato", 255, 99, 71, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "tomato1", 255, 99, 71, 1, X11Compliance }, + { "tomato2", 238, 92, 66, 1, X11Compliance }, + { "tomato3", 205, 79, 57, 1, X11Compliance }, + { "tomato4", 139, 54, 38, 1, X11Compliance }, + { "transparent", 0, 0, 0, 0, SVGCompliance }, + { "turquoise", 64, 224, 208, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "turquoise1", 0, 245, 255, 1, X11Compliance }, + { "turquoise2", 0, 229, 238, 1, X11Compliance }, + { "turquoise3", 0, 197, 205, 1, X11Compliance }, + { "turquoise4", 0, 134, 139, 1, X11Compliance }, + { "violet", 238, 130, 238, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "VioletRed", 208, 32, 144, 1, X11Compliance | XPMCompliance }, + { "VioletRed1", 255, 62, 150, 1, X11Compliance }, + { "VioletRed2", 238, 58, 140, 1, X11Compliance }, + { "VioletRed3", 205, 50, 120, 1, X11Compliance }, + { "VioletRed4", 139, 34, 82, 1, X11Compliance }, + { "wheat", 245, 222, 179, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "wheat1", 255, 231, 186, 1, X11Compliance }, + { "wheat2", 238, 216, 174, 1, X11Compliance }, + { "wheat3", 205, 186, 150, 1, X11Compliance }, + { "wheat4", 139, 126, 102, 1, X11Compliance }, + { "WhiteSmoke", 245, 245, 245, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { "yellow1", 255, 255, 0, 1, X11Compliance }, + { "yellow2", 238, 238, 0, 1, X11Compliance }, + { "yellow3", 205, 205, 0, 1, X11Compliance }, + { "yellow4", 139, 139, 0, 1, X11Compliance }, + { "YellowGreen", 154, 205, 50, 1, SVGCompliance | X11Compliance | XPMCompliance }, + { (const char *) NULL, 0, 0, 0, 0, UndefinedCompliance } + }; /* Static declarations. @@ -487,10 +928,13 @@ static void *DestroyColorElement(void *color_info) *p; p=(ColorInfo *) color_info; - if (p->path != (char *) NULL) - p->path=DestroyString(p->path); - if (p->name != (char *) NULL) - p->name=DestroyString(p->name); + if (p->exempt == MagickFalse) + { + if (p->path != (char *) NULL) + p->path=DestroyString(p->path); + if (p->name != (char *) NULL) + p->name=DestroyString(p->name); + } p=(ColorInfo *) RelinquishMagickMemory(p); return((void *) NULL); } @@ -1558,6 +2002,7 @@ static MagickBooleanType LoadColorList(const char *xml,const char *filename, ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); (void) ResetMagickMemory(color_info,0,sizeof(*color_info)); color_info->path=ConstantString(filename); + color_info->exempt=MagickFalse; color_info->signature=MagickSignature; continue; } @@ -1670,10 +2115,62 @@ static MagickBooleanType LoadColorLists(const char *filename, LinkedListInfo *options; + MagickRealType + scale; + MagickStatusType status; + register const ColorMapInfo + *p; + + /* + Load built-in color map. + */ status=MagickFalse; + if (color_list == (LinkedListInfo *) NULL) + { + color_list=NewLinkedList(0); + if (color_list == (LinkedListInfo *) NULL) + { + ThrowFileException(exception,ResourceLimitError, + "MemoryAllocationFailed",filename); + return(MagickFalse); + } + } + scale=(MagickRealType) ScaleCharToQuantum(1); + for (p=ColorMap; p->name != (const char *) NULL; p++) + { + ColorInfo + *color_info; + + color_info=(ColorInfo *) AcquireMagickMemory(sizeof(*color_info)); + if (color_info == (ColorInfo *) NULL) + { + (void) ThrowMagickException(exception,GetMagickModule(), + ResourceLimitError,"MemoryAllocationFailed","`%s'",color_info->name); + continue; + } + (void) ResetMagickMemory(color_info,0,sizeof(*color_info)); + color_info->path="[built-in]"; + color_info->name=(char *) p->name; + GetMagickPixelPacket((Image *) NULL,&color_info->color); + color_info->color.red=scale*p->red; + color_info->color.green=scale*p->green; + color_info->color.blue=scale*p->blue; + color_info->color.opacity=(MagickRealType) (QuantumRange-QuantumRange* + p->alpha); + color_info->compliance=p->compliance; + color_info->exempt=MagickTrue; + color_info->signature=MagickSignature; + status=AppendValueToLinkedList(color_list,color_info); + if (status == MagickFalse) + (void) ThrowMagickException(exception,GetMagickModule(), + ResourceLimitError,"MemoryAllocationFailed","`%s'",color_info->name); + } + /* + Load external color map. + */ options=GetConfigureOptions(filename,exception); option=(const StringInfo *) GetNextValueInLinkedList(options); while (option != (const StringInfo *) NULL) @@ -1683,9 +2180,6 @@ static MagickBooleanType LoadColorLists(const char *filename, option=(const StringInfo *) GetNextValueInLinkedList(options); } options=DestroyConfigureOptions(options); - if ((color_list == (LinkedListInfo *) NULL) || - (IsLinkedListEmpty(color_list) != MagickFalse)) - status|=LoadColorList(ColorMap,"built-in",0,exception); return(status != 0 ? MagickTrue : MagickFalse); #endif } diff --git a/magick/color.h b/magick/color.h index 5ea63bafc..de8a005f4 100644 --- a/magick/color.h +++ b/magick/color.h @@ -48,6 +48,7 @@ typedef struct _ColorInfo color; MagickBooleanType + exempt, stealth; struct _ColorInfo diff --git a/magick/magic.c b/magick/magic.c index d3dd5f463..3300abb53 100644 --- a/magick/magic.c +++ b/magick/magic.c @@ -66,131 +66,130 @@ typedef struct _MagicMapInfo const char *name; + const MagickOffsetType + offset; + const unsigned char *magic; - size_t + const size_t length; - - MagickOffsetType - offset; } MagicMapInfo; -#define MagicTransform(name,offset,magic) \ - { name, (const unsigned char *) magic, sizeof(magic)-1, offset } +#define MagickString(magic) (const unsigned char *) (magic), sizeof(magic)-1 static const MagicMapInfo MagicMap[] = { - MagicTransform("AVI", 0, "RIFF"), - MagicTransform("8BIMWTEXT", 0, "8\000B\000I\000M\000#"), - MagicTransform("8BIMTEXT", 0, "8BIM#"), - MagicTransform("8BIM", 0, "8BIM"), - MagicTransform("BMP", 0, "BA"), - MagicTransform("BMP", 0, "BM"), - MagicTransform("BMP", 0, "CI"), - MagicTransform("BMP", 0, "CP"), - MagicTransform("BMP", 0, "IC"), - MagicTransform("BMP", 0, "PI"), - MagicTransform("CALS", 21, "version: MIL-STD-1840"), - MagicTransform("CALS", 0, "srcdocid:"), - MagicTransform("CALS", 9, "srcdocid:"), - MagicTransform("CALS", 8, "rorient:"), - MagicTransform("CGM", 0, "BEGMF"), - MagicTransform("CIN", 0, "\200\052\137\327"), - MagicTransform("CRW", 0, "II\x1a\x00\x00\x00HEAPCCDR"), - MagicTransform("DCM", 128, "DICM"), - MagicTransform("DCX", 0, "\261\150\336\72"), - MagicTransform("DIB", 0, "\050\000"), - MagicTransform("DDS", 0, "DDS "), - MagicTransform("DJVU", 0, "AT&TFORM"), - MagicTransform("DOT", 0, "digraph"), - MagicTransform("DPX", 0, "SDPX"), - MagicTransform("DPX", 0, "XPDS"), - MagicTransform("EMF", 40, "\040\105\115\106\000\000\001\000"), - MagicTransform("EPT", 0, "\305\320\323\306"), - MagicTransform("EXR", 0, "\166\057\061\001"), - MagicTransform("FAX", 0, "DFAX"), - MagicTransform("FIG", 0, "#FIG"), - MagicTransform("FITS", 0, "IT0"), - MagicTransform("FITS", 0, "SIMPLE"), - MagicTransform("FPX", 0, "\320\317\021\340"), - MagicTransform("GIF", 0, "GIF8"), - MagicTransform("GPLT", 0, "#!/usr/local/bin/gnuplot"), - MagicTransform("HDF", 1, "HDF"), - MagicTransform("HPGL", 0, "IN;"), - MagicTransform("HPGL", 0, "\033E\033"), - MagicTransform("HTML", 1, "HTML"), - MagicTransform("HTML", 1, "html"), - MagicTransform("ILBM", 8, "ILBM"), - MagicTransform("IPTCWTEXT", 0, "\062\000#\000\060\000=\000\042\000&\000#\000\060\000;\000&\000#\000\062\000;\000\042\000"), - MagicTransform("IPTCTEXT", 0, "2#0=\042�\042"), - MagicTransform("IPTC", 0, "\034\002"), - MagicTransform("JNG", 0, "\213JNG\r\n\032\n"), - MagicTransform("JPEG", 0, "\377\330\377"), - MagicTransform("JPC", 0, "\377\117"), - MagicTransform("JP2", 4, "\152\120\040\040\015"), - MagicTransform("MIFF", 0, "Id=ImageMagick"), - MagicTransform("MIFF", 0, "id=ImageMagick"), - MagicTransform("MNG", 0, "\212MNG\r\n\032\n"), - MagicTransform("MPC", 0, "id=MagickCache"), - MagicTransform("MPEG", 0, "\000\000\001\263"), - MagicTransform("MRW", 0, "\x00MRM"), - MagicTransform("MVG", 0, "push graphic-context"), - MagicTransform("ORF", 0, "IIRO\x08\x00\x00\x00"), - MagicTransform("PCD", 2048, "PCD_"), - MagicTransform("PCL", 0, "\033E\033"), - MagicTransform("PCX", 0, "\012\002"), - MagicTransform("PCX", 0, "\012\005"), - MagicTransform("PDB", 60, "vIMGView"), - MagicTransform("PDF", 0, "%PDF-"), - MagicTransform("PFA", 0, "%!PS-AdobeFont-1.0"), - MagicTransform("PFB", 6, "%!PS-AdobeFont-1.0"), - MagicTransform("PGX", 0, "\050\107\020\115\046"), - MagicTransform("PICT", 522, "\000\021\002\377\014\000"), - MagicTransform("PNG", 0, "\211PNG\r\n\032\n"), - MagicTransform("PNM", 0, "P1"), - MagicTransform("PNM", 0, "P2"), - MagicTransform("PNM", 0, "P3"), - MagicTransform("PNM", 0, "P4"), - MagicTransform("PNM", 0, "P5"), - MagicTransform("PNM", 0, "P6"), - MagicTransform("PNM", 0, "P7"), - MagicTransform("PNM", 0, "PF"), - MagicTransform("PNM", 0, "Pf"), - MagicTransform("PS", 0, "%!"), - MagicTransform("PS", 0, "\004%!"), - MagicTransform("PS", 0, "\305\320\323\306"), - MagicTransform("PSD", 0, "8BPS"), - MagicTransform("PWP", 0, "SFW95"), - MagicTransform("RAF", 0, "FUJIFILMCCD-RAW "), - MagicTransform("RAD", 0, "#?RADIANCE"), - MagicTransform("RAD", 0, "VIEW= "), - MagicTransform("RLE", 0, "\122\314"), - MagicTransform("SCT", 0, "CT"), - MagicTransform("SFW", 0, "SFW94"), - MagicTransform("SGI", 0, "\001\332"), - MagicTransform("SUN", 0, "\131\246\152\225"), - MagicTransform("SVG", 1, "?XML"), - MagicTransform("SVG", 1, "?xml"), - MagicTransform("TIFF", 0, "\115\115\000\052"), - MagicTransform("TIFF", 0, "\111\111\052\000"), - MagicTransform("TIFF64", 0, "\115\115\000\053\000\010\000\000"), - MagicTransform("TIFF64", 0, "\111\111\053\000\010\000\000\000"), - MagicTransform("TXT", 0, "# ImageMagick pixel enumeration:"), - MagicTransform("VICAR", 0, "LBLSIZE"), - MagicTransform("VICAR", 0, "NJPL1I"), - MagicTransform("VIFF", 0, "\253\001"), - MagicTransform("WMF", 0, "\327\315\306\232"), - MagicTransform("WMF", 0, "\001\000\011\000"), - MagicTransform("WPG", 0, "\377WPC"), - MagicTransform("XBM", 0, "#define"), - MagicTransform("XCF", 0, "gimp xcf"), - MagicTransform("XEF", 0, "FOVb"), - MagicTransform("XPM", 1, "* XPM *"), - MagicTransform("XWD", 4, "\007\000\000"), - MagicTransform("XWD", 5, "\000\000\007"), - MagicTransform((const char *) NULL, 0, (const char *) NULL) + { "AVI", 0, MagickString("RIFF") }, + { "8BIMWTEXT", 0, MagickString("8\000B\000I\000M\000#") }, + { "8BIMTEXT", 0, MagickString("8BIM#") }, + { "8BIM", 0, MagickString("8BIM") }, + { "BMP", 0, MagickString("BA") }, + { "BMP", 0, MagickString("BM") }, + { "BMP", 0, MagickString("CI") }, + { "BMP", 0, MagickString("CP") }, + { "BMP", 0, MagickString("IC") }, + { "BMP", 0, MagickString("PI") }, + { "CALS", 21, MagickString("version: MIL-STD-1840") }, + { "CALS", 0, MagickString("srcdocid:") }, + { "CALS", 9, MagickString("srcdocid:") }, + { "CALS", 8, MagickString("rorient:") }, + { "CGM", 0, MagickString("BEGMF") }, + { "CIN", 0, MagickString("\200\052\137\327") }, + { "CRW", 0, MagickString("II\x1a\x00\x00\x00HEAPCCDR") }, + { "DCM", 128, MagickString("DICM") }, + { "DCX", 0, MagickString("\261\150\336\72") }, + { "DIB", 0, MagickString("\050\000") }, + { "DDS", 0, MagickString("DDS ") }, + { "DJVU", 0, MagickString("AT&TFORM") }, + { "DOT", 0, MagickString("digraph") }, + { "DPX", 0, MagickString("SDPX") }, + { "DPX", 0, MagickString("XPDS") }, + { "EMF", 40, MagickString("\040\105\115\106\000\000\001\000") }, + { "EPT", 0, MagickString("\305\320\323\306") }, + { "EXR", 0, MagickString("\166\057\061\001") }, + { "FAX", 0, MagickString("DFAX") }, + { "FIG", 0, MagickString("#FIG") }, + { "FITS", 0, MagickString("IT0") }, + { "FITS", 0, MagickString("SIMPLE") }, + { "FPX", 0, MagickString("\320\317\021\340") }, + { "GIF", 0, MagickString("GIF8") }, + { "GPLT", 0, MagickString("#!/usr/local/bin/gnuplot") }, + { "HDF", 1, MagickString("HDF") }, + { "HPGL", 0, MagickString("IN;") }, + { "HPGL", 0, MagickString("\033E\033") }, + { "HTML", 1, MagickString("HTML") }, + { "HTML", 1, MagickString("html") }, + { "ILBM", 8, MagickString("ILBM") }, + { "IPTCWTEXT", 0, MagickString("\062\000#\000\060\000=\000\042\000&\000#\000\060\000;\000&\000#\000\062\000;\000\042\000") }, + { "IPTCTEXT", 0, MagickString("2#0=\042�\042") }, + { "IPTC", 0, MagickString("\034\002") }, + { "JNG", 0, MagickString("\213JNG\r\n\032\n") }, + { "JPEG", 0, MagickString("\377\330\377") }, + { "JPC", 0, MagickString("\377\117") }, + { "JP2", 4, MagickString("\152\120\040\040\015") }, + { "MIFF", 0, MagickString("Id=ImageMagick") }, + { "MIFF", 0, MagickString("id=ImageMagick") }, + { "MNG", 0, MagickString("\212MNG\r\n\032\n") }, + { "MPC", 0, MagickString("id=MagickCache") }, + { "MPEG", 0, MagickString("\000\000\001\263") }, + { "MRW", 0, MagickString("\x00MRM") }, + { "MVG", 0, MagickString("push graphic-context") }, + { "ORF", 0, MagickString("IIRO\x08\x00\x00\x00") }, + { "PCD", 2048, MagickString("PCD_") }, + { "PCL", 0, MagickString("\033E\033") }, + { "PCX", 0, MagickString("\012\002") }, + { "PCX", 0, MagickString("\012\005") }, + { "PDB", 60, MagickString("vIMGView") }, + { "PDF", 0, MagickString("%PDF-") }, + { "PFA", 0, MagickString("%!PS-AdobeFont-1.0") }, + { "PFB", 6, MagickString("%!PS-AdobeFont-1.0") }, + { "PGX", 0, MagickString("\050\107\020\115\046") }, + { "PICT", 522, MagickString("\000\021\002\377\014\000") }, + { "PNG", 0, MagickString("\211PNG\r\n\032\n") }, + { "PNM", 0, MagickString("P1") }, + { "PNM", 0, MagickString("P2") }, + { "PNM", 0, MagickString("P3") }, + { "PNM", 0, MagickString("P4") }, + { "PNM", 0, MagickString("P5") }, + { "PNM", 0, MagickString("P6") }, + { "PNM", 0, MagickString("P7") }, + { "PNM", 0, MagickString("PF") }, + { "PNM", 0, MagickString("Pf") }, + { "PS", 0, MagickString("%!") }, + { "PS", 0, MagickString("\004%!") }, + { "PS", 0, MagickString("\305\320\323\306") }, + { "PSD", 0, MagickString("8BPS") }, + { "PWP", 0, MagickString("SFW95") }, + { "RAF", 0, MagickString("FUJIFILMCCD-RAW ") }, + { "RAD", 0, MagickString("#?RADIANCE") }, + { "RAD", 0, MagickString("VIEW= ") }, + { "RLE", 0, MagickString("\122\314") }, + { "SCT", 0, MagickString("CT") }, + { "SFW", 0, MagickString("SFW94") }, + { "SGI", 0, MagickString("\001\332") }, + { "SUN", 0, MagickString("\131\246\152\225") }, + { "SVG", 1, MagickString("?XML") }, + { "SVG", 1, MagickString("?xml") }, + { "TIFF", 0, MagickString("\115\115\000\052") }, + { "TIFF", 0, MagickString("\111\111\052\000") }, + { "TIFF64", 0, MagickString("\115\115\000\053\000\010\000\000") }, + { "TIFF64", 0, MagickString("\111\111\053\000\010\000\000\000") }, + { "TXT", 0, MagickString("# ImageMagick pixel enumeration:") }, + { "VICAR", 0, MagickString("LBLSIZE") }, + { "VICAR", 0, MagickString("NJPL1I") }, + { "VIFF", 0, MagickString("\253\001") }, + { "WMF", 0, MagickString("\327\315\306\232") }, + { "WMF", 0, MagickString("\001\000\011\000") }, + { "WPG", 0, MagickString("\377WPC") }, + { "XBM", 0, MagickString("#define") }, + { "XCF", 0, MagickString("gimp xcf") }, + { "XEF", 0, MagickString("FOVb") }, + { "XPM", 1, MagickString("* XPM *") }, + { "XWD", 4, MagickString("\007\000\000") }, + { "XWD", 5, MagickString("\000\000\007") }, + { (const char *) NULL, 0, MagickString((const char *) NULL) } }; static LinkedListInfo @@ -725,7 +724,15 @@ static MagickBooleanType LoadMagicList(const char *xml,const char *filename, if (xml == (char *) NULL) return(MagickFalse); if (magic_list == (LinkedListInfo *) NULL) - magic_list=NewLinkedList(0); + { + magic_list=NewLinkedList(0); + if (magic_list == (LinkedListInfo *) NULL) + { + ThrowFileException(exception,ResourceLimitError, + "MemoryAllocationFailed",filename); + return(MagickFalse); + } + } status=MagickTrue; magic_info=(MagicInfo *) NULL; token=AcquireString(xml); @@ -808,6 +815,7 @@ static MagickBooleanType LoadMagicList(const char *xml,const char *filename, ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); (void) ResetMagickMemory(magic_info,0,sizeof(*magic_info)); magic_info->path=ConstantString(filename); + magic_info->exempt=MagickFalse; magic_info->signature=MagickSignature; continue; } @@ -979,7 +987,15 @@ static MagickBooleanType LoadMagicLists(const char *filename, */ status=MagickFalse; if (magic_list == (LinkedListInfo *) NULL) - magic_list=NewLinkedList(0); + { + magic_list=NewLinkedList(0); + if (magic_list == (LinkedListInfo *) NULL) + { + ThrowFileException(exception,ResourceLimitError, + "MemoryAllocationFailed",filename); + return(MagickFalse); + } + } for (p=MagicMap; p->name != (const char *) NULL; p++) { MagicInfo @@ -987,13 +1003,17 @@ static MagickBooleanType LoadMagicLists(const char *filename, magic_info=(MagicInfo *) AcquireMagickMemory(sizeof(*magic_info)); if (magic_info == (MagicInfo *) NULL) - ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); + { + (void) ThrowMagickException(exception,GetMagickModule(), + ResourceLimitError,"MemoryAllocationFailed","`%s'",magic_info->name); + continue; + } (void) ResetMagickMemory(magic_info,0,sizeof(*magic_info)); magic_info->path="[built-in]"; magic_info->name=(char *) p->name; magic_info->offset=p->offset; magic_info->target=(char *) p->magic; - magic_info->magic=p->magic; + magic_info->magic=(unsigned char *) p->magic; magic_info->length=p->length; magic_info->exempt=MagickTrue; magic_info->signature=MagickSignature; -- 2.40.0