AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix unaligned pointer warning on iOS.

Browse Source 
Splits the array of ColorRec structs into two separate arrays.

Change-Id: I6ec5e691b4535f3900ccb7e53eca84626ae7949f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/308187
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
This commit is contained in:
Jim Van Verth 2020-08-06 14:34:05 -04:00 committed by Skia Commit-Bot
parent fcf8cb2078
commit 5e9659579e
1 changed files with 295 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

448
src/utils/SkParseColor.cpp
View File

@ -8,172 +8,312 @@
#include "include/utils/SkParse.h"
#pragma pack(push,1)
static constexpr struct ColorRec {
const char* name;
uint8_t r, g, b;
} gNamedColors[] = {
{ "aliceblue", 0xf0,0xf8,0xff },
{ "antiquewhite", 0xfa,0xeb,0xd7 },
{ "aqua", 0x00,0xff,0xff },
{ "aquamarine", 0x7f,0xff,0xd4 },
{ "azure", 0xf0,0xff,0xff },
{ "beige", 0xf5,0xf5,0xdc },
{ "bisque", 0xff,0xe4,0xc4 },
{ "black", 0x00,0x00,0x00 },
{ "blanchedalmond", 0xff,0xeb,0xcd },
{ "blue", 0x00,0x00,0xff },
{ "blueviolet", 0x8a,0x2b,0xe2 },
{ "brown", 0xa5,0x2a,0x2a },
{ "burlywood", 0xde,0xb8,0x87 },
{ "cadetblue", 0x5f,0x9e,0xa0 },
{ "chartreuse", 0x7f,0xff,0x00 },
{ "chocolate", 0xd2,0x69,0x1e },
{ "coral", 0xff,0x7f,0x50 },
{ "cornflowerblue", 0x64,0x95,0xed },
{ "cornsilk", 0xff,0xf8,0xdc },
{ "crimson", 0xdc,0x14,0x3c },
{ "cyan", 0x00,0xff,0xff },
{ "darkblue", 0x00,0x00,0x8b },
{ "darkcyan", 0x00,0x8b,0x8b },
{ "darkgoldenrod", 0xb8,0x86,0x0b },
{ "darkgray", 0xa9,0xa9,0xa9 },
{ "darkgreen", 0x00,0x64,0x00 },
{ "darkkhaki", 0xbd,0xb7,0x6b },
{ "darkmagenta", 0x8b,0x00,0x8b },
{ "darkolivegreen", 0x55,0x6b,0x2f },
{ "darkorange", 0xff,0x8c,0x00 },
{ "darkorchid", 0x99,0x32,0xcc },
{ "darkred", 0x8b,0x00,0x00 },
{ "darksalmon", 0xe9,0x96,0x7a },
{ "darkseagreen", 0x8f,0xbc,0x8f },
{ "darkslateblue", 0x48,0x3d,0x8b },
{ "darkslategray", 0x2f,0x4f,0x4f },
{ "darkturquoise", 0x00,0xce,0xd1 },
{ "darkviolet", 0x94,0x00,0xd3 },
{ "deeppink", 0xff,0x14,0x93 },
{ "deepskyblue", 0x00,0xbf,0xff },
{ "dimgray", 0x69,0x69,0x69 },
{ "dodgerblue", 0x1e,0x90,0xff },
{ "firebrick", 0xb2,0x22,0x22 },
{ "floralwhite", 0xff,0xfa,0xf0 },
{ "forestgreen", 0x22,0x8b,0x22 },
{ "fuchsia", 0xff,0x00,0xff },
{ "gainsboro", 0xdc,0xdc,0xdc },
{ "ghostwhite", 0xf8,0xf8,0xff },
{ "gold", 0xff,0xd7,0x00 },
{ "goldenrod", 0xda,0xa5,0x20 },
{ "gray", 0x80,0x80,0x80 },
{ "green", 0x00,0x80,0x00 },
{ "greenyellow", 0xad,0xff,0x2f },
{ "honeydew", 0xf0,0xff,0xf0 },
{ "hotpink", 0xff,0x69,0xb4 },
{ "indianred", 0xcd,0x5c,0x5c },
{ "indigo", 0x4b,0x00,0x82 },
{ "ivory", 0xff,0xff,0xf0 },
{ "khaki", 0xf0,0xe6,0x8c },
{ "lavender", 0xe6,0xe6,0xfa },
{ "lavenderblush", 0xff,0xf0,0xf5 },
{ "lawngreen", 0x7c,0xfc,0x00 },
{ "lemonchiffon", 0xff,0xfa,0xcd },
{ "lightblue", 0xad,0xd8,0xe6 },
{ "lightcoral", 0xf0,0x80,0x80 },
{ "lightcyan", 0xe0,0xff,0xff },
{ "lightgoldenrodyellow", 0xfa,0xfa,0xd2 },
{ "lightgreen", 0x90,0xee,0x90 },
{ "lightgrey", 0xd3,0xd3,0xd3 },
{ "lightpink", 0xff,0xb6,0xc1 },
{ "lightsalmon", 0xff,0xa0,0x7a },
{ "lightseagreen", 0x20,0xb2,0xaa },
{ "lightskyblue", 0x87,0xce,0xfa },
{ "lightslategray", 0x77,0x88,0x99 },
{ "lightsteelblue", 0xb0,0xc4,0xde },
{ "lightyellow", 0xff,0xff,0xe0 },
{ "lime", 0x00,0xff,0x00 },
{ "limegreen", 0x32,0xcd,0x32 },
{ "linen", 0xfa,0xf0,0xe6 },
{ "magenta", 0xff,0x00,0xff },
{ "maroon", 0x80,0x00,0x00 },
{ "mediumaquamarine", 0x66,0xcd,0xaa },
{ "mediumblue", 0x00,0x00,0xcd },
{ "mediumorchid", 0xba,0x55,0xd3 },
{ "mediumpurple", 0x93,0x70,0xdb },
{ "mediumseagreen", 0x3c,0xb3,0x71 },
{ "mediumslateblue", 0x7b,0x68,0xee },
{ "mediumspringgreen", 0x00,0xfa,0x9a },
{ "mediumturquoise", 0x48,0xd1,0xcc },
{ "mediumvioletred", 0xc7,0x15,0x85 },
{ "midnightblue", 0x19,0x19,0x70 },
{ "mintcream", 0xf5,0xff,0xfa },
{ "mistyrose", 0xff,0xe4,0xe1 },
{ "moccasin", 0xff,0xe4,0xb5 },
{ "navajowhite", 0xff,0xde,0xad },
{ "navy", 0x00,0x00,0x80 },
{ "oldlace", 0xfd,0xf5,0xe6 },
{ "olive", 0x80,0x80,0x00 },
{ "olivedrab", 0x6b,0x8e,0x23 },
{ "orange", 0xff,0xa5,0x00 },
{ "orangered", 0xff,0x45,0x00 },
{ "orchid", 0xda,0x70,0xd6 },
{ "palegoldenrod", 0xee,0xe8,0xaa },
{ "palegreen", 0x98,0xfb,0x98 },
{ "paleturquoise", 0xaf,0xee,0xee },
{ "palevioletred", 0xdb,0x70,0x93 },
{ "papayawhip", 0xff,0xef,0xd5 },
{ "peachpuff", 0xff,0xda,0xb9 },
{ "peru", 0xcd,0x85,0x3f },
{ "pink", 0xff,0xc0,0xcb },
{ "plum", 0xdd,0xa0,0xdd },
{ "powderblue", 0xb0,0xe0,0xe6 },
{ "purple", 0x80,0x00,0x80 },
{ "red", 0xff,0x00,0x00 },
{ "rosybrown", 0xbc,0x8f,0x8f },
{ "royalblue", 0x41,0x69,0xe1 },
{ "saddlebrown", 0x8b,0x45,0x13 },
{ "salmon", 0xfa,0x80,0x72 },
{ "sandybrown", 0xf4,0xa4,0x60 },
{ "seagreen", 0x2e,0x8b,0x57 },
{ "seashell", 0xff,0xf5,0xee },
{ "sienna", 0xa0,0x52,0x2d },
{ "silver", 0xc0,0xc0,0xc0 },
{ "skyblue", 0x87,0xce,0xeb },
{ "slateblue", 0x6a,0x5a,0xcd },
{ "slategray", 0x70,0x80,0x90 },
{ "snow", 0xff,0xfa,0xfa },
{ "springgreen", 0x00,0xff,0x7f },
{ "steelblue", 0x46,0x82,0xb4 },
{ "tan", 0xd2,0xb4,0x8c },
{ "teal", 0x00,0x80,0x80 },
{ "thistle", 0xd8,0xbf,0xd8 },
{ "tomato", 0xff,0x63,0x47 },
{ "turquoise", 0x40,0xe0,0xd0 },
{ "violet", 0xee,0x82,0xee },
{ "wheat", 0xf5,0xde,0xb3 },
{ "white", 0xff,0xff,0xff },
{ "whitesmoke", 0xf5,0xf5,0xf5 },
{ "yellow", 0xff,0xff,0x00 },
{ "yellowgreen", 0x9a,0xcd,0x32 },
static constexpr const char* gColorNames[] = {
"aliceblue",
"antiquewhite",
"aqua",
"aquamarine",
"azure",
"beige",
"bisque",
"black",
"blanchedalmond",
"blue",
"blueviolet",
"brown",
"burlywood",
"cadetblue",
"chartreuse",
"chocolate",
"coral",
"cornflowerblue",
"cornsilk",
"crimson",
"cyan",
"darkblue",
"darkcyan",
"darkgoldenrod",
"darkgray",
"darkgreen",
"darkkhaki",
"darkmagenta",
"darkolivegreen",
"darkorange",
"darkorchid",
"darkred",
"darksalmon",
"darkseagreen",
"darkslateblue",
"darkslategray",
"darkturquoise",
"darkviolet",
"deeppink",
"deepskyblue",
"dimgray",
"dodgerblue",
"firebrick",
"floralwhite",
"forestgreen",
"fuchsia",
"gainsboro",
"ghostwhite",
"gold",
"goldenrod",
"gray",
"green",
"greenyellow",
"honeydew",
"hotpink",
"indianred",
"indigo",
"ivory",
"khaki",
"lavender",
"lavenderblush",
"lawngreen",
"lemonchiffon",
"lightblue",
"lightcoral",
"lightcyan",
"lightgoldenrodyellow",
"lightgreen",
"lightgrey",
"lightpink",
"lightsalmon",
"lightseagreen",
"lightskyblue",
"lightslategray",
"lightsteelblue",
"lightyellow",
"lime",
"limegreen",
"linen",
"magenta",
"maroon",
"mediumaquamarine",
"mediumblue",
"mediumorchid",
"mediumpurple",
"mediumseagreen",
"mediumslateblue",
"mediumspringgreen",
"mediumturquoise",
"mediumvioletred",
"midnightblue",
"mintcream",
"mistyrose",
"moccasin",
"navajowhite",
"navy",
"oldlace",
"olive",
"olivedrab",
"orange",
"orangered",
"orchid",
"palegoldenrod",
"palegreen",
"paleturquoise",
"palevioletred",
"papayawhip",
"peachpuff",
"peru",
"pink",
"plum",
"powderblue",
"purple",
"red",
"rosybrown",
"royalblue",
"saddlebrown",
"salmon",
"sandybrown",
"seagreen",
"seashell",
"sienna",
"silver",
"skyblue",
"slateblue",
"slategray",
"snow",
"springgreen",
"steelblue",
"tan",
"teal",
"thistle",
"tomato",
"turquoise",
"violet",
"wheat",
"white",
"whitesmoke",
"yellow",
"yellowgreen",
};
#pragma pack(pop)
static constexpr struct ColorRec {
uint8_t r, g, b;
} gColors[] = {
{ 0xf0,0xf8,0xff }, // aliceblue
{ 0xfa,0xeb,0xd7 }, // antiquewhite
{ 0x00,0xff,0xff }, // aqua
{ 0x7f,0xff,0xd4 }, // aquamarine
{ 0xf0,0xff,0xff }, // azure
{ 0xf5,0xf5,0xdc }, // beige
{ 0xff,0xe4,0xc4 }, // bisque
{ 0x00,0x00,0x00 }, // black
{ 0xff,0xeb,0xcd }, // blanchedalmond
{ 0x00,0x00,0xff }, // blue
{ 0x8a,0x2b,0xe2 }, // blueviolet
{ 0xa5,0x2a,0x2a }, // brown
{ 0xde,0xb8,0x87 }, // burlywood
{ 0x5f,0x9e,0xa0 }, // cadetblue
{ 0x7f,0xff,0x00 }, // chartreuse
{ 0xd2,0x69,0x1e }, // chocolate
{ 0xff,0x7f,0x50 }, // coral
{ 0x64,0x95,0xed }, // cornflowerblue
{ 0xff,0xf8,0xdc }, // cornsilk
{ 0xdc,0x14,0x3c }, // crimson
{ 0x00,0xff,0xff }, // cyan
{ 0x00,0x00,0x8b }, // darkblue
{ 0x00,0x8b,0x8b }, // darkcyan
{ 0xb8,0x86,0x0b }, // darkgoldenrod
{ 0xa9,0xa9,0xa9 }, // darkgray
{ 0x00,0x64,0x00 }, // darkgreen
{ 0xbd,0xb7,0x6b }, // darkkhaki
{ 0x8b,0x00,0x8b }, // darkmagenta
{ 0x55,0x6b,0x2f }, // darkolivegreen
{ 0xff,0x8c,0x00 }, // darkorange
{ 0x99,0x32,0xcc }, // darkorchid
{ 0x8b,0x00,0x00 }, // darkred
{ 0xe9,0x96,0x7a }, // darksalmon
{ 0x8f,0xbc,0x8f }, // darkseagreen
{ 0x48,0x3d,0x8b }, // darkslateblue
{ 0x2f,0x4f,0x4f }, // darkslategray
{ 0x00,0xce,0xd1 }, // darkturquoise
{ 0x94,0x00,0xd3 }, // darkviolet
{ 0xff,0x14,0x93 }, // deeppink
{ 0x00,0xbf,0xff }, // deepskyblue
{ 0x69,0x69,0x69 }, // dimgray
{ 0x1e,0x90,0xff }, // dodgerblue
{ 0xb2,0x22,0x22 }, // firebrick
{ 0xff,0xfa,0xf0 }, // floralwhite
{ 0x22,0x8b,0x22 }, // forestgreen
{ 0xff,0x00,0xff }, // fuchsia
{ 0xdc,0xdc,0xdc }, // gainsboro
{ 0xf8,0xf8,0xff }, // ghostwhite
{ 0xff,0xd7,0x00 }, // gold
{ 0xda,0xa5,0x20 }, // goldenrod
{ 0x80,0x80,0x80 }, // gray
{ 0x00,0x80,0x00 }, // green
{ 0xad,0xff,0x2f }, // greenyellow
{ 0xf0,0xff,0xf0 }, // honeydew
{ 0xff,0x69,0xb4 }, // hotpink
{ 0xcd,0x5c,0x5c }, // indianred
{ 0x4b,0x00,0x82 }, // indigo
{ 0xff,0xff,0xf0 }, // ivory
{ 0xf0,0xe6,0x8c }, // khaki
{ 0xe6,0xe6,0xfa }, // lavender
{ 0xff,0xf0,0xf5 }, // lavenderblush
{ 0x7c,0xfc,0x00 }, // lawngreen
{ 0xff,0xfa,0xcd }, // lemonchiffon
{ 0xad,0xd8,0xe6 }, // lightblue
{ 0xf0,0x80,0x80 }, // lightcoral
{ 0xe0,0xff,0xff }, // lightcyan
{ 0xfa,0xfa,0xd2 }, // lightgoldenrodyellow
{ 0x90,0xee,0x90 }, // lightgreen
{ 0xd3,0xd3,0xd3 }, // lightgrey
{ 0xff,0xb6,0xc1 }, // lightpink
{ 0xff,0xa0,0x7a }, // lightsalmon
{ 0x20,0xb2,0xaa }, // lightseagreen
{ 0x87,0xce,0xfa }, // lightskyblue
{ 0x77,0x88,0x99 }, // lightslategray
{ 0xb0,0xc4,0xde }, // lightsteelblue
{ 0xff,0xff,0xe0 }, // lightyellow
{ 0x00,0xff,0x00 }, // lime
{ 0x32,0xcd,0x32 }, // limegreen
{ 0xfa,0xf0,0xe6 }, // linen
{ 0xff,0x00,0xff }, // magenta
{ 0x80,0x00,0x00 }, // maroon
{ 0x66,0xcd,0xaa }, // mediumaquamarine
{ 0x00,0x00,0xcd }, // mediumblue
{ 0xba,0x55,0xd3 }, // mediumorchid
{ 0x93,0x70,0xdb }, // mediumpurple
{ 0x3c,0xb3,0x71 }, // mediumseagreen
{ 0x7b,0x68,0xee }, // mediumslateblue
{ 0x00,0xfa,0x9a }, // mediumspringgreen
{ 0x48,0xd1,0xcc }, // mediumturquoise
{ 0xc7,0x15,0x85 }, // mediumvioletred
{ 0x19,0x19,0x70 }, // midnightblue
{ 0xf5,0xff,0xfa }, // mintcream
{ 0xff,0xe4,0xe1 }, // mistyrose
{ 0xff,0xe4,0xb5 }, // moccasin
{ 0xff,0xde,0xad }, // navajowhite
{ 0x00,0x00,0x80 }, // navy
{ 0xfd,0xf5,0xe6 }, // oldlace
{ 0x80,0x80,0x00 }, // olive
{ 0x6b,0x8e,0x23 }, // olivedrab
{ 0xff,0xa5,0x00 }, // orange
{ 0xff,0x45,0x00 }, // orangered
{ 0xda,0x70,0xd6 }, // orchid
{ 0xee,0xe8,0xaa }, // palegoldenrod
{ 0x98,0xfb,0x98 }, // palegreen
{ 0xaf,0xee,0xee }, // paleturquoise
{ 0xdb,0x70,0x93 }, // palevioletred
{ 0xff,0xef,0xd5 }, // papayawhip
{ 0xff,0xda,0xb9 }, // peachpuff
{ 0xcd,0x85,0x3f }, // peru
{ 0xff,0xc0,0xcb }, // pink
{ 0xdd,0xa0,0xdd }, // plum
{ 0xb0,0xe0,0xe6 }, // powderblue
{ 0x80,0x00,0x80 }, // purple
{ 0xff,0x00,0x00 }, // red
{ 0xbc,0x8f,0x8f }, // rosybrown
{ 0x41,0x69,0xe1 }, // royalblue
{ 0x8b,0x45,0x13 }, // saddlebrown
{ 0xfa,0x80,0x72 }, // salmon
{ 0xf4,0xa4,0x60 }, // sandybrown
{ 0x2e,0x8b,0x57 }, // seagreen
{ 0xff,0xf5,0xee }, // seashell
{ 0xa0,0x52,0x2d }, // sienna
{ 0xc0,0xc0,0xc0 }, // silver
{ 0x87,0xce,0xeb }, // skyblue
{ 0x6a,0x5a,0xcd }, // slateblue
{ 0x70,0x80,0x90 }, // slategray
{ 0xff,0xfa,0xfa }, // snow
{ 0x00,0xff,0x7f }, // springgreen
{ 0x46,0x82,0xb4 }, // steelblue
{ 0xd2,0xb4,0x8c }, // tan
{ 0x00,0x80,0x80 }, // teal
{ 0xd8,0xbf,0xd8 }, // thistle
{ 0xff,0x63,0x47 }, // tomato
{ 0x40,0xe0,0xd0 }, // turquoise
{ 0xee,0x82,0xee }, // violet
{ 0xf5,0xde,0xb3 }, // wheat
{ 0xff,0xff,0xff }, // white
{ 0xf5,0xf5,0xf5 }, // whitesmoke
{ 0xff,0xff,0x00 }, // yellow
{ 0x9a,0xcd,0x32 }, // yellowgreen
};
const char* SkParse::FindNamedColor(const char* name, size_t len, SkColor* color) {
const auto* rec = std::lower_bound(std::begin(gNamedColors),
std::end (gNamedColors),
ColorRec{name, 0,0,0}, // key
[](const ColorRec& rec, const ColorRec& key) {
return strcmp(rec.name, key.name) < 0;
const auto rec = std::lower_bound(std::begin(gColorNames),
std::end (gColorNames),
name, // key
[](const char* name, const char* key) {
return strcmp(name, key) < 0;
});
if (rec == std::end(gNamedColors) || strcmp(name, rec->name)) {
if (rec == std::end(gColorNames) || strcmp(name, *rec)) {
return nullptr;
}
if (color) {
*color = SkColorSetRGB(rec->r, rec->g, rec->b);
int index = rec - gColorNames;
*color = SkColorSetRGB(gColors[index].r, gColors[index].g, gColors[index].b);
}
return name + strlen(rec->name);
return name + strlen(*rec);
}
// !!! move to char utilities