From 3126a21d23f231ee7f4f4e3793de31dcdefaadb7 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Tue, 30 Nov 2021 12:56:46 +0900 Subject: [PATCH] sw_engine SWRaster: Initialize uninitialized local variable --- src/lib/sw_engine/tvgSwRaster.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/lib/sw_engine/tvgSwRaster.cpp b/src/lib/sw_engine/tvgSwRaster.cpp index 6067a07..a637a75 100644 --- a/src/lib/sw_engine/tvgSwRaster.cpp +++ b/src/lib/sw_engine/tvgSwRaster.cpp @@ -641,6 +641,7 @@ static bool _rasterUpScaledRleRGBAImage(SwSurface* surface, const SwImage* image static bool _transformedRleRGBAImage(SwSurface* surface, const SwImage* image, const Matrix* transform, uint32_t opacity) { Matrix itransform; + mathIdentity(&itransform); if (transform && !mathInverse(transform, &itransform)) return false; auto halfScale = _halfScale(image->scale); @@ -653,7 +654,7 @@ static bool _transformedRleRGBAImage(SwSurface* surface, const SwImage* image, c return _rasterTransformedMaskedRleRGBAImage(surface, image, &itransform, surface->blender.alpha); } else if (surface->compositor->method == CompositeMethod::InvAlphaMask) { return _rasterTransformedMaskedRleRGBAImage(surface, image, &itransform, surface->blender.ialpha); - } + } //Transformed + Down Scaled } else if (image->scale < DOWN_SCALE_TOLERANCE) { if (surface->compositor->method == CompositeMethod::AlphaMask) { @@ -661,14 +662,13 @@ static bool _transformedRleRGBAImage(SwSurface* surface, const SwImage* image, c } else if (surface->compositor->method == CompositeMethod::InvAlphaMask) { return _rasterDownScaledMaskedRleRGBAImage(surface, image, &itransform, halfScale, surface->blender.ialpha); } - //Transformed + Up Scaled } else { if (surface->compositor->method == CompositeMethod::AlphaMask) { return _rasterUpScaledMaskedRleRGBAImage(surface, image, &itransform, surface->blender.alpha); } else if (surface->compositor->method == CompositeMethod::InvAlphaMask) { return _rasterUpScaledMaskedRleRGBAImage(surface, image, &itransform, surface->blender.ialpha); - } + } } } else { //Transformed @@ -677,7 +677,7 @@ static bool _transformedRleRGBAImage(SwSurface* surface, const SwImage* image, c return _rasterTransformedMaskedTranslucentRleRGBAImage(surface, image, &itransform, opacity, surface->blender.alpha); } else if (surface->compositor->method == CompositeMethod::InvAlphaMask) { return _rasterTransformedMaskedTranslucentRleRGBAImage(surface, image, &itransform, opacity, surface->blender.ialpha); - } + } //Transformed + Down Scaled } else if (image->scale < DOWN_SCALE_TOLERANCE) { if (surface->compositor->method == CompositeMethod::AlphaMask) { @@ -685,14 +685,13 @@ static bool _transformedRleRGBAImage(SwSurface* surface, const SwImage* image, c } else if (surface->compositor->method == CompositeMethod::InvAlphaMask) { return _rasterDownScaledMaskedTranslucentRleRGBAImage(surface, image, &itransform, opacity, halfScale, surface->blender.ialpha); } - //Transformed + Up Scaled } else { if (surface->compositor->method == CompositeMethod::AlphaMask) { return _rasterUpScaledMaskedTranslucentRleRGBAImage(surface, image, &itransform, opacity, surface->blender.alpha); } else if (surface->compositor->method == CompositeMethod::InvAlphaMask) { return _rasterUpScaledMaskedTranslucentRleRGBAImage(surface, image, &itransform, opacity, surface->blender.ialpha); - } + } } } } else { @@ -1910,4 +1909,4 @@ bool rasterImage(SwSurface* surface, SwImage* image, const Matrix* transform, co //TODO: case: _rasterAlphaImage() return _rasterRGBAImage(surface, image, transform, bbox, opacity); -} \ No newline at end of file +} -- 2.7.4