svg_loader: No skip luma mask when composition node is image

Improved to skip Luma Mask when conditions are the same
as AlphaMask for optimization in e409bb29.
If the composition node is an image, it is not skipped because
it is not known for sure whether to skip it.

Change-Id: I82d1c5ab0ad4bf9624913a574556ea7ae7709a7e

diff --git a/src/loaders/svg/tvgSvgSceneBuilder.cpp b/src/loaders/svg/tvgSvgSceneBuilder.cpp
index a8984739eb58368c2c59ca6cb59fc49de4f8a75e..ae0e498d365f152bf44b78a4e788cf336bd355f5 100644 (file)
--- a/src/loaders/svg/tvgSvgSceneBuilder.cpp
+++ b/src/loaders/svg/tvgSvgSceneBuilder.cpp
@@ -659,7 +659,10 @@ static unique_ptr<Scene> _sceneBuildHelper(const SvgNode* node, const Box& vBox,
                         scene->push(_sceneBuildHelper(*child, vBox, svgPath, false, isMaskWhite));
                 } else if ((*child)->type == SvgNodeType::Image) {
                     auto image = _imageBuildHelper(*child, vBox, svgPath);
-                    if (image) scene->push(move(image));
+                    if (image) {
+                        scene->push(move(image));
+                        if (isMaskWhite) *isMaskWhite = false;
+                    }
                 } else if ((*child)->type != SvgNodeType::Mask) {
                     auto shape = _shapeBuildHelper(*child, vBox, svgPath);
                     if (shape) {