git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-14 12:04:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

svg_loader: Adjust hsl values out of range

Browse source 
The range of saturation and brightness values is 0 ~ 100% and range of hue is 0 ~ 360.
If a value greater than 100% is loaded, it will be modified to be 100%.

issue: https://github.com/thorvg/thorvg/issues/2678
This commit is contained in:
JunsuChoi 2024-08-26 13:09:14 +09:00 • committed by Hermet Park
parent d7405e7be8
commit faec19bff6
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/loaders/svg/tvgSvgLoader.cpp
View file

@ -588,6 +588,11 @@ static bool _hslToRgb(float hue, float saturation, float brightness, uint8_t* re
float _red = 0, _green = 0, _blue = 0; float _red = 0, _green = 0, _blue = 0;
uint32_t i = 0; uint32_t i = 0;
while (hue < 0) hue += 360.0f;
hue = fmod(hue, 360.0f);
saturation = saturation > 0 ? std::min(saturation, 1.0f) : 0.0f;
brightness = brightness > 0 ? std::min(brightness, 1.0f) : 0.0f;
if (tvg::zero(saturation)) _red = _green = _blue = brightness; if (tvg::zero(saturation)) _red = _green = _blue = brightness;
else { else {
if (tvg::equal(hue, 360.0)) hue = 0.0f; if (tvg::equal(hue, 360.0)) hue = 0.0f;
@ -714,7 +719,6 @@ static bool _toColor(const char* str, uint8_t* r, uint8_t* g, uint8_t* b, char**
const char* hue = nullptr; const char* hue = nullptr;
if (_parseNumber(&content, &hue, &th) && hue) { if (_parseNumber(&content, &hue, &th) && hue) {
const char* saturation = nullptr; const char* saturation = nullptr;
th = float(uint32_t(th) % 360);
hue = _skipSpace(hue, nullptr); hue = _skipSpace(hue, nullptr);
hue = (char*)_skipComma(hue); hue = (char*)_skipComma(hue);
hue = _skipSpace(hue, nullptr); hue = _skipSpace(hue, nullptr);