From a35ad191b1e4ed47f7aa10649a461d7ef56f22bd Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Wed, 24 Mar 2021 13:41:36 +0900 Subject: [PATCH] Fix Coverity issues Change-Id: I5a1bad11baf88116810fdd976fb882047f01f0da --- dali-scene-loader/public-api/mesh-definition.cpp | 5 +++++ dali-scene-loader/public-api/mesh-definition.h | 2 +- dali-scene-loader/public-api/mesh-geometry.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dali-scene-loader/public-api/mesh-definition.cpp b/dali-scene-loader/public-api/mesh-definition.cpp index 69292e2..8317803 100644 --- a/dali-scene-loader/public-api/mesh-definition.cpp +++ b/dali-scene-loader/public-api/mesh-definition.cpp @@ -470,6 +470,11 @@ void MeshDefinition::Blob::ApplyMinMax(const std::vector& min, const std: value = std::min(std::max(min[i], value), max[i]); }); + if(!clampFn) + { + return; + } + auto end = values + count * numComponents; while(values != end) { diff --git a/dali-scene-loader/public-api/mesh-definition.h b/dali-scene-loader/public-api/mesh-definition.h index cd0ddc9..d03fa0b 100644 --- a/dali-scene-loader/public-api/mesh-definition.h +++ b/dali-scene-loader/public-api/mesh-definition.h @@ -177,7 +177,7 @@ struct DALI_SCENE_LOADER_API MeshDefinition std::vector mIndices; std::vector mAttribs; - unsigned int mBlendShapeBufferOffset; + unsigned int mBlendShapeBufferOffset{0}; Dali::Vector mBlendShapeUnnormalizeFactor; PixelData mBlendShapeData; }; diff --git a/dali-scene-loader/public-api/mesh-geometry.h b/dali-scene-loader/public-api/mesh-geometry.h index 026e9a7..5b46e0f 100644 --- a/dali-scene-loader/public-api/mesh-geometry.h +++ b/dali-scene-loader/public-api/mesh-geometry.h @@ -33,7 +33,7 @@ struct DALI_SCENE_LOADER_API MeshGeometry Geometry geometry; ///< The array of vertices. Texture blendShapeGeometry; ///< The array of vertices of the different blend shapes encoded inside a texture with power of two dimensions. Vector blendShapeUnnormalizeFactor; ///< Factor used to unnormalize the geometry of the blend shape. - unsigned int blendShapeBufferOffset; ///< Offset used to calculate the start of each blend shape. + unsigned int blendShapeBufferOffset{0}; ///< Offset used to calculate the start of each blend shape. }; } // namespace SceneLoader -- 2.7.4