Revert "[3.0] Fix Svace issues"

This reverts commit 1a0e02eaca706014652713d8e974ff4994b2f019.

Change-Id: I893f2f7be7c460e7e1f63bab74508a8d643f788e

diff --git a/dali/internal/event/rendering/shader-impl.cpp b/dali/internal/event/rendering/shader-impl.cpp
index 127de82..698a03b 100644 (file)
--- a/dali/internal/event/rendering/shader-impl.cpp
+++ b/dali/internal/event/rendering/shader-impl.cpp
@@ -168,32 +168,29 @@ void Shader::SetDefaultProperty( Property::Index index,
       if( propertyValue.GetType() == Property::MAP )
       {
         Dali::Property::Map* map = propertyValue.GetMap();
-        if( map )
+        std::string vertex;
+        std::string fragment;
+        Dali::Shader::ShaderHints hints(Dali::Shader::HINT_NONE);
+
+        if( Property::Value* value = map->Find("vertex") )
+        {
+          vertex = value->Get<std::string>();
+        }
+
+        if( Property::Value* value = map->Find("fragment") )
         {
-          std::string vertex;
-          std::string fragment;
-          Dali::Shader::ShaderHints hints(Dali::Shader::HINT_NONE);
-
-          if( Property::Value* value = map->Find("vertex") )
-          {
-            vertex = value->Get<std::string>();
-          }
-
-          if( Property::Value* value = map->Find("fragment") )
-          {
-            fragment = value->Get<std::string>();
-          }
-
-          if( Property::Value* value = map->Find("hints") )
-          {
-            static_cast<void>( // ignore return
-              Scripting::GetEnumeration< Dali::Shader::ShaderHints >(value->Get<std::string>().c_str(),
-                                                                     ShaderHintsTable, ShaderHintsTableSize, hints)
-              );
-          }
-
-          Initialize(vertex, fragment, hints );
+          fragment = value->Get<std::string>();
         }
+
+        if( Property::Value* value = map->Find("hints") )
+        {
+          static_cast<void>( // ignore return
+            Scripting::GetEnumeration< Dali::Shader::ShaderHints >(value->Get<std::string>().c_str(),
+                                                                   ShaderHintsTable, ShaderHintsTableSize, hints)
+            );
+        }
+
+        Initialize(vertex, fragment, hints );
       }
       else
       {

diff --git a/dali/public-api/math/random.h b/dali/public-api/math/random.h
index 394b2dd..5ba0c95 100644 (file)
--- a/dali/public-api/math/random.h
+++ b/dali/public-api/math/random.h
@@ -35,11 +35,6 @@ namespace Dali
 namespace Random
 {
 
-namespace
-{
-  __thread unsigned int seed;
-}
-
 /**
  * @brief Returns a random number between f0 and f1.
  *
@@ -51,10 +46,9 @@ namespace
  */
 inline float Range(float f0, float f1)
 {
-  seed = time(NULL);
   float min = std::min(f0, f1);
   float max = std::max(f0, f1);
-  return min + (rand_r(&seed) & 0xfff) * (max-min) * (1.0f/4095.0f);
+  return min + (rand() & 0xfff) * (max-min) * (1.0f/4095.0f);
 }
 
 /**