From: David Steele <david.steele@samsung.com>
Date: Thu, 7 Jul 2022 09:19:49 +0000 (+0000)
Subject: Merge "Fix the SVACE error for facial animation loader" into devel/master
X-Git-Tag: dali_2.1.30~4
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=59b714d41e4cd4d07875def8befc59c5399ab4b6;hp=dc218b02943379a5fa00bc3fed964e9233bf0e0a

Merge "Fix the SVACE error for facial animation loader" into devel/master
---

diff --git a/dali-scene-loader/public-api/facial-animation-loader.cpp b/dali-scene-loader/public-api/facial-animation-loader.cpp
index 3209467..6c92d6a 100644
--- a/dali-scene-loader/public-api/facial-animation-loader.cpp
+++ b/dali-scene-loader/public-api/facial-animation-loader.cpp
@@ -18,6 +18,9 @@
 // FILE HEADER
 #include <dali-scene-loader/public-api/facial-animation-loader.h>
 
+// EXTERNAL INCLUDES
+#include <sstream>
+
 // INTERNAL INCLUDES
 #include <dali-scene-loader/internal/json-reader.h>
 #include <dali-scene-loader/public-api/blend-shape-details.h>
@@ -135,9 +138,7 @@ AnimationDefinition LoadFacialAnimation(const std::string& url)
   }
 
   // Set the property names
-  char        weightNameBuffer[32];
-  char* const pWeightName = weightNameBuffer + sprintf(weightNameBuffer, "%s", BlendShapes::WEIGHTS_UNIFORM.c_str());
-  uint32_t    targets     = 0u;
+  uint32_t targets = 0u;
   for(const auto& blendShape : facialAnimation.mBlendShapes)
   {
     for(uint32_t morphTargetIndex = 0u; morphTargetIndex < blendShape.mNumberOfMorphTarget; ++morphTargetIndex)
@@ -147,8 +148,9 @@ AnimationDefinition LoadFacialAnimation(const std::string& url)
 
       animatedProperty.mNodeName = blendShape.mNodeName;
 
-      snprintf(pWeightName, sizeof(weightNameBuffer) - (pWeightName - weightNameBuffer), "[%d]", morphTargetIndex);
-      animatedProperty.mPropertyName = weightNameBuffer;
+      std::stringstream weightPropertyStream;
+      weightPropertyStream << BlendShapes::WEIGHTS_UNIFORM << "[" << morphTargetIndex << "]";
+      animatedProperty.mPropertyName = weightPropertyStream.str();
     }
     targets += blendShape.mNumberOfMorphTarget;
   }