diff --git a/src/loaders/svg/tvgSvgLoader.cpp b/src/loaders/svg/tvgSvgLoader.cpp index 7ff86f85..7bae99d6 100644 --- a/src/loaders/svg/tvgSvgLoader.cpp +++ b/src/loaders/svg/tvgSvgLoader.cpp @@ -1661,7 +1661,6 @@ static SvgStyleGradient* _cloneGradient(SvgStyleGradient* from) grad->id = from->id ? _copyId(from->id->c_str()) : nullptr; grad->ref = from->ref ? _copyId(from->ref->c_str()) : nullptr; grad->spread = from->spread; - grad->usePercentage = from->usePercentage; grad->userSpace = from->userSpace; if (from->transform) { @@ -2063,8 +2062,6 @@ static SvgStyleGradient* _createRadialGradient(SvgLoaderData* loader, const char radialTags[i].tagRecalc(loader, grad->radial, grad->userSpace); } - grad->usePercentage = true; - return loader->svgParse->styleGrad; } @@ -2241,8 +2238,6 @@ static SvgStyleGradient* _createLinearGradient(SvgLoaderData* loader, const char linear_tags[i].tagRecalc(loader, grad->linear, grad->userSpace); } - grad->usePercentage = true; - return loader->svgParse->styleGrad; } diff --git a/src/loaders/svg/tvgSvgLoaderCommon.h b/src/loaders/svg/tvgSvgLoaderCommon.h index cbb699f4..37762dba 100644 --- a/src/loaders/svg/tvgSvgLoaderCommon.h +++ b/src/loaders/svg/tvgSvgLoaderCommon.h @@ -266,7 +266,6 @@ struct SvgStyleGradient Matrix* transform = nullptr; Array stops; bool userSpace = false; - bool usePercentage = false; ~SvgStyleGradient() { diff --git a/src/loaders/svg/tvgSvgSceneBuilder.cpp b/src/loaders/svg/tvgSvgSceneBuilder.cpp index 6d0c0a1a..08f7875f 100644 --- a/src/loaders/svg/tvgSvgSceneBuilder.cpp +++ b/src/loaders/svg/tvgSvgSceneBuilder.cpp @@ -46,12 +46,10 @@ static unique_ptr _applyLinearGradientProperty(SvgStyleGradient* int stopCount = 0; auto fillGrad = LinearGradient::gen(); - if (g->usePercentage) { - g->linear->x1 = g->linear->x1 * rw + rx; - g->linear->y1 = g->linear->y1 * rh + ry; - g->linear->x2 = g->linear->x2 * rw + rx; - g->linear->y2 = g->linear->y2 * rh + ry; - } + g->linear->x1 = g->linear->x1 * rw + rx; + g->linear->y1 = g->linear->y1 * rh + ry; + g->linear->x2 = g->linear->x2 * rw + rx; + g->linear->y2 = g->linear->y2 * rh + ry; if (g->transform) { //Calc start point @@ -109,13 +107,11 @@ static unique_ptr _applyRadialGradientProperty(SvgStyleGradient* radius = sqrtf(pow(min, 2) + pow(min, 2)) / sqrtf(2.0f); } - if (g->usePercentage) { - g->radial->cx = g->radial->cx * rw + rx; - g->radial->cy = g->radial->cy * rh + ry; - g->radial->r = g->radial->r * radius; - g->radial->fx = g->radial->fx * rw + rx; - g->radial->fy = g->radial->fy * rh + ry; - } + g->radial->cx = g->radial->cx * rw + rx; + g->radial->cy = g->radial->cy * rh + ry; + g->radial->r = g->radial->r * radius; + g->radial->fx = g->radial->fx * rw + rx; + g->radial->fy = g->radial->fy * rh + ry; //TODO: Radial gradient transformation - all tests possible after rx/ry implementation if (g->transform) {