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

svg_loader: optimize data delivery.

Browse source 
We know how this shape is passed,
so don't use unique_ptr to save data size.

Change-Id: I02410692199b9cee701c206246ceea5988d06726
This commit is contained in:
Hermet Park 2020-07-16 17:03:44 +09:00
parent e3218a8a9a
commit 33b067eb0a
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/loaders/svg_loader/tvgSvgSceneBuilder.cpp
View file

@ -221,7 +221,7 @@ unique_ptr<RadialGradient> _applyRadialGradientProperty(SvgStyleGradient* g, Sha
} }
unique_ptr<Shape> _applyProperty(SvgNode* node, unique_ptr<Shape> vg, float vx, float vy, float vw, float vh) void _applyProperty(SvgNode* node, Shape* vg, float vx, float vy, float vw, float vh)
{ {
SvgStyleProperty* style = node->style; SvgStyleProperty* style = node->style;
@ -234,7 +234,7 @@ unique_ptr<Shape> _applyProperty(SvgNode* node, unique_ptr<Shape> vg, float vx,
if (!(fabsf(tx) <= FLT_EPSILON) && !(fabsf(ty) <= FLT_EPSILON)) vg->translate(tx, ty); if (!(fabsf(tx) <= FLT_EPSILON) && !(fabsf(ty) <= FLT_EPSILON)) vg->translate(tx, ty);
} }
if (node->type == SvgNodeType::Doc) return vg; if (node->type == SvgNodeType::Doc) return;
//If fill property is nullptr then do nothing //If fill property is nullptr then do nothing
if (style->fill.paint.none) { if (style->fill.paint.none) {
@ -243,10 +243,10 @@ unique_ptr<Shape> _applyProperty(SvgNode* node, unique_ptr<Shape> vg, float vx,
if (!style->fill.paint.gradient->userSpace) vg->bounds(&vx, &vy, &vw, &vh); if (!style->fill.paint.gradient->userSpace) vg->bounds(&vx, &vy, &vw, &vh);
if (style->fill.paint.gradient->type == SvgGradientType::Linear) { if (style->fill.paint.gradient->type == SvgGradientType::Linear) {
auto linear = _applyLinearGradientProperty(style->fill.paint.gradient, vg.get(), vx, vy, vw, vh); auto linear = _applyLinearGradientProperty(style->fill.paint.gradient, vg, vx, vy, vw, vh);
vg->fill(move(linear)); vg->fill(move(linear));
} else if (style->fill.paint.gradient->type == SvgGradientType::Radial) { } else if (style->fill.paint.gradient->type == SvgGradientType::Radial) {
auto radial = _applyRadialGradientProperty(style->fill.paint.gradient, vg.get(), vx, vy, vw, vh); auto radial = _applyRadialGradientProperty(style->fill.paint.gradient, vg, vx, vy, vw, vh);
vg->fill(move(radial)); vg->fill(move(radial));
} }
} else if (style->fill.paint.curColor) { } else if (style->fill.paint.curColor) {
@ -267,7 +267,7 @@ unique_ptr<Shape> _applyProperty(SvgNode* node, unique_ptr<Shape> vg, float vx,
vg->fill(((float)r) * fa, ((float)g) * fa, ((float)b) * fa, ((float)a) * fa); vg->fill(((float)r) * fa, ((float)g) * fa, ((float)b) * fa, ((float)a) * fa);
} }
if (node->type == SvgNodeType::G) return vg; if (node->type == SvgNodeType::G) return;
//Apply the stroke style property //Apply the stroke style property
vg->stroke(style->stroke.width); vg->stroke(style->stroke.width);
@ -298,7 +298,6 @@ unique_ptr<Shape> _applyProperty(SvgNode* node, unique_ptr<Shape> vg, float vx,
float fa = ((float)style->opacity / 255.0); float fa = ((float)style->opacity / 255.0);
vg->stroke(((float)r) * fa, ((float)g) * fa, ((float)b) * fa, ((float)a) * fa); vg->stroke(((float)r) * fa, ((float)g) * fa, ((float)b) * fa, ((float)a) * fa);
} }
return vg;
} }
@ -351,7 +350,7 @@ unique_ptr<Shape> _shapeBuildHelper(SvgNode* node, float vx, float vy, float vw,
break; break;
} }
} }
shape = move(_applyProperty(node, move(shape), vx, vy, vw, vh)); _applyProperty(node, shape.get(), vx, vy, vw, vh);
return shape; return shape;
} }