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/parser: clean up the exception handling mechanisms.

Browse source 
Since the parser has become stable enough,
remove the exceptions and instead rely on parser error handling.
This commit is contained in:
Hermet Park 2024-02-19 19:01:28 +09:00
parent b0540929e5
commit 6b63c85404
1 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -187,18 +187,11 @@ void LottieParser::getValue(PathSet& path)
enterObject();
while (auto key = nextObjectKey()) {
if (!strcmp(key, "i")) {
getValue(ins);
} else if (!strcmp(key, "o")) {
getValue(outs);
} else if (!strcmp(key, "v")) {
getValue(pts);
} else if (!strcmp(key, "c")) {
closed = getBool();
} else {
Error();
skip(key);
}
if (!strcmp(key, "i")) getValue(ins);
else if (!strcmp(key, "o")) getValue(outs);
else if (!strcmp(key, "v")) getValue(pts);
else if (!strcmp(key, "c")) closed = getBool();
else skip(key);
}
//exit properly from the array
@ -284,10 +277,8 @@ void LottieParser::getValue(uint8_t& val)
if (nextArrayValue()) val = (uint8_t)(getFloat() * 2.55f);
//discard rest
while (nextArrayValue()) getFloat();
} else if (peekType() == kNumberType) {
val = (uint8_t)(getFloat() * 2.55f);
} else {
Error();
val = (uint8_t)(getFloat() * 2.55f);
}
}
@ -299,10 +290,8 @@ void LottieParser::getValue(float& val)
if (nextArrayValue()) val = getFloat();
//discard rest
while (nextArrayValue()) getFloat();
} else if (peekType() == kNumberType) {
val = getFloat();
} else {
Error();
val = getFloat();
}
}
@ -627,10 +616,6 @@ LottieSolidStroke* LottieParser::parseSolidStroke()
enterArray();
while (nextArrayValue()) parseKeyFrame(path);
} else {
if (path.frames) {
Error();
return;
}
getValue(path.value);
}
} else skip(key);