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: some names changed, no logical changes

Browse source
This commit is contained in:
Mira Grudzinska 2022-01-19 02:34:39 +01:00 • committed by Hermet Park
parent a5e5e48de4
commit dc518a83c8
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1093,7 +1093,7 @@ static void _handleCssClassAttr(SvgLoaderData* loader, SvgNode* node, const char
_copyCssStyleAttr(node, cssNode);
}
if (!cssClassFound) _postponeCloneNode(&loader->cloneCssStyleNodes, node, *cssClass);
if (!cssClassFound) _postponeCloneNode(&loader->nodesToStyle, node, *cssClass);
}
@ -3022,10 +3022,10 @@ static void _updateCssStyle(SvgNode* doc, SvgNode* cssStyle)
}
static void _clonePostponedCssStyleNodes(Array<SvgNodeIdPair>* cloneCssStyleNodes, SvgNode* cssStyle)
static void _stylePostponedNodes(Array<SvgNodeIdPair>* nodesToStyle, SvgNode* cssStyle)
{
for (uint32_t i = 0; i < cloneCssStyleNodes->count; ++i) {
auto nodeIdPair = cloneCssStyleNodes->data[i];
for (uint32_t i = 0; i < nodesToStyle->count; ++i) {
auto nodeIdPair = nodesToStyle->data[i];
//css styling: tag.name has higher priority than .name
if (auto cssNode = _findCssStyleNode(cssStyle, nodeIdPair.id, nodeIdPair.node->type)) {
@ -3214,7 +3214,7 @@ void SvgLoader::run(unsigned tid)
if (loaderData.gradients.count > 0) _updateGradient(loaderData.doc, &loaderData.gradients);
if (defs) _updateGradient(loaderData.doc, &defs->node.defs.gradients);
if (loaderData.cloneCssStyleNodes.count > 0) _clonePostponedCssStyleNodes(&loaderData.cloneCssStyleNodes, loaderData.cssStyle);
if (loaderData.nodesToStyle.count > 0) _stylePostponedNodes(&loaderData.nodesToStyle, loaderData.cssStyle);
//TODO: defs should be updated as well?
if (loaderData.cssStyle) _updateCssStyle(loaderData.doc, loaderData.cssStyle);
}

2
src/loaders/svg/tvgSvgLoaderCommon.h
View file

@ -413,7 +413,7 @@ struct SvgLoaderData
SvgStyleGradient* latestGradient = nullptr; //For stops
SvgParser* svgParse = nullptr;
Array<SvgNodeIdPair> cloneNodes;
Array<SvgNodeIdPair> cloneCssStyleNodes;
Array<SvgNodeIdPair> nodesToStyle;
int level = 0;
bool result = false;
bool style = false; //TODO: find a better sollution?