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

SvgLoader: Gradient use non-premultipied color

Browse source 
Follow color policy of tvg:Shape.
This commit is contained in:
JunsuChoi 2020-09-04 12:23:20 +09:00 • committed by Hermet Park
parent 1f05c249af
commit 0d2982ff76
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/loaders/svg/tvgSvgSceneBuilder.cpp
View file

@ -95,17 +95,14 @@ unique_ptr<LinearGradient> _applyLinearGradientProperty(SvgStyleGradient* g, Sha
//Update the stops //Update the stops
stopCount = g->stops.cnt; stopCount = g->stops.cnt;
if (stopCount > 0) { if (stopCount > 0) {
float opacity;
float fopacity = fillOpacity / 255.0f; //fill opacity if any exists.
stops = (Fill::ColorStop*)calloc(stopCount, sizeof(Fill::ColorStop)); stops = (Fill::ColorStop*)calloc(stopCount, sizeof(Fill::ColorStop));
for (uint32_t i = 0; i < g->stops.cnt; ++i) { for (uint32_t i = 0; i < g->stops.cnt; ++i) {
auto colorStop = g->stops.list[i]; auto colorStop = g->stops.list[i];
//Use premultiplied color //Use premultiplied color
opacity = ((float)colorStop->a / 255.0f) * fopacity; stops[i].r = colorStop->r;
stops[i].r = colorStop->r * opacity; stops[i].g = colorStop->g;
stops[i].g = colorStop->g * opacity; stops[i].b = colorStop->b;
stops[i].b = colorStop->b * opacity; stops[i].a = (colorStop->a * fillOpacity) / 255.0f;
stops[i].a = colorStop->a * fopacity;
stops[i].offset = colorStop->offset; stops[i].offset = colorStop->offset;
} }
fillGrad->colorStops(stops, stopCount); fillGrad->colorStops(stops, stopCount);
@ -180,17 +177,14 @@ unique_ptr<RadialGradient> _applyRadialGradientProperty(SvgStyleGradient* g, Sha
//Update the stops //Update the stops
stopCount = g->stops.cnt; stopCount = g->stops.cnt;
if (stopCount > 0) { if (stopCount > 0) {
float opacity;
float fopacity = fillOpacity / 255.0f; //fill opacity if any exists.
stops = (Fill::ColorStop*)calloc(stopCount, sizeof(Fill::ColorStop)); stops = (Fill::ColorStop*)calloc(stopCount, sizeof(Fill::ColorStop));
for (uint32_t i = 0; i < g->stops.cnt; ++i) { for (uint32_t i = 0; i < g->stops.cnt; ++i) {
auto colorStop = g->stops.list[i]; auto colorStop = g->stops.list[i];
//Use premultiplied color //Use premultiplied color
opacity = ((float)colorStop->a / 255.0f) * fopacity; stops[i].r = colorStop->r;
stops[i].r = colorStop->r * opacity; stops[i].g = colorStop->g;
stops[i].g = colorStop->g * opacity; stops[i].b = colorStop->b;
stops[i].b = colorStop->b * opacity; stops[i].a = (colorStop->a * fillOpacity) / 255.0f;
stops[i].a = colorStop->a * fopacity;
stops[i].offset = colorStop->offset; stops[i].offset = colorStop->offset;
} }
fillGrad->colorStops(stops, stopCount); fillGrad->colorStops(stops, stopCount);
@ -232,7 +226,7 @@ void _applyProperty(SvgNode* node, Shape* vg, float vx, float vy, float vw, floa
if (style->opacity < 255) { if (style->opacity < 255) {
uint8_t r, g, b, a; uint8_t r, g, b, a;
vg->fill(&r, &g, &b, &a); vg->fill(&r, &g, &b, &a);
vg->fill(r, g, b, (a * style->opacity) / 255.0); vg->fill(r, g, b, (a * style->opacity) / 255.0f);
} }
if (node->type == SvgNodeType::G) return; if (node->type == SvgNodeType::G) return;
@ -263,7 +257,7 @@ void _applyProperty(SvgNode* node, Shape* vg, float vx, float vy, float vw, floa
if (style->opacity < 255) { if (style->opacity < 255) {
uint8_t r, g, b, a; uint8_t r, g, b, a;
vg->strokeColor(&r, &g, &b, &a); vg->strokeColor(&r, &g, &b, &a);
vg->stroke(r, g, b, (a * style->opacity) / 255.0); vg->stroke(r, g, b, (a * style->opacity) / 255.0f);
} }
} }