mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

rework: update nanosvg c5447dc

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
TangoCash
2021-11-03 11:00:45 +01:00
committed by Thilo Graf
parent dbe199b64c
commit 9190e44683
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/driver/pictureviewer/nanosvg.h
View File

@@ -1389,7 +1389,7 @@ static unsigned int nsvg__parseColorRGB(const char* str)
return NSVG_RGB(r, g, b); return NSVG_RGB(r, g, b);
if (sscanf(str, "rgb(%u%%, %u%%, %u%%)", &r, &g, &b) == 3) // decimal integer percentage if (sscanf(str, "rgb(%u%%, %u%%, %u%%)", &r, &g, &b) == 3) // decimal integer percentage
{ {
r = (r <= 100) ? ((r*255)/100) : 255; // FLTK: clip percentages >100 r = (r <= 100) ? ((r*255)/100) : 255;
g = (g <= 100) ? ((g*255)/100) : 255; g = (g <= 100) ? ((g*255)/100) : 255;
b = (b <= 100) ? ((b*255)/100) : 255; b = (b <= 100) ? ((b*255)/100) : 255;
return NSVG_RGB(r, g, b); return NSVG_RGB(r, g, b);
@@ -1399,26 +1399,25 @@ static unsigned int nsvg__parseColorRGB(const char* str)
static unsigned int nsvg__parseColorRGBA(const char* str) static unsigned int nsvg__parseColorRGBA(const char* str)
{ {
int r = -1, g = -1, b = -1; int r = 0, g = 0, b = 0;
float a = -1; float a = 1.0;
char s1[32]="", s2[32]="", s3[32]=""; if (sscanf(str, "rgba(%u, %u, %u, %f)", &r, &g, &b, &a) == 4) // decimal integers with alpha
sscanf(str + 5, "%d%[%%, \t]%d%[%%, \t]%d%[%%, \t]%f", &r, s1, &g, s2, &b, s3, &a);
if (strchr(s1, '%'))
{ {
r = (r <= 100) ? ((r*255)/100) : 255; // FLTK: clip percentages >100 r = (r <= 255) ? r : 255;
g = (g <= 100) ? ((g*255)/100) : 255;
b = (b <= 100) ? ((b*255)/100) : 255;
a = (a <= 100) ? ((a*255)/100) : 255;
return NSVG_RGBA(r,g,b,a);
}
else
{
r = (r <= 255) ? r : 255; // FLTK: clip percentages >100
g = (g <= 255) ? g : 255; g = (g <= 255) ? g : 255;
b = (b <= 255) ? b : 255; b = (b <= 255) ? b : 255;
a = (a <= 1.0) ? a*255 : 255; a = (a <= 1.0) ? a*255 : 255;
return NSVG_RGBA(r,g,b,a); return NSVG_RGBA(r, g, b, a);
} }
if (sscanf(str, "rgba(%u%%, %u%%, %u%%, %f)", &r, &g, &b, &a) == 4) // decimal integer percentage with alpha
{
r = (r <= 100) ? ((r*255)/100) : 255;
g = (g <= 100) ? ((g*255)/100) : 255;
b = (b <= 100) ? ((b*255)/100) : 255;
a = (a <= 100) ? ((a*255)/100) : 255;
return NSVG_RGBA(r, g, b, a);
}
return NSVG_RGBA(128, 128, 128, 255);
} }
typedef struct NSVGNamedColor typedef struct NSVGNamedColor