Merge "Add some APIs into web view." into devel/master

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp
index 48d6912..54e8f77 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp
@@ -180,7 +180,9 @@ public:
   : mCallStack(callStack),
     mBuffer(buffer),
     mMappedOffset(mappedOffset),
-    mMappedSize(mappedSize)
+    mMappedSize(mappedSize),
+    mLockedOffset(0u),
+    mLockedSize(0u)
   {
   }
 

diff --git a/dali-scene-loader/public-api/mesh-definition.cpp b/dali-scene-loader/public-api/mesh-definition.cpp
index 69292e2..8317803 100644 (file)
--- 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<float>& 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 (file)
--- 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<uint16_t> mIndices;
     std::vector<Attrib>   mAttribs;
 
-    unsigned int        mBlendShapeBufferOffset;
+    unsigned int        mBlendShapeBufferOffset{0};
     Dali::Vector<float> 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 (file)
--- 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<float> 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