blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 05:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Default color palette definitions

Browse source
This commit is contained in:
Dan Paulat 2022-12-29 00:19:39 -06:00
parent 6422377e1a
commit 779d03c576
16 changed files with 295 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
wxdata/source/scwx/common/color_table.cpp
View file

@ -68,7 +68,7 @@ public:
ColorTable::ColorTable() : p(std::make_unique<ColorTableImpl>()) {}
ColorTable::~ColorTable() = default;
ColorTable::ColorTable(ColorTable&&) noexcept = default;
ColorTable::ColorTable(ColorTable&&) noexcept = default;
ColorTable& ColorTable::operator=(ColorTable&&) noexcept = default;
boost::gil::rgba8_pixel_t ColorTable::rf_color() const
@ -268,16 +268,19 @@ ParseColor(const std::vector<std::string>& tokenList,
bool hasAlpha)
{
uint8_t r;
uint8_t g;
uint8_t b;
uint8_t r {};
uint8_t g {};
uint8_t b {};
uint8_t a = 255;
if (colorMode == ColorMode::RGBA)
{
r = StringToDecimal<uint8_t>(tokenList[startIndex + 0]);
g = StringToDecimal<uint8_t>(tokenList[startIndex + 1]);
b = StringToDecimal<uint8_t>(tokenList[startIndex + 2]);
if (tokenList.size() >= startIndex + 3)
{
r = StringToDecimal<uint8_t>(tokenList[startIndex + 0]);
g = StringToDecimal<uint8_t>(tokenList[startIndex + 1]);
b = StringToDecimal<uint8_t>(tokenList[startIndex + 2]);
}
if (hasAlpha && tokenList.size() >= startIndex + 4)
{
@ -286,9 +289,17 @@ ParseColor(const std::vector<std::string>& tokenList,
}
else // if (colorMode == ColorMode::HSLuv)
{
double h = std::stod(tokenList[startIndex + 0]);
double s = std::stod(tokenList[startIndex + 1]);
double l = std::stod(tokenList[startIndex + 2]);
double h {};
double s {};
double l {};
if (tokenList.size() >= startIndex + 3)
{
h = std::stod(tokenList[startIndex + 0]);
s = std::stod(tokenList[startIndex + 1]);
l = std::stod(tokenList[startIndex + 2]);
}
double dr;
double dg;
double db;