Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move GetColorFromString away from strtol #8867

Merged
merged 1 commit into from
Apr 4, 2024
Merged

Move GetColorFromString away from strtol #8867

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 41 additions & 40 deletions source/uwp/SharedRenderer/lib/Util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ std::wstring StringToWString(std::string_view in)

winrt::hstring UTF8ToHString(std::string_view in)
{
return winrt::hstring{StringToWString(in)};
return winrt::hstring{ StringToWString(in) };
}

std::string HStringToUTF8(winrt::hstring const& in)
Expand All @@ -107,60 +107,61 @@ std::optional<double> TryHStringToDouble(winrt::hstring const& in)
}
}

inline uint8_t GetColorChannelFromString(const std::string& colorString, const uint8_t defaultColorValue = 0x0)
{
uint8_t colorValue;

auto [ptr, ec] = std::from_chars(colorString.data(), colorString.data() + colorString.size(), colorValue, 16);
if (ec == std::errc())
{
return colorValue;
}

return defaultColorValue;
}

// Get a Color object from color string
// Expected formats are "#AARRGGBB" (with alpha channel) and "#RRGGBB" (without alpha channel)
winrt::Windows::UI::Color GetColorFromString(const std::string& colorString)
{
winrt::Windows::UI::Color color{};
if (colorString.length() > 0 && colorString.front() == '#')
{
// Get the pure hex value (without #)
std::string hexColorString = colorString.substr(1, std::string::npos);

std::regex colorWithAlphaRegex("[0-9a-f]{8}", std::regex_constants::icase);
if (regex_match(hexColorString, colorWithAlphaRegex))
{
// If color string has alpha channel, extract and set to color
std::string alphaString = hexColorString.substr(0, 2);

auto alpha = strtol(alphaString.c_str(), nullptr, 16);

color.A = static_cast<uint8_t>(alpha);

hexColorString = hexColorString.substr(2, std::string::npos);
}
else
static const std::regex colorRegex("^#([0-9a-f]{2})?([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$", std::regex_constants::icase);
enum ColorMatchGroup : size_t
{
// Otherwise, set full opacity
std::string alphaString = "FF";
auto alpha = strtol(alphaString.c_str(), nullptr, 16);
color.A = static_cast<uint8_t>(alpha);
}

// A valid string at this point should have 6 hex characters (RRGGBB)
std::regex colorWithoutAlphaRegex("[0-9a-f]{6}", std::regex_constants::icase);
if (regex_match(hexColorString, colorWithoutAlphaRegex))
Alpha = 1,
Red = 2,
Green = 3,
Blue = 4
};

std::smatch colorMatch;
if (std::regex_match(colorString, colorMatch, colorRegex))
{
// Then set all other Red, Green, and Blue channels
std::string redString = hexColorString.substr(0, 2);
auto red = strtol(redString.c_str(), nullptr, 16);

std::string greenString = hexColorString.substr(2, 2);
auto green = strtol(greenString.c_str(), nullptr, 16);

std::string blueString = hexColorString.substr(4, 2);
auto blue = strtol(blueString.c_str(), nullptr, 16);
constexpr uint8_t alphaDefault = 0xFF;
color.A = alphaDefault;
if (colorMatch[ColorMatchGroup::Alpha].matched)
{
// set alpha if we found it
color.A = GetColorChannelFromString(colorMatch[ColorMatchGroup::Alpha].str(), alphaDefault);
}

color.R = static_cast<uint8_t>(red);
color.G = static_cast<uint8_t>(green);
color.B = static_cast<uint8_t>(blue);
// set RGB if we found them all
if (colorMatch[ColorMatchGroup::Red].matched && colorMatch[ColorMatchGroup::Green].matched &&
colorMatch[ColorMatchGroup::Blue].matched)
{
color.R = GetColorChannelFromString(colorMatch[ColorMatchGroup::Red].str());
color.G = GetColorChannelFromString(colorMatch[ColorMatchGroup::Green].str());
color.B = GetColorChannelFromString(colorMatch[ColorMatchGroup::Blue].str());

return color;
return color;
}
}
}

// All other formats are ignored (set alpha to 0)
color.A = static_cast<uint8_t>(0);
color.A = 0;

return color;
}
Expand Down
Loading