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

lottie/expressions: hotfix

Browse source 
- fixed a memory leak.
- corrected loopIn key value.
This commit is contained in:
Hermet Park 2024-07-26 12:27:37 +09:00
parent 267a467dab
commit 84475df8ab
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/loaders/lottie/tvgLottieExpressions.cpp
View file

@ -883,9 +883,7 @@ static jerry_value_t _loopIn(const jerry_call_info_t* info, const jerry_value_t
if (!_loopInCommon(exp, args, argsCnt)) return jerry_undefined(); if (!_loopInCommon(exp, args, argsCnt)) return jerry_undefined();
if (argsCnt > 1) { if (argsCnt > 1) exp->loop.key = jerry_value_as_int32(args[1]);
exp->loop.key = exp->comp->frameAtTime((float)jerry_value_as_int32(args[1]));
}
auto obj = jerry_object(); auto obj = jerry_object();
jerry_object_set_native_ptr(obj, nullptr, exp->property); jerry_object_set_native_ptr(obj, nullptr, exp->property);
@ -1194,7 +1192,10 @@ void LottieExpressions::buildGlobal(LottieExpression* exp)
void LottieExpressions::buildComp(jerry_value_t context, float frameNo, LottieLayer* comp, LottieExpression* exp) void LottieExpressions::buildComp(jerry_value_t context, float frameNo, LottieLayer* comp, LottieExpression* exp)
{ {
jerry_object_set_native_ptr(context, &freeCb, _expcontent(exp, frameNo, comp)); auto data = static_cast<ExpContent*>(jerry_object_get_native_ptr(context, &freeCb));
data->exp = exp;
data->frameNo = frameNo;
data->obj = comp;
//layer(index) / layer(name) / layer(otherLayer, reIndex) //layer(index) / layer(name) / layer(otherLayer, reIndex)
auto layer = jerry_function_external(_layer); auto layer = jerry_function_external(_layer);
@ -1257,11 +1258,13 @@ jerry_value_t LottieExpressions::buildGlobal()
//comp(name) //comp(name)
comp = jerry_function_external(_comp); comp = jerry_function_external(_comp);
jerry_object_set_native_ptr(comp, &freeCb, _expcontent(nullptr, 0.0f, nullptr));
jerry_object_set_sz(global, "comp", comp); jerry_object_set_sz(global, "comp", comp);
//footage(name) //footage(name)
thisComp = jerry_object(); thisComp = jerry_object();
jerry_object_set_native_ptr(thisComp, &freeCb, _expcontent(nullptr, 0.0f, nullptr));
jerry_object_set_sz(global, "thisComp", thisComp); jerry_object_set_sz(global, "thisComp", thisComp);
thisLayer = jerry_object(); thisLayer = jerry_object();