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

lottie: prevent mem leak
Some checks are pending
Android / build_x86_64 (push) Waiting to run
Details
Android / build_aarch64 (push) Waiting to run
Details
iOS / build_x86_64 (push) Waiting to run
Details
iOS / build_arm64 (push) Waiting to run
Details
macOS / build (push) Waiting to run
Details
macOS / compact_test (push) Waiting to run
Details
macOS / unit_test (push) Waiting to run
Details
Ubuntu / build (push) Waiting to run
Details
Ubuntu / compact_test (push) Waiting to run
Details
Ubuntu / unit_test (push) Waiting to run
Details
Windows / build (push) Waiting to run
Details
Windows / compact_test (push) Waiting to run
Details
Windows / unit_test (push) Waiting to run
Details

Browse source 
Masks of pooled shapes were not unrefed, filling up
the memory pool.
This commit is contained in:
Mira Grudzinska 2025-07-02 14:17:35 +02:00 • committed by Hermet Park
parent 5e17fe0034
commit ea8abe8912
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1203,7 +1203,7 @@ void LottieBuilder::updateMasks(LottieLayer* layer, float frameNo)
//the first mask //the first mask
if (!pShape) { if (!pShape) {
pShape = layer->pooling(); pShape = layer->pooling();
pShape->reset(); SHAPE(pShape)->reset();
auto compMethod = (method == MaskMethod::Subtract || method == MaskMethod::InvAlpha) ? MaskMethod::InvAlpha : MaskMethod::Alpha; auto compMethod = (method == MaskMethod::Subtract || method == MaskMethod::InvAlpha) ? MaskMethod::InvAlpha : MaskMethod::Alpha;
//Cheaper. Replace the masking with a clipper //Cheaper. Replace the masking with a clipper
if (layer->masks.count == 1 && compMethod == MaskMethod::Alpha) { if (layer->masks.count == 1 && compMethod == MaskMethod::Alpha) {
@ -1215,13 +1215,11 @@ void LottieBuilder::updateMasks(LottieLayer* layer, float frameNo)
//Chain mask composition //Chain mask composition
} else if (pMethod != method || pOpacity != opacity || (method != MaskMethod::Subtract && method != MaskMethod::Difference)) { } else if (pMethod != method || pOpacity != opacity || (method != MaskMethod::Subtract && method != MaskMethod::Difference)) {
auto shape = layer->pooling(); auto shape = layer->pooling();
shape->reset(); SHAPE(shape)->reset();
pShape->mask(shape, method); pShape->mask(shape, method);
pShape = shape; pShape = shape;
} }
pShape->trimpath(0.0f, 1.0f);
pShape->strokeWidth(0.0f);
pShape->fill(255, 255, 255, opacity); pShape->fill(255, 255, 255, opacity);
pShape->transform(layer->cache.matrix); pShape->transform(layer->cache.matrix);