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

lottie: resolved minor memory leaks

Browse source
This commit is contained in:
Hermet Park 2025-02-14 00:23:47 +09:00 • committed by Hermet Park
parent ddcbbf771f
commit 305da05b1b
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/loaders/lottie/tvgLottieBuilder.cpp
View file

@ -1269,6 +1269,7 @@ void LottieBuilder::updateStrokeEffect(LottieLayer* layer, LottieFxStroke* effec
return true; return true;
}; };
accessor->set(layer->scene, f, nullptr); accessor->set(layer->scene, f, nullptr);
delete(accessor);
} }
layer->scene->mask(shape, MaskMethod::Alpha); layer->scene->mask(shape, MaskMethod::Alpha);

8
src/loaders/lottie/tvgLottieParser.cpp
View file

@ -44,8 +44,6 @@ static unsigned long _int2str(int num)
LottieExpression* LottieParser::getExpression(char* code, LottieComposition* comp, LottieLayer* layer, LottieObject* object, LottieProperty* property) LottieExpression* LottieParser::getExpression(char* code, LottieComposition* comp, LottieLayer* layer, LottieObject* object, LottieProperty* property)
{ {
if (!expressions) return nullptr;
if (!comp->expressions) comp->expressions = true; if (!comp->expressions) comp->expressions = true;
auto inst = new LottieExpression; auto inst = new LottieExpression;
@ -479,7 +477,7 @@ void LottieParser::parseProperty(T& prop, LottieObject* obj)
while (auto key = nextObjectKey()) { while (auto key = nextObjectKey()) {
if (KEY_AS("k")) parsePropertyInternal(prop); if (KEY_AS("k")) parsePropertyInternal(prop);
else if (obj && KEY_AS("sid")) registerSlot<type>(obj, getString()); else if (obj && KEY_AS("sid")) registerSlot<type>(obj, getString());
else if (KEY_AS("x")) prop.exp = getExpression(getStringCopy(), comp, context.layer, context.parent, &prop); else if (KEY_AS("x") && expressions) prop.exp = getExpression(getStringCopy(), comp, context.layer, context.parent, &prop);
else if (KEY_AS("ix")) prop.ix = getInt(); else if (KEY_AS("ix")) prop.ix = getInt();
else skip(); else skip();
} }
@ -568,7 +566,7 @@ LottieTransform* LottieParser::parseTransform(bool ddd)
//check separateCoord to figure out whether "x(expression)" / "x(coord)" //check separateCoord to figure out whether "x(expression)" / "x(coord)"
else if (transform->coords && KEY_AS("x")) parseProperty<LottieProperty::Type::Float>(transform->coords->x); else if (transform->coords && KEY_AS("x")) parseProperty<LottieProperty::Type::Float>(transform->coords->x);
else if (transform->coords && KEY_AS("y")) parseProperty<LottieProperty::Type::Float>(transform->coords->y); else if (transform->coords && KEY_AS("y")) parseProperty<LottieProperty::Type::Float>(transform->coords->y);
else if (KEY_AS("x")) transform->position.exp = getExpression(getStringCopy(), comp, context.layer, context.parent, &transform->position); else if (KEY_AS("x") && expressions) transform->position.exp = getExpression(getStringCopy(), comp, context.layer, context.parent, &transform->position);
else if (KEY_AS("sid")) registerSlot<LottieProperty::Type::Position>(transform, getString()); else if (KEY_AS("sid")) registerSlot<LottieProperty::Type::Position>(transform, getString());
else skip(); else skip();
} }
@ -657,7 +655,7 @@ void LottieParser::getPathSet(LottiePathSet& path)
} else { } else {
getValue(path.value); getValue(path.value);
} }
} else if (KEY_AS("x")) { } else if (KEY_AS("x") && expressions) {
path.exp = getExpression(getStringCopy(), comp, context.layer, context.parent, &path); path.exp = getExpression(getStringCopy(), comp, context.layer, context.parent, &path);
} else skip(); } else skip();
} }