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

lottie: enhance parsing of position's SeparateCoords

Browse source 
The "s" key does not have to appear at the beginning
of the position block. Previously, such cases would
result in a parsing error — now they are handled correctly.
This commit is contained in:
Mira Grudzinska 2025-05-06 22:15:35 +02:00 • committed by Hermet Park
parent 0b77659136
commit 2e03fbd630
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/loaders/lottie/tvgLottieModel.h
View file

@ -639,6 +639,12 @@ struct LottieTransform : LottieObject
LottieFloat y = 0.0f; LottieFloat y = 0.0f;
}; };
SeparateCoord* separateCoord()
{
if (!coords) coords = new SeparateCoord;
return coords;
}
struct RotationEx struct RotationEx
{ {
LottieFloat x = 0.0f; LottieFloat x = 0.0f;

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

@ -566,11 +566,15 @@ LottieTransform* LottieParser::parseTransform(bool ddd)
enterObject(); enterObject();
while (auto key = nextObjectKey()) { while (auto key = nextObjectKey()) {
if (KEY_AS("k")) parsePropertyInternal(transform->position); if (KEY_AS("k")) parsePropertyInternal(transform->position);
else if (KEY_AS("s") && getBool()) transform->coords = new LottieTransform::SeparateCoord; else if (KEY_AS("x"))
//check separateCoord to figure out whether "x(expression)" / "x(coord)" {
else if (transform->coords && KEY_AS("x")) parseProperty(transform->coords->x); //check separateCoord to figure out whether "x(expression)" / "x(coord)"
else if (transform->coords && KEY_AS("y")) parseProperty(transform->coords->y); if (peekType() == kStringType) {
else if (KEY_AS("x") && expressions) transform->position.exp = getExpression(getStringCopy(), comp, context.layer, context.parent, &transform->position); if (expressions) transform->position.exp = getExpression(getStringCopy(), comp, context.layer, context.parent, &transform->position);
else skip();
} else parseProperty(transform->separateCoord()->x);
}
else if (KEY_AS("y")) parseProperty(transform->separateCoord()->y);
else if (KEY_AS("sid")) registerSlot(transform, getString(), LottieProperty::Type::Vector); else if (KEY_AS("sid")) registerSlot(transform, getString(), LottieProperty::Type::Vector);
else if (KEY_AS("ix")) transform->position.ix = getInt(); else if (KEY_AS("ix")) transform->position.ix = getInt();
else skip(); else skip();