API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Feb 26th, 2017
129
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 51.81 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/doc/examples/Makefile b/doc/examples/Makefile
  2. index af38159..81e7bbe 100644
  3. --- a/doc/examples/Makefile
  4. +++ b/doc/examples/Makefile
  5. @@ -26,6 +26,7 @@ EXAMPLES= avio_dir_cmd \
  6. scaling_video \
  7. transcode_aac \
  8. transcoding \
  9. + xpmdec \
  10. 
  11. OBJS=$(addsuffix .o,$(EXAMPLES))
  12. 
  13. diff --git a/doc/examples/scaling_video.c b/doc/examples/scaling_video.c
  14. index c46edf6..82585b2 100644
  15. --- a/doc/examples/scaling_video.c
  16. +++ b/doc/examples/scaling_video.c
  17. @@ -86,31 +86,31 @@ int main(int argc, char **argv)
  18. exit(1);
  19. }
  20. 
  21. - /* create vectors for source and destination filters */
  22. - struct SwsFilter *srcFilter, *dstFilter;
  23. - struct SwsVector *srcVec, *dstVec;
  24. + // /* create vectors for source and destination filters */
  25. + // struct SwsFilter *srcFilter, *dstFilter;
  26. + // struct SwsVector *srcVec, *dstVec;
  27. 
  28. - srcVec->lumH->coeff = new double({142, 12, 3});
  29. - srcVec->lumH.length = 3;
  30. + // srcVec->lumH->coeff = new double({142, 12, 3});
  31. + // srcVec->lumH.length = 3;
  32. 
  33. - srcVec->lumV->coeff = new double({231, 42, 53});
  34. - srcVec->lumV.length = 3;
  35. + // srcVec->lumV->coeff = new double({231, 42, 53});
  36. + // srcVec->lumV.length = 3;
  37. 
  38. - srcVec->chrH->coeff = new double({111, 32, 53});
  39. - srcVec->chrH.length = 3;
  40. + // srcVec->chrH->coeff = new double({111, 32, 53});
  41. + // srcVec->chrH.length = 3;
  42. 
  43. - srcVec->chrV->coeff = new double({12, 32, 13});
  44. - srcVec->chrV.length = 3;
  45. + // srcVec->chrV->coeff = new double({12, 32, 13});
  46. + // srcVec->chrV.length = 3;
  47. 
  48. - dstVec = srcVec; // same for now
  49. + // dstVec = srcVec; // same for now
  50. 
  51. - srcFilter = &srcVec; 
  52. - dstFilter = &dstVec; 
  53. + // srcFilter = &srcVec; 
  54. + // dstFilter = &dstVec; 
  55. 
  56. /* get context */
  57. sws_ctx = sws_getContext(src_w, src_h, src_pix_fmt,
  58. dst_w, dst_h, dst_pix_fmt,
  59. - SWS_BILINEAR, lumH, &srcFilter, &dstFilter);
  60. + SWS_BILINEAR, NULL, NULL, NULL);
  61. if (!sws_ctx) {
  62. fprintf(stderr,
  63. "Impossible to create scale context for the conversion "
  64. diff --git a/doc/general.texi b/doc/general.texi
  65. index 626590c..f2f5fd7 100644
  66. --- a/doc/general.texi
  67. +++ b/doc/general.texi
  68. @@ -418,6 +418,8 @@ library:
  69. @item raw Chinese AVS video @tab X @tab X
  70. @item raw CRI ADX @tab X @tab X
  71. @item raw Dirac @tab X @tab X
  72. +@item XPM @tab X @tab X
  73. + @tab X PixMap image format
  74. @item raw DNxHD @tab X @tab X
  75. @item raw DTS @tab X @tab X
  76. @item raw DTS-HD @tab @tab X
  77. diff --git a/libavcodec/Makefile b/libavcodec/Makefile
  78. index 1bea44a..cfcf9a0 100644
  79. --- a/libavcodec/Makefile
  80. +++ b/libavcodec/Makefile
  81. @@ -507,6 +507,9 @@ OBJS-$(CONFIG_RV30_DECODER) += rv30.o rv34.o rv30dsp.o
  82. OBJS-$(CONFIG_RV40_DECODER) += rv40.o rv34.o rv40dsp.o
  83. OBJS-$(CONFIG_SAMI_DECODER) += samidec.o ass.o htmlsubtitles.o
  84. OBJS-$(CONFIG_S302M_DECODER) += s302m.o
  85. +OBJS-$(CONFIG_XPM_DECODER) += xpmdec.o
  86. +OBJS-$(CONFIG_XPM_ENCODER) += xpmenc.o
  87. +
  88. OBJS-$(CONFIG_S302M_ENCODER) += s302menc.o
  89. OBJS-$(CONFIG_SANM_DECODER) += sanm.o
  90. OBJS-$(CONFIG_SCPR_DECODER) += scpr.o
  91. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
  92. index 925a8c7..2b03d60 100644
  93. --- a/libavcodec/avcodec.h
  94. +++ b/libavcodec/avcodec.h
  95. @@ -415,7 +415,8 @@ enum AVCodecID {
  96. AV_CODEC_ID_PIXLET,
  97. AV_CODEC_ID_SPEEDHQ,
  98. AV_CODEC_ID_FMVC,
  99. - AV_CODEC_ID_SCPR,
  100. + AV_CODEC_ID_SCPR_XPM,
  101. + AV_CODEC_ID_XPM,
  102. 
  103. /* various PCM "codecs" */
  104. AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
  105. diff --git a/libavformat/img2.c b/libavformat/img2.c
  106. index f9f53ff..a4c1177 100644
  107. --- a/libavformat/img2.c
  108. +++ b/libavformat/img2.c
  109. @@ -71,6 +71,7 @@ const IdStrMap ff_img_tags[] = {
  110. { AV_CODEC_ID_JPEG2000, "j2k" },
  111. { AV_CODEC_ID_DPX, "dpx" },
  112. { AV_CODEC_ID_EXR, "exr" },
  113. + { AV_CODEC_ID_XPM , "xpm" },
  114. { AV_CODEC_ID_PICTOR, "pic" },
  115. { AV_CODEC_ID_V210X, "yuv10" },
  116. { AV_CODEC_ID_WEBP, "webp" },
  117. diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
  118. index 1297b1a..04fd22d 100644
  119. --- a/libavformat/img2enc.c
  120. +++ b/libavformat/img2enc.c
  121. @@ -223,7 +223,7 @@ AVOutputFormat ff_image2_muxer = {
  122. .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"),
  123. .extensions = "bmp,dpx,jls,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,"
  124. "ppm,sgi,tga,tif,tiff,jp2,j2c,j2k,xwd,sun,ras,rs,im1,im8,im24,"
  125. - "sunras,xbm,xface,pix,y",
  126. + "sunras,xbm,xface,pix,y","sunras,xbm,xpm",
  127. .priv_data_size = sizeof(VideoMuxData),
  128. .video_codec = AV_CODEC_ID_MJPEG,
  129. .write_header = write_header,
  130. diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
  131. index 86d3dac..1cc610a 100644
  132. --- a/libavutil/parseutils.c
  133. +++ b/libavutil/parseutils.c
  134. @@ -199,89 +199,483 @@ typedef struct ColorEntry {
  135. static const ColorEntry color_table[] = {
  136. { "AliceBlue", { 0xF0, 0xF8, 0xFF } },
  137. { "AntiqueWhite", { 0xFA, 0xEB, 0xD7 } },
  138. + { "AntiqueWhite1", { 0xFF, 0xEF, 0xDB } },
  139. + { "AntiqueWhite2", { 0xEE, 0xDF, 0xCC } },
  140. + { "AntiqueWhite3", { 0xCD, 0xC0, 0xB0 } },
  141. + { "AntiqueWhite4", { 0x8B, 0x83, 0x78 } },
  142. { "Aqua", { 0x00, 0xFF, 0xFF } },
  143. { "Aquamarine", { 0x7F, 0xFF, 0xD4 } },
  144. + { "Aquamarine1", { 0x7F, 0xFF, 0xD4 } },
  145. + { "Aquamarine2", { 0x76, 0xEE, 0xC6 } },
  146. + { "Aquamarine3", { 0x66, 0xCD, 0xAA } },
  147. + { "Aquamarine4", { 0x45, 0x8B, 0x74 } },
  148. { "Azure", { 0xF0, 0xFF, 0xFF } },
  149. + { "Azure1", { 0xF0, 0xFF, 0xFF } },
  150. + { "Azure2", { 0xE0, 0xEE, 0xEE } },
  151. + { "Azure3", { 0xC1, 0xCD, 0xCD } },
  152. + { "Azure4", { 0x83, 0x8B, 0x8B } },
  153. { "Beige", { 0xF5, 0xF5, 0xDC } },
  154. { "Bisque", { 0xFF, 0xE4, 0xC4 } },
  155. + { "Bisque1", { 0xFF, 0xE4, 0xC4 } },
  156. + { "Bisque2", { 0xEE, 0xD5, 0xB7 } },
  157. + { "Bisque3", { 0xCD, 0xB7, 0x9E } },
  158. + { "Bisque4", { 0x8B, 0x7D, 0x6B } },
  159. { "Black", { 0x00, 0x00, 0x00 } },
  160. { "BlanchedAlmond", { 0xFF, 0xEB, 0xCD } },
  161. { "Blue", { 0x00, 0x00, 0xFF } },
  162. + { "Blue1", { 0x00, 0x00, 0xFF } },
  163. + { "Blue2", { 0x00, 0x00, 0xEE } },
  164. + { "Blue3", { 0x00, 0x00, 0xCD } },
  165. + { "Blue4", { 0x00, 0x00, 0x8B } },
  166. { "BlueViolet", { 0x8A, 0x2B, 0xE2 } },
  167. { "Brown", { 0xA5, 0x2A, 0x2A } },
  168. + { "Brown1", { 0xFF, 0x40, 0x40 } },
  169. + { "Brown2", { 0xEE, 0x3B, 0x3B } },
  170. + { "Brown3", { 0xCD, 0x33, 0x33 } },
  171. + { "Brown4", { 0x8B, 0x23, 0x23 } },
  172. { "BurlyWood", { 0xDE, 0xB8, 0x87 } },
  173. + { "Burlywood1", { 0xFF, 0xD3, 0x9B } },
  174. + { "Burlywood2", { 0xEE, 0xC5, 0x91 } },
  175. + { "Burlywood3", { 0xCD, 0xAA, 0x7D } },
  176. + { "Burlywood4", { 0x8B, 0x73, 0x55 } },
  177. { "CadetBlue", { 0x5F, 0x9E, 0xA0 } },
  178. + { "CadetBlue1", { 0x98, 0xF5, 0xFF } },
  179. + { "CadetBlue2", { 0x8E, 0xE5, 0xEE } },
  180. + { "CadetBlue3", { 0x7A, 0xC5, 0xCD } },
  181. + { "CadetBlue4", { 0x53, 0x86, 0x8B } },
  182. { "Chartreuse", { 0x7F, 0xFF, 0x00 } },
  183. + { "Chartreuse1", { 0x7F, 0xFF, 0x00 } },
  184. + { "Chartreuse2", { 0x76, 0xEE, 0x00 } },
  185. + { "Chartreuse3", { 0x66, 0xCD, 0x00 } },
  186. + { "Chartreuse4", { 0x45, 0x8B, 0x00 } },
  187. { "Chocolate", { 0xD2, 0x69, 0x1E } },
  188. + { "Chocolate1", { 0xFF, 0x7F, 0x24 } },
  189. + { "Chocolate2", { 0xEE, 0x76, 0x21 } },
  190. + { "Chocolate3", { 0xCD, 0x66, 0x1D } },
  191. + { "Chocolate4", { 0x8B, 0x45, 0x13 } },
  192. { "Coral", { 0xFF, 0x7F, 0x50 } },
  193. + { "Coral1", { 0xFF, 0x72, 0x56 } },
  194. + { "Coral2", { 0xEE, 0x6A, 0x50 } },
  195. + { "Coral3", { 0xCD, 0x5B, 0x45 } },
  196. + { "Coral4", { 0x8B, 0x3E, 0x2F } },
  197. { "CornflowerBlue", { 0x64, 0x95, 0xED } },
  198. { "Cornsilk", { 0xFF, 0xF8, 0xDC } },
  199. + { "Cornsilk1", { 0xFF, 0xF8, 0xDC } },
  200. + { "Cornsilk2", { 0xEE, 0xE8, 0xCD } },
  201. + { "Cornsilk3", { 0xCD, 0xC8, 0xB1 } },
  202. + { "Cornsilk4", { 0x8B, 0x88, 0x78 } },
  203. { "Crimson", { 0xDC, 0x14, 0x3C } },
  204. { "Cyan", { 0x00, 0xFF, 0xFF } },
  205. + { "Cyan1", { 0x00, 0xFF, 0xFF } },
  206. + { "Cyan2", { 0x00, 0xEE, 0xEE } },
  207. + { "Cyan3", { 0x00, 0xCD, 0xCD } },
  208. + { "Cyan4", { 0x00, 0x8B, 0x8B } },
  209. { "DarkBlue", { 0x00, 0x00, 0x8B } },
  210. { "DarkCyan", { 0x00, 0x8B, 0x8B } },
  211. { "DarkGoldenRod", { 0xB8, 0x86, 0x0B } },
  212. + { "DarkGoldenrod1", { 0xFF, 0xB9, 0x0F } },
  213. + { "DarkGoldenrod2", { 0xEE, 0xAD, 0x0E } },
  214. + { "DarkGoldenrod3", { 0xCD, 0x95, 0x0C } },
  215. + { "DarkGoldenrod4", { 0x8B, 0x65, 0x08 } },
  216. { "DarkGray", { 0xA9, 0xA9, 0xA9 } },
  217. { "DarkGreen", { 0x00, 0x64, 0x00 } },
  218. + { "DarkGrey", { 0xA9, 0xA9, 0xA9 } },
  219. { "DarkKhaki", { 0xBD, 0xB7, 0x6B } },
  220. { "DarkMagenta", { 0x8B, 0x00, 0x8B } },
  221. { "DarkOliveGreen", { 0x55, 0x6B, 0x2F } },
  222. - { "Darkorange", { 0xFF, 0x8C, 0x00 } },
  223. + { "DarkOliveGreen1", { 0xCA, 0xFF, 0x70 } },
  224. + { "DarkOliveGreen2", { 0xBC, 0xEE, 0x68 } },
  225. + { "DarkOliveGreen3", { 0xA2, 0xCD, 0x5A } },
  226. + { "DarkOliveGreen4", { 0x6E, 0x8B, 0x3D } },
  227. + { "DarkOrange", { 0xFF, 0x8C, 0x00 } },
  228. + { "DarkOrange1", { 0xFF, 0x7F, 0x00 } },
  229. + { "DarkOrange2", { 0xEE, 0x76, 0x00 } },
  230. + { "DarkOrange3", { 0xCD, 0x66, 0x00 } },
  231. + { "DarkOrange4", { 0x8B, 0x45, 0x00 } },
  232. { "DarkOrchid", { 0x99, 0x32, 0xCC } },
  233. + { "DarkOrchid1", { 0xBF, 0x3E, 0xFF } },
  234. + { "DarkOrchid2", { 0xB2, 0x3A, 0xEE } },
  235. + { "DarkOrchid3", { 0x9A, 0x32, 0xCD } },
  236. + { "DarkOrchid4", { 0x68, 0x22, 0x8B } },
  237. { "DarkRed", { 0x8B, 0x00, 0x00 } },
  238. { "DarkSalmon", { 0xE9, 0x96, 0x7A } },
  239. { "DarkSeaGreen", { 0x8F, 0xBC, 0x8F } },
  240. + { "DarkSeaGreen1", { 0xC1, 0xFF, 0xC1 } },
  241. + { "DarkSeaGreen2", { 0xB4, 0xEE, 0xB4 } },
  242. + { "DarkSeaGreen3", { 0x9B, 0xCD, 0x9B } },
  243. + { "DarkSeaGreen4", { 0x69, 0x8B, 0x69 } },
  244. { "DarkSlateBlue", { 0x48, 0x3D, 0x8B } },
  245. { "DarkSlateGray", { 0x2F, 0x4F, 0x4F } },
  246. + { "DarkSlateGray1", { 0x97, 0xFF, 0xFF } },
  247. + { "DarkSlateGray2", { 0x8D, 0xEE, 0xEE } },
  248. + { "DarkSlateGray3", { 0x79, 0xCD, 0xCD } },
  249. + { "DarkSlateGray4", { 0x52, 0x8B, 0x8B } },
  250. + { "DarkSlateGrey", { 0x2F, 0x4F, 0x4F } },
  251. { "DarkTurquoise", { 0x00, 0xCE, 0xD1 } },
  252. { "DarkViolet", { 0x94, 0x00, 0xD3 } },
  253. { "DeepPink", { 0xFF, 0x14, 0x93 } },
  254. + { "DeepPink1", { 0xFF, 0x14, 0x93 } },
  255. + { "DeepPink2", { 0xEE, 0x12, 0x89 } },
  256. + { "DeepPink3", { 0xCD, 0x10, 0x76 } },
  257. + { "DeepPink4", { 0x8B, 0x0A, 0x50 } },
  258. { "DeepSkyBlue", { 0x00, 0xBF, 0xFF } },
  259. + { "DeepSkyBlue1", { 0x00, 0xBF, 0xFF } },
  260. + { "DeepSkyBlue2", { 0x00, 0xB2, 0xEE } },
  261. + { "DeepSkyBlue3", { 0x00, 0x9A, 0xCD } },
  262. + { "DeepSkyBlue4", { 0x00, 0x68, 0x8B } },
  263. { "DimGray", { 0x69, 0x69, 0x69 } },
  264. + { "DimGrey", { 0x69, 0x69, 0x69 } },
  265. { "DodgerBlue", { 0x1E, 0x90, 0xFF } },
  266. + { "DodgerBlue1", { 0x1E, 0x90, 0xFF } },
  267. + { "DodgerBlue2", { 0x1C, 0x86, 0xEE } },
  268. + { "DodgerBlue3", { 0x18, 0x74, 0xCD } },
  269. + { "DodgerBlue4", { 0x10, 0x4E, 0x8B } },
  270. { "FireBrick", { 0xB2, 0x22, 0x22 } },
  271. + { "Firebrick1", { 0xFF, 0x30, 0x30 } },
  272. + { "Firebrick2", { 0xEE, 0x2C, 0x2C } },
  273. + { "Firebrick3", { 0xCD, 0x26, 0x26 } },
  274. + { "Firebrick4", { 0x8B, 0x1A, 0x1A } },
  275. { "FloralWhite", { 0xFF, 0xFA, 0xF0 } },
  276. { "ForestGreen", { 0x22, 0x8B, 0x22 } },
  277. + { "Fractal", { 0x80, 0x80, 0x80 } },
  278. { "Fuchsia", { 0xFF, 0x00, 0xFF } },
  279. { "Gainsboro", { 0xDC, 0xDC, 0xDC } },
  280. { "GhostWhite", { 0xF8, 0xF8, 0xFF } },
  281. { "Gold", { 0xFF, 0xD7, 0x00 } },
  282. + { "Gold1", { 0xFF, 0xD7, 0x00 } },
  283. + { "Gold2", { 0xEE, 0xC9, 0x00 } },
  284. + { "Gold3", { 0xCD, 0xAD, 0x00 } },
  285. + { "Gold4", { 0x8B, 0x75, 0x00 } },
  286. { "GoldenRod", { 0xDA, 0xA5, 0x20 } },
  287. - { "Gray", { 0x80, 0x80, 0x80 } },
  288. - { "Green", { 0x00, 0x80, 0x00 } },
  289. + { "Goldenrod1", { 0xFF, 0xC1, 0x25 } },
  290. + { "Goldenrod2", { 0xEE, 0xB4, 0x22 } },
  291. + { "Goldenrod3", { 0xCD, 0x9B, 0x1D } },
  292. + { "Goldenrod4", { 0x8B, 0x69, 0x14 } },
  293. + { "Gray", { 0xBE, 0xBE, 0xBE } },
  294. + { "Gray0", { 0x00, 0x00, 0x00 } },
  295. + { "Gray1", { 0x03, 0x03, 0x03 } },
  296. + { "Gray10", { 0x1A, 0x1A, 0x1A } },
  297. + { "Gray100", { 0xFF, 0xFF, 0xFF } },
  298. + { "Gray100", { 0xFF, 0xFF, 0xFF } },
  299. + { "Gray11", { 0x1C, 0x1C, 0x1C } },
  300. + { "Gray12", { 0x1F, 0x1F, 0x1F } },
  301. + { "Gray13", { 0x21, 0x21, 0x21 } },
  302. + { "Gray14", { 0x24, 0x24, 0x24 } },
  303. + { "Gray15", { 0x26, 0x26, 0x26 } },
  304. + { "Gray16", { 0x29, 0x29, 0x29 } },
  305. + { "Gray17", { 0x2B, 0x2B, 0x2B } },
  306. + { "Gray18", { 0x2E, 0x2E, 0x2E } },
  307. + { "Gray19", { 0x30, 0x30, 0x30 } },
  308. + { "Gray2", { 0x05, 0x05, 0x05 } },
  309. + { "Gray20", { 0x33, 0x33, 0x33 } },
  310. + { "Gray21", { 0x36, 0x36, 0x36 } },
  311. + { "Gray22", { 0x38, 0x38, 0x38 } },
  312. + { "Gray23", { 0x3B, 0x3B, 0x3B } },
  313. + { "Gray24", { 0x3D, 0x3D, 0x3D } },
  314. + { "Gray25", { 0x40, 0x40, 0x40 } },
  315. + { "Gray26", { 0x42, 0x42, 0x42 } },
  316. + { "Gray27", { 0x45, 0x45, 0x45 } },
  317. + { "Gray28", { 0x47, 0x47, 0x47 } },
  318. + { "Gray29", { 0x4A, 0x4A, 0x4A } },
  319. + { "Gray3", { 0x08, 0x08, 0x08 } },
  320. + { "Gray30", { 0x4D, 0x4D, 0x4D } },
  321. + { "Gray31", { 0x4F, 0x4F, 0x4F } },
  322. + { "Gray32", { 0x52, 0x52, 0x52 } },
  323. + { "Gray33", { 0x54, 0x54, 0x54 } },
  324. + { "Gray34", { 0x57, 0x57, 0x57 } },
  325. + { "Gray35", { 0x59, 0x59, 0x59 } },
  326. + { "Gray36", { 0x5C, 0x5C, 0x5C } },
  327. + { "Gray37", { 0x5E, 0x5E, 0x5E } },
  328. + { "Gray38", { 0x61, 0x61, 0x61 } },
  329. + { "Gray39", { 0x63, 0x63, 0x63 } },
  330. + { "Gray4", { 0x0A, 0x0A, 0x0A } },
  331. + { "Gray40", { 0x66, 0x66, 0x66 } },
  332. + { "Gray41", { 0x69, 0x69, 0x69 } },
  333. + { "Gray42", { 0x6B, 0x6B, 0x6B } },
  334. + { "Gray43", { 0x6E, 0x6E, 0x6E } },
  335. + { "Gray44", { 0x70, 0x70, 0x70 } },
  336. + { "Gray45", { 0x73, 0x73, 0x73 } },
  337. + { "Gray46", { 0x75, 0x75, 0x75 } },
  338. + { "Gray47", { 0x78, 0x78, 0x78 } },
  339. + { "Gray48", { 0x7A, 0x7A, 0x7A } },
  340. + { "Gray49", { 0x7D, 0x7D, 0x7D } },
  341. + { "Gray5", { 0x0D, 0x0D, 0x0D } },
  342. + { "Gray50", { 0x7F, 0x7F, 0x7F } },
  343. + { "Gray51", { 0x82, 0x82, 0x82 } },
  344. + { "Gray52", { 0x85, 0x85, 0x85 } },
  345. + { "Gray53", { 0x87, 0x87, 0x87 } },
  346. + { "Gray54", { 0x8A, 0x8A, 0x8A } },
  347. + { "Gray55", { 0x8C, 0x8C, 0x8C } },
  348. + { "Gray56", { 0x8F, 0x8F, 0x8F } },
  349. + { "Gray57", { 0x91, 0x91, 0x91 } },
  350. + { "Gray58", { 0x94, 0x94, 0x94 } },
  351. + { "Gray59", { 0x96, 0x96, 0x96 } },
  352. + { "Gray6", { 0x0F, 0x0F, 0x0F } },
  353. + { "Gray60", { 0x99, 0x99, 0x99 } },
  354. + { "Gray61", { 0x9C, 0x9C, 0x9C } },
  355. + { "Gray62", { 0x9E, 0x9E, 0x9E } },
  356. + { "Gray63", { 0xA1, 0xA1, 0xA1 } },
  357. + { "Gray64", { 0xA3, 0xA3, 0xA3 } },
  358. + { "Gray65", { 0xA6, 0xA6, 0xA6 } },
  359. + { "Gray66", { 0xA8, 0xA8, 0xA8 } },
  360. + { "Gray67", { 0xAB, 0xAB, 0xAB } },
  361. + { "Gray68", { 0xAD, 0xAD, 0xAD } },
  362. + { "Gray69", { 0xB0, 0xB0, 0xB0 } },
  363. + { "Gray7", { 0x12, 0x12, 0x12 } },
  364. + { "Gray70", { 0xB3, 0xB3, 0xB3 } },
  365. + { "Gray71", { 0xB5, 0xB5, 0xB5 } },
  366. + { "Gray72", { 0xB8, 0xB8, 0xB8 } },
  367. + { "Gray73", { 0xBA, 0xBA, 0xBA } },
  368. + { "Gray74", { 0xBD, 0xBD, 0xBD } },
  369. + { "Gray75", { 0xBF, 0xBF, 0xBF } },
  370. + { "Gray76", { 0xC2, 0xC2, 0xC2 } },
  371. + { "Gray77", { 0xC4, 0xC4, 0xC4 } },
  372. + { "Gray78", { 0xC7, 0xC7, 0xC7 } },
  373. + { "Gray79", { 0xC9, 0xC9, 0xC9 } },
  374. + { "Gray8", { 0x14, 0x14, 0x14 } },
  375. + { "Gray80", { 0xCC, 0xCC, 0xCC } },
  376. + { "Gray81", { 0xCF, 0xCF, 0xCF } },
  377. + { "Gray82", { 0xD1, 0xD1, 0xD1 } },
  378. + { "Gray83", { 0xD4, 0xD4, 0xD4 } },
  379. + { "Gray84", { 0xD6, 0xD6, 0xD6 } },
  380. + { "Gray85", { 0xD9, 0xD9, 0xD9 } },
  381. + { "Gray86", { 0xDB, 0xDB, 0xDB } },
  382. + { "Gray87", { 0xDE, 0xDE, 0xDE } },
  383. + { "Gray88", { 0xE0, 0xE0, 0xE0 } },
  384. + { "Gray89", { 0xE3, 0xE3, 0xE3 } },
  385. + { "Gray9", { 0x17, 0x17, 0x17 } },
  386. + { "Gray90", { 0xE5, 0xE5, 0xE5 } },
  387. + { "Gray91", { 0xE8, 0xE8, 0xE8 } },
  388. + { "Gray92", { 0xEB, 0xEB, 0xEB } },
  389. + { "Gray93", { 0xED, 0xED, 0xED } },
  390. + { "Gray94", { 0xF0, 0xF0, 0xF0 } },
  391. + { "Gray95", { 0xF2, 0xF2, 0xF2 } },
  392. + { "Gray96", { 0xF5, 0xF5, 0xF5 } },
  393. + { "Gray97", { 0xF7, 0xF7, 0xF7 } },
  394. + { "Gray98", { 0xFA, 0xFA, 0xFA } },
  395. + { "Gray99", { 0xFC, 0xFC, 0xFC } },
  396. + { "Green", { 0x00, 0xFF, 0x00 } },
  397. + { "Green1", { 0x00, 0xFF, 0x00 } },
  398. + { "Green2", { 0x00, 0xEE, 0x00 } },
  399. + { "Green3", { 0x00, 0xCD, 0x00 } },
  400. + { "Green4", { 0x00, 0x8B, 0x00 } },
  401. { "GreenYellow", { 0xAD, 0xFF, 0x2F } },
  402. + { "Grey", { 0xBE, 0xBE, 0xBE } },
  403. + { "Grey0", { 0x00, 0x00, 0x00 } },
  404. + { "Grey1", { 0x03, 0x03, 0x03 } },
  405. + { "Grey10", { 0x1A, 0x1A, 0x1A } },
  406. + { "Grey100", { 0xFF, 0xFF, 0xFF } },
  407. + { "Grey11", { 0x1C, 0x1C, 0x1C } },
  408. + { "Grey12", { 0x1F, 0x1F, 0x1F } },
  409. + { "Grey13", { 0x21, 0x21, 0x21 } },
  410. + { "Grey14", { 0x24, 0x24, 0x24 } },
  411. + { "Grey15", { 0x26, 0x26, 0x26 } },
  412. + { "Grey16", { 0x29, 0x29, 0x29 } },
  413. + { "Grey17", { 0x2B, 0x2B, 0x2B } },
  414. + { "Grey18", { 0x2E, 0x2E, 0x2E } },
  415. + { "Grey19", { 0x30, 0x30, 0x30 } },
  416. + { "Grey2", { 0x05, 0x05, 0x05 } },
  417. + { "Grey20", { 0x33, 0x33, 0x33 } },
  418. + { "Grey21", { 0x36, 0x36, 0x36 } },
  419. + { "Grey22", { 0x38, 0x38, 0x38 } },
  420. + { "Grey23", { 0x3B, 0x3B, 0x3B } },
  421. + { "Grey24", { 0x3D, 0x3D, 0x3D } },
  422. + { "Grey25", { 0x40, 0x40, 0x40 } },
  423. + { "Grey26", { 0x42, 0x42, 0x42 } },
  424. + { "Grey27", { 0x45, 0x45, 0x45 } },
  425. + { "Grey28", { 0x47, 0x47, 0x47 } },
  426. + { "Grey29", { 0x4A, 0x4A, 0x4A } },
  427. + { "Grey3", { 0x08, 0x08, 0x08 } },
  428. + { "Grey30", { 0x4D, 0x4D, 0x4D } },
  429. + { "Grey31", { 0x4F, 0x4F, 0x4F } },
  430. + { "Grey32", { 0x52, 0x52, 0x52 } },
  431. + { "Grey33", { 0x54, 0x54, 0x54 } },
  432. + { "Grey34", { 0x57, 0x57, 0x57 } },
  433. + { "Grey35", { 0x59, 0x59, 0x59 } },
  434. + { "Grey36", { 0x5C, 0x5C, 0x5C } },
  435. + { "Grey37", { 0x5E, 0x5E, 0x5E } },
  436. + { "Grey38", { 0x61, 0x61, 0x61 } },
  437. + { "Grey39", { 0x63, 0x63, 0x63 } },
  438. + { "Grey4", { 0x0A, 0x0A, 0x0A } },
  439. + { "Grey40", { 0x66, 0x66, 0x66 } },
  440. + { "Grey41", { 0x69, 0x69, 0x69 } },
  441. + { "Grey42", { 0x6B, 0x6B, 0x6B } },
  442. + { "Grey43", { 0x6E, 0x6E, 0x6E } },
  443. + { "Grey44", { 0x70, 0x70, 0x70 } },
  444. + { "Grey45", { 0x73, 0x73, 0x73 } },
  445. + { "Grey46", { 0x75, 0x75, 0x75 } },
  446. + { "Grey47", { 0x78, 0x78, 0x78 } },
  447. + { "Grey48", { 0x7A, 0x7A, 0x7A } },
  448. + { "Grey49", { 0x7D, 0x7D, 0x7D } },
  449. + { "Grey5", { 0x0D, 0x0D, 0x0D } },
  450. + { "Grey50", { 0x7F, 0x7F, 0x7F } },
  451. + { "Grey51", { 0x82, 0x82, 0x82 } },
  452. + { "Grey52", { 0x85, 0x85, 0x85 } },
  453. + { "Grey53", { 0x87, 0x87, 0x87 } },
  454. + { "Grey54", { 0x8A, 0x8A, 0x8A } },
  455. + { "Grey55", { 0x8C, 0x8C, 0x8C } },
  456. + { "Grey56", { 0x8F, 0x8F, 0x8F } },
  457. + { "Grey57", { 0x91, 0x91, 0x91 } },
  458. + { "Grey58", { 0x94, 0x94, 0x94 } },
  459. + { "Grey59", { 0x96, 0x96, 0x96 } },
  460. + { "Grey6", { 0x0F, 0x0F, 0x0F } },
  461. + { "Grey60", { 0x99, 0x99, 0x99 } },
  462. + { "Grey61", { 0x9C, 0x9C, 0x9C } },
  463. + { "Grey62", { 0x9E, 0x9E, 0x9E } },
  464. + { "Grey63", { 0xA1, 0xA1, 0xA1 } },
  465. + { "Grey64", { 0xA3, 0xA3, 0xA3 } },
  466. + { "Grey65", { 0xA6, 0xA6, 0xA6 } },
  467. + { "Grey66", { 0xA8, 0xA8, 0xA8 } },
  468. + { "Grey67", { 0xAB, 0xAB, 0xAB } },
  469. + { "Grey68", { 0xAD, 0xAD, 0xAD } },
  470. + { "Grey69", { 0xB0, 0xB0, 0xB0 } },
  471. + { "Grey7", { 0x12, 0x12, 0x12 } },
  472. + { "Grey70", { 0xB3, 0xB3, 0xB3 } },
  473. + { "Grey71", { 0xB5, 0xB5, 0xB5 } },
  474. + { "Grey72", { 0xB8, 0xB8, 0xB8 } },
  475. + { "Grey73", { 0xBA, 0xBA, 0xBA } },
  476. + { "Grey74", { 0xBD, 0xBD, 0xBD } },
  477. + { "Grey75", { 0xBF, 0xBF, 0xBF } },
  478. + { "Grey76", { 0xC2, 0xC2, 0xC2 } },
  479. + { "Grey77", { 0xC4, 0xC4, 0xC4 } },
  480. + { "Grey78", { 0xC7, 0xC7, 0xC7 } },
  481. + { "Grey79", { 0xC9, 0xC9, 0xC9 } },
  482. + { "Grey8", { 0x14, 0x14, 0x14 } },
  483. + { "Grey80", { 0xCC, 0xCC, 0xCC } },
  484. + { "Grey81", { 0xCF, 0xCF, 0xCF } },
  485. + { "Grey82", { 0xD1, 0xD1, 0xD1 } },
  486. + { "Grey83", { 0xD4, 0xD4, 0xD4 } },
  487. + { "Grey84", { 0xD6, 0xD6, 0xD6 } },
  488. + { "Grey85", { 0xD9, 0xD9, 0xD9 } },
  489. + { "Grey86", { 0xDB, 0xDB, 0xDB } },
  490. + { "Grey87", { 0xDE, 0xDE, 0xDE } },
  491. + { "Grey88", { 0xE0, 0xE0, 0xE0 } },
  492. + { "Grey89", { 0xE3, 0xE3, 0xE3 } },
  493. + { "Grey9", { 0x17, 0x17, 0x17 } },
  494. + { "Grey90", { 0xE5, 0xE5, 0xE5 } },
  495. + { "Grey91", { 0xE8, 0xE8, 0xE8 } },
  496. + { "Grey92", { 0xEB, 0xEB, 0xEB } },
  497. + { "Grey93", { 0xED, 0xED, 0xED } },
  498. + { "Grey94", { 0xF0, 0xF0, 0xF0 } },
  499. + { "Grey95", { 0xF2, 0xF2, 0xF2 } },
  500. + { "Grey96", { 0xF5, 0xF5, 0xF5 } },
  501. + { "Grey97", { 0xF7, 0xF7, 0xF7 } },
  502. + { "Grey98", { 0xFA, 0xFA, 0xFA } },
  503. + { "Grey99", { 0xFC, 0xFC, 0xFC } },
  504. { "HoneyDew", { 0xF0, 0xFF, 0xF0 } },
  505. + { "Honeydew1", { 0xF0, 0xFF, 0xF0 } },
  506. + { "Honeydew2", { 0xE0, 0xEE, 0xE0 } },
  507. + { "Honeydew3", { 0xC1, 0xCD, 0xC1 } },
  508. + { "Honeydew4", { 0x83, 0x8B, 0x83 } },
  509. { "HotPink", { 0xFF, 0x69, 0xB4 } },
  510. + { "HotPink1", { 0xFF, 0x6E, 0xB4 } },
  511. + { "HotPink2", { 0xEE, 0x6A, 0xA7 } },
  512. + { "HotPink3", { 0xCD, 0x60, 0x90 } },
  513. + { "HotPink4", { 0x8B, 0x3A, 0x62 } },
  514. { "IndianRed", { 0xCD, 0x5C, 0x5C } },
  515. + { "IndianRed1", { 0xFF, 0x6A, 0x6A } },
  516. + { "IndianRed2", { 0xEE, 0x63, 0x63 } },
  517. + { "IndianRed3", { 0xCD, 0x55, 0x55 } },
  518. + { "IndianRed4", { 0x8B, 0x3A, 0x3A } },
  519. { "Indigo", { 0x4B, 0x00, 0x82 } },
  520. { "Ivory", { 0xFF, 0xFF, 0xF0 } },
  521. + { "Ivory1", { 0xFF, 0xFF, 0xF0 } },
  522. + { "Ivory2", { 0xEE, 0xEE, 0xE0 } },
  523. + { "Ivory3", { 0xCD, 0xCD, 0xC1 } },
  524. + { "Ivory4", { 0x8B, 0x8B, 0x83 } },
  525. { "Khaki", { 0xF0, 0xE6, 0x8C } },
  526. + { "Khaki1", { 0xFF, 0xF6, 0x8F } },
  527. + { "Khaki2", { 0xEE, 0xE6, 0x85 } },
  528. + { "Khaki3", { 0xCD, 0xC6, 0x73 } },
  529. + { "Khaki4", { 0x8B, 0x86, 0x4E } },
  530. { "Lavender", { 0xE6, 0xE6, 0xFA } },
  531. { "LavenderBlush", { 0xFF, 0xF0, 0xF5 } },
  532. + { "LavenderBlush1", { 0xFF, 0xF0, 0xF5 } },
  533. + { "LavenderBlush2", { 0xEE, 0xE0, 0xE5 } },
  534. + { "LavenderBlush3", { 0xCD, 0xC1, 0xC5 } },
  535. + { "LavenderBlush4", { 0x8B, 0x83, 0x86 } },
  536. { "LawnGreen", { 0x7C, 0xFC, 0x00 } },
  537. { "LemonChiffon", { 0xFF, 0xFA, 0xCD } },
  538. + { "LemonChiffon1", { 0xFF, 0xFA, 0xCD } },
  539. + { "LemonChiffon2", { 0xEE, 0xE9, 0xBF } },
  540. + { "LemonChiffon3", { 0xCD, 0xC9, 0xA5 } },
  541. + { "LemonChiffon4", { 0x8B, 0x89, 0x70 } },
  542. { "LightBlue", { 0xAD, 0xD8, 0xE6 } },
  543. + { "LightBlue1", { 0xBF, 0xEF, 0xFF } },
  544. + { "LightBlue2", { 0xB2, 0xDF, 0xEE } },
  545. + { "LightBlue3", { 0x9A, 0xC0, 0xCD } },
  546. + { "LightBlue4", { 0x68, 0x83, 0x8B } },
  547. { "LightCoral", { 0xF0, 0x80, 0x80 } },
  548. { "LightCyan", { 0xE0, 0xFF, 0xFF } },
  549. + { "LightCyan1", { 0xE0, 0xFF, 0xFF } },
  550. + { "LightCyan2", { 0xD1, 0xEE, 0xEE } },
  551. + { "LightCyan3", { 0xB4, 0xCD, 0xCD } },
  552. + { "LightCyan4", { 0x7A, 0x8B, 0x8B } },
  553. + { "LightGoldenRod", { 0xEE, 0xDD, 0x82 } },
  554. + { "LightGoldenRod1", { 0xFF, 0xEC, 0x8B } },
  555. + { "LightGoldenRod2", { 0xEE, 0xDC, 0x82 } },
  556. + { "LightGoldenRod3", { 0xCD, 0xBE, 0x70 } },
  557. + { "LightGoldenRod4", { 0x8B, 0x81, 0x4C } },
  558. { "LightGoldenRodYellow", { 0xFA, 0xFA, 0xD2 } },
  559. + { "LightGray", { 0xD3, 0xD3, 0xD3 } },
  560. { "LightGreen", { 0x90, 0xEE, 0x90 } },
  561. { "LightGrey", { 0xD3, 0xD3, 0xD3 } },
  562. { "LightPink", { 0xFF, 0xB6, 0xC1 } },
  563. + { "LightPink1", { 0xFF, 0xAE, 0xB9 } },
  564. + { "LightPink2", { 0xEE, 0xA2, 0xAD } },
  565. + { "LightPink3", { 0xCD, 0x8C, 0x95 } },
  566. + { "LightPink4", { 0x8B, 0x5F, 0x65 } },
  567. { "LightSalmon", { 0xFF, 0xA0, 0x7A } },
  568. + { "LightSalmon1", { 0xFF, 0xA0, 0x7A } },
  569. + { "LightSalmon2", { 0xEE, 0x95, 0x72 } },
  570. + { "LightSalmon3", { 0xCD, 0x81, 0x62 } },
  571. + { "LightSalmon4", { 0x8B, 0x57, 0x42 } },
  572. { "LightSeaGreen", { 0x20, 0xB2, 0xAA } },
  573. { "LightSkyBlue", { 0x87, 0xCE, 0xFA } },
  574. + { "LightSkyBlue1", { 0xB0, 0xE2, 0xFF } },
  575. + { "LightSkyBlue2", { 0xA4, 0xD3, 0xEE } },
  576. + { "LightSkyBlue3", { 0x8D, 0xB6, 0xCD } },
  577. + { "LightSkyBlue4", { 0x60, 0x7B, 0x8B } },
  578. + { "LightSlateBlue", { 0x84, 0x70, 0xFF } },
  579. { "LightSlateGray", { 0x77, 0x88, 0x99 } },
  580. + { "LightSlateGrey", { 0x77, 0x88, 0x99 } },
  581. { "LightSteelBlue", { 0xB0, 0xC4, 0xDE } },
  582. + { "LightSteelBlue1", { 0xCA, 0xE1, 0xFF } },
  583. + { "LightSteelBlue2", { 0xBC, 0xD2, 0xEE } },
  584. + { "LightSteelBlue3", { 0xA2, 0xB5, 0xCD } },
  585. + { "LightSteelBlue4", { 0x6E, 0x7B, 0x8B } },
  586. { "LightYellow", { 0xFF, 0xFF, 0xE0 } },
  587. + { "LightYellow1", { 0xFF, 0xFF, 0xE0 } },
  588. + { "LightYellow2", { 0xEE, 0xEE, 0xD1 } },
  589. + { "LightYellow3", { 0xCD, 0xCD, 0xB4 } },
  590. + { "LightYellow4", { 0x8B, 0x8B, 0x7A } },
  591. { "Lime", { 0x00, 0xFF, 0x00 } },
  592. { "LimeGreen", { 0x32, 0xCD, 0x32 } },
  593. { "Linen", { 0xFA, 0xF0, 0xE6 } },
  594. { "Magenta", { 0xFF, 0x00, 0xFF } },
  595. - { "Maroon", { 0x80, 0x00, 0x00 } },
  596. + { "Magenta1", { 0xFF, 0x00, 0xFF } },
  597. + { "Magenta2", { 0xEE, 0x00, 0xEE } },
  598. + { "Magenta3", { 0xCD, 0x00, 0xCD } },
  599. + { "Magenta4", { 0x8B, 0x00, 0x8B } },
  600. + { "Maroon", { 0xB0, 0x30, 0x60 } },
  601. + { "Maroon1", { 0xFF, 0x34, 0xB3 } },
  602. + { "Maroon2", { 0xEE, 0x30, 0xA7 } },
  603. + { "Maroon3", { 0xCD, 0x29, 0x90 } },
  604. + { "Maroon4", { 0x8B, 0x1C, 0x62 } },
  605. { "MediumAquaMarine", { 0x66, 0xCD, 0xAA } },
  606. { "MediumBlue", { 0x00, 0x00, 0xCD } },
  607. + { "MediumForestGreen", { 0x32, 0x81, 0x4B } },
  608. + { "MediumGoldenRod", { 0xD1, 0xC1, 0x66 } },
  609. { "MediumOrchid", { 0xBA, 0x55, 0xD3 } },
  610. + { "MediumOrchid1", { 0xE0, 0x66, 0xFF } },
  611. + { "MediumOrchid2", { 0xD1, 0x5F, 0xEE } },
  612. + { "MediumOrchid3", { 0xB4, 0x52, 0xCD } },
  613. + { "MediumOrchid4", { 0x7A, 0x37, 0x8B } },
  614. { "MediumPurple", { 0x93, 0x70, 0xD8 } },
  615. + { "MediumPurple1", { 0xAB, 0x82, 0xFF } },
  616. + { "MediumPurple2", { 0x9F, 0x79, 0xEE } },
  617. + { "MediumPurple3", { 0x89, 0x68, 0xCD } },
  618. + { "MediumPurple4", { 0x5D, 0x47, 0x8B } },
  619. { "MediumSeaGreen", { 0x3C, 0xB3, 0x71 } },
  620. { "MediumSlateBlue", { 0x7B, 0x68, 0xEE } },
  621. { "MediumSpringGreen", { 0x00, 0xFA, 0x9A } },
  622. @@ -290,52 +684,187 @@ static const ColorEntry color_table[] = {
  623. { "MidnightBlue", { 0x19, 0x19, 0x70 } },
  624. { "MintCream", { 0xF5, 0xFF, 0xFA } },
  625. { "MistyRose", { 0xFF, 0xE4, 0xE1 } },
  626. + { "MistyRose1", { 0xFF, 0xE4, 0xE1 } },
  627. + { "MistyRose2", { 0xEE, 0xD5, 0xD2 } },
  628. + { "MistyRose3", { 0xCD, 0xB7, 0xB5 } },
  629. + { "MistyRose4", { 0x8B, 0x7D, 0x7B } },
  630. { "Moccasin", { 0xFF, 0xE4, 0xB5 } },
  631. { "NavajoWhite", { 0xFF, 0xDE, 0xAD } },
  632. + { "NavajoWhite1", { 0xFF, 0xDE, 0xAD } },
  633. + { "NavajoWhite2", { 0xEE, 0xCF, 0xA1 } },
  634. + { "NavajoWhite3", { 0xCD, 0xB3, 0x8B } },
  635. + { "NavajoWhite4", { 0x8B, 0x79, 0x5E } },
  636. { "Navy", { 0x00, 0x00, 0x80 } },
  637. + { "NavyBlue", { 0x00, 0x00, 0x80 } },
  638. { "OldLace", { 0xFD, 0xF5, 0xE6 } },
  639. { "Olive", { 0x80, 0x80, 0x00 } },
  640. { "OliveDrab", { 0x6B, 0x8E, 0x23 } },
  641. + { "OliveDrab1", { 0xC0, 0xFF, 0x3E } },
  642. + { "OliveDrab2", { 0xB3, 0xEE, 0x3A } },
  643. + { "OliveDrab3", { 0x9A, 0xCD, 0x32 } },
  644. + { "OliveDrab4", { 0x69, 0x8B, 0x22 } },
  645. { "Orange", { 0xFF, 0xA5, 0x00 } },
  646. + { "Orange1", { 0xFF, 0xA5, 0x00 } },
  647. + { "Orange2", { 0xEE, 0x9A, 0x00 } },
  648. + { "Orange3", { 0xCD, 0x85, 0x00 } },
  649. + { "Orange4", { 0x8B, 0x5A, 0x00 } },
  650. { "OrangeRed", { 0xFF, 0x45, 0x00 } },
  651. + { "OrangeRed1", { 0xFF, 0x45, 0x00 } },
  652. + { "OrangeRed2", { 0xEE, 0x40, 0x00 } },
  653. + { "OrangeRed3", { 0xCD, 0x37, 0x00 } },
  654. + { "OrangeRed4", { 0x8B, 0x25, 0x00 } },
  655. { "Orchid", { 0xDA, 0x70, 0xD6 } },
  656. + { "Orchid1", { 0xFF, 0x83, 0xFA } },
  657. + { "Orchid2", { 0xEE, 0x7A, 0xE9 } },
  658. + { "Orchid3", { 0xCD, 0x69, 0xC9 } },
  659. + { "Orchid4", { 0x8B, 0x47, 0x89 } },
  660. { "PaleGoldenRod", { 0xEE, 0xE8, 0xAA } },
  661. { "PaleGreen", { 0x98, 0xFB, 0x98 } },
  662. + { "PaleGreen1", { 0x9A, 0xFF, 0x9A } },
  663. + { "PaleGreen2", { 0x90, 0xEE, 0x90 } },
  664. + { "PaleGreen3", { 0x7C, 0xCD, 0x7C } },
  665. + { "PaleGreen4", { 0x54, 0x8B, 0x54 } },
  666. { "PaleTurquoise", { 0xAF, 0xEE, 0xEE } },
  667. + { "PaleTurquoise1", { 0xBB, 0xFF, 0xFF } },
  668. + { "PaleTurquoise2", { 0xAE, 0xEE, 0xEE } },
  669. + { "PaleTurquoise3", { 0x96, 0xCD, 0xCD } },
  670. + { "PaleTurquoise4", { 0x66, 0x8B, 0x8B } },
  671. { "PaleVioletRed", { 0xD8, 0x70, 0x93 } },
  672. + { "PaleVioletRed1", { 0xFF, 0x82, 0xAB } },
  673. + { "PaleVioletRed2", { 0xEE, 0x79, 0x9F } },
  674. + { "PaleVioletRed3", { 0xCD, 0x68, 0x89 } },
  675. + { "PaleVioletRed4", { 0x8B, 0x47, 0x5D } },
  676. { "PapayaWhip", { 0xFF, 0xEF, 0xD5 } },
  677. { "PeachPuff", { 0xFF, 0xDA, 0xB9 } },
  678. + { "PeachPuff1", { 0xFF, 0xDA, 0xB9 } },
  679. + { "PeachPuff2", { 0xEE, 0xCB, 0xAD } },
  680. + { "PeachPuff3", { 0xCD, 0xAF, 0x95 } },
  681. + { "PeachPuff4", { 0x8B, 0x77, 0x65 } },
  682. { "Peru", { 0xCD, 0x85, 0x3F } },
  683. { "Pink", { 0xFF, 0xC0, 0xCB } },
  684. + { "Pink1", { 0xFF, 0xB5, 0xC5 } },
  685. + { "Pink2", { 0xEE, 0xA9, 0xB8 } },
  686. + { "Pink3", { 0xCD, 0x91, 0x9E } },
  687. + { "Pink4", { 0x8B, 0x63, 0x6C } },
  688. { "Plum", { 0xDD, 0xA0, 0xDD } },
  689. + { "Plum1", { 0xFF, 0xBB, 0xFF } },
  690. + { "Plum2", { 0xEE, 0xAE, 0xEE } },
  691. + { "Plum3", { 0xCD, 0x96, 0xCD } },
  692. + { "Plum4", { 0x8B, 0x66, 0x8B } },
  693. { "PowderBlue", { 0xB0, 0xE0, 0xE6 } },
  694. - { "Purple", { 0x80, 0x00, 0x80 } },
  695. + { "Purple", { 0xA0, 0x20, 0xF0 } },
  696. + { "Purple1", { 0x9B, 0x30, 0xFF } },
  697. + { "Purple2", { 0x91, 0x2C, 0xEE } },
  698. + { "Purple3", { 0x7D, 0x26, 0xCD } },
  699. + { "Purple4", { 0x55, 0x1A, 0x8B } },
  700. { "Red", { 0xFF, 0x00, 0x00 } },
  701. + { "Red1", { 0xFF, 0x00, 0x00 } },
  702. + { "Red2", { 0xEE, 0x00, 0x00 } },
  703. + { "Red3", { 0xCD, 0x00, 0x00 } },
  704. + { "Red4", { 0x8B, 0x00, 0x00 } },
  705. { "RosyBrown", { 0xBC, 0x8F, 0x8F } },
  706. + { "RosyBrown1", { 0xFF, 0xC1, 0xC1 } },
  707. + { "RosyBrown2", { 0xEE, 0xB4, 0xB4 } },
  708. + { "RosyBrown3", { 0xCD, 0x9B, 0x9B } },
  709. + { "RosyBrown4", { 0x8B, 0x69, 0x69 } },
  710. { "RoyalBlue", { 0x41, 0x69, 0xE1 } },
  711. + { "RoyalBlue1", { 0x48, 0x76, 0xFF } },
  712. + { "RoyalBlue2", { 0x43, 0x6E, 0xEE } },
  713. + { "RoyalBlue3", { 0x3A, 0x5F, 0xCD } },
  714. + { "RoyalBlue4", { 0x27, 0x40, 0x8B } },
  715. { "SaddleBrown", { 0x8B, 0x45, 0x13 } },
  716. { "Salmon", { 0xFA, 0x80, 0x72 } },
  717. + { "Salmon1", { 0xFF, 0x8C, 0x69 } },
  718. + { "Salmon2", { 0xEE, 0x82, 0x62 } },
  719. + { "Salmon3", { 0xCD, 0x70, 0x54 } },
  720. + { "Salmon4", { 0x8B, 0x4C, 0x39 } },
  721. { "SandyBrown", { 0xF4, 0xA4, 0x60 } },
  722. { "SeaGreen", { 0x2E, 0x8B, 0x57 } },
  723. + { "SeaGreen1", { 0x54, 0xFF, 0x9F } },
  724. + { "SeaGreen2", { 0x4E, 0xEE, 0x94 } },
  725. + { "SeaGreen3", { 0x43, 0xCD, 0x80 } },
  726. + { "SeaGreen4", { 0x2E, 0x8B, 0x57 } },
  727. { "SeaShell", { 0xFF, 0xF5, 0xEE } },
  728. + { "SeaShell1", { 0xFF, 0xF5, 0xEE } },
  729. + { "SeaShell2", { 0xEE, 0xE5, 0xDE } },
  730. + { "SeaShell3", { 0xCD, 0xC5, 0xBF } },
  731. + { "SeaShell4", { 0x8B, 0x86, 0x82 } },
  732. { "Sienna", { 0xA0, 0x52, 0x2D } },
  733. + { "Sienna1", { 0xFF, 0x82, 0x47 } },
  734. + { "Sienna2", { 0xEE, 0x79, 0x42 } },
  735. + { "Sienna3", { 0xCD, 0x68, 0x39 } },
  736. + { "Sienna4", { 0x8B, 0x47, 0x26 } },
  737. { "Silver", { 0xC0, 0xC0, 0xC0 } },
  738. { "SkyBlue", { 0x87, 0xCE, 0xEB } },
  739. + { "SkyBlue1", { 0x87, 0xCE, 0xFF } },
  740. + { "SkyBlue2", { 0x7E, 0xC0, 0xEE } },
  741. + { "SkyBlue3", { 0x6C, 0xA6, 0xCD } },
  742. + { "SkyBlue4", { 0x4A, 0x70, 0x8B } },
  743. { "SlateBlue", { 0x6A, 0x5A, 0xCD } },
  744. + { "SlateBlue1", { 0x83, 0x6F, 0xFF } },
  745. + { "SlateBlue2", { 0x7A, 0x67, 0xEE } },
  746. + { "SlateBlue3", { 0x69, 0x59, 0xCD } },
  747. + { "SlateBlue4", { 0x47, 0x3C, 0x8B } },
  748. { "SlateGray", { 0x70, 0x80, 0x90 } },
  749. + { "SlateGray1", { 0xC6, 0xE2, 0xFF } },
  750. + { "SlateGray2", { 0xB9, 0xD3, 0xEE } },
  751. + { "SlateGray3", { 0x9F, 0xB6, 0xCD } },
  752. + { "SlateGray4", { 0x6C, 0x7B, 0x8B } },
  753. + { "SlateGrey", { 0x70, 0x80, 0x90 } },
  754. { "Snow", { 0xFF, 0xFA, 0xFA } },
  755. + { "Snow1", { 0xFF, 0xFA, 0xFA } },
  756. + { "Snow2", { 0xEE, 0xE9, 0xE9 } },
  757. + { "Snow3", { 0xCD, 0xC9, 0xC9 } },
  758. + { "Snow4", { 0x8B, 0x89, 0x89 } },
  759. { "SpringGreen", { 0x00, 0xFF, 0x7F } },
  760. + { "SpringGreen1", { 0x00, 0xFF, 0x7F } },
  761. + { "SpringGreen2", { 0x00, 0xEE, 0x76 } },
  762. + { "SpringGreen3", { 0x00, 0xCD, 0x66 } },
  763. + { "SpringGreen4", { 0x00, 0x8B, 0x45 } },
  764. { "SteelBlue", { 0x46, 0x82, 0xB4 } },
  765. + { "SteelBlue1", { 0x63, 0xB8, 0xFF } },
  766. + { "SteelBlue2", { 0x5C, 0xAC, 0xEE } },
  767. + { "SteelBlue3", { 0x4F, 0x94, 0xCD } },
  768. + { "SteelBlue4", { 0x36, 0x64, 0x8B } },
  769. { "Tan", { 0xD2, 0xB4, 0x8C } },
  770. + { "Tan1", { 0xFF, 0xA5, 0x4F } },
  771. + { "Tan2", { 0xEE, 0x9A, 0x49 } },
  772. + { "Tan3", { 0xCD, 0x85, 0x3F } },
  773. + { "Tan4", { 0x8B, 0x5A, 0x2B } },
  774. { "Teal", { 0x00, 0x80, 0x80 } },
  775. { "Thistle", { 0xD8, 0xBF, 0xD8 } },
  776. + { "Thistle1", { 0xFF, 0xE1, 0xFF } },
  777. + { "Thistle2", { 0xEE, 0xD2, 0xEE } },
  778. + { "Thistle3", { 0xCD, 0xB5, 0xCD } },
  779. + { "Thistle4", { 0x8B, 0x7B, 0x8B } },
  780. { "Tomato", { 0xFF, 0x63, 0x47 } },
  781. + { "Tomato1", { 0xFF, 0x63, 0x47 } },
  782. + { "Tomato2", { 0xEE, 0x5C, 0x42 } },
  783. + { "Tomato3", { 0xCD, 0x4F, 0x39 } },
  784. + { "Tomato4", { 0x8B, 0x36, 0x26 } },
  785. { "Turquoise", { 0x40, 0xE0, 0xD0 } },
  786. + { "Turquoise1", { 0x00, 0xF5, 0xFF } },
  787. + { "Turquoise2", { 0x00, 0xE5, 0xEE } },
  788. + { "Turquoise3", { 0x00, 0xC5, 0xCD } },
  789. + { "Turquoise4", { 0x00, 0x86, 0x8B } },
  790. { "Violet", { 0xEE, 0x82, 0xEE } },
  791. + { "VioletRed", { 0xD0, 0x20, 0x90 } },
  792. + { "VioletRed1", { 0xFF, 0x3E, 0x96 } },
  793. + { "VioletRed2", { 0xEE, 0x3A, 0x8C } },
  794. + { "VioletRed3", { 0xCD, 0x32, 0x78 } },
  795. + { "VioletRed4", { 0x8B, 0x22, 0x52 } },
  796. { "Wheat", { 0xF5, 0xDE, 0xB3 } },
  797. + { "Wheat1", { 0xFF, 0xE7, 0xBA } },
  798. + { "Wheat2", { 0xEE, 0xD8, 0xAE } },
  799. + { "Wheat3", { 0xCD, 0xBA, 0x96 } },
  800. + { "Wheat4", { 0x8B, 0x7E, 0x66 } },
  801. { "White", { 0xFF, 0xFF, 0xFF } },
  802. { "WhiteSmoke", { 0xF5, 0xF5, 0xF5 } },
  803. { "Yellow", { 0xFF, 0xFF, 0x00 } },
  804. + { "Yellow1", { 0xFF, 0xFF, 0x00 } },
  805. + { "Yellow2", { 0xEE, 0xEE, 0x00 } },
  806. + { "Yellow3", { 0xCD, 0xCD, 0x00 } },
  807. + { "Yellow4", { 0x8B, 0x8B, 0x00 } },
  808. { "YellowGreen", { 0x9A, 0xCD, 0x32 } },
  809. };
  810. 
  811. @@ -373,6 +902,11 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
  812. rgba_color[1] = rgba >> 16;
  813. rgba_color[2] = rgba >> 8;
  814. rgba_color[3] = rgba;
  815. + } else if (!av_strcasecmp(color_string2, "none")) {
  816. + rgba_color[0] = 0;
  817. + rgba_color[1] = 0;
  818. + rgba_color[2] = 0;
  819. + rgba_color[3] = 0;
  820. } else if (hex_offset ||
  821. strspn(color_string2, "0123456789ABCDEFabcdef") == len) {
  822. char *tail;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!