Revert "[Tizen] SVACE issue resolved"

This reverts commit d97ff372378ed0817dffb64180ad50476302f7d4.

Change-Id: Ib01211f868b77aeffbbb66032ed2a7a81284cc2f

diff --git a/dali/internal/render/shaders/program.cpp b/dali/internal/render/shaders/program.cpp
index a7fb497..e769a81 100644 (file)
--- a/dali/internal/render/shaders/program.cpp
+++ b/dali/internal/render/shaders/program.cpp
@@ -272,15 +272,14 @@ void Program::GetActiveSamplerUniforms()
 
   //Determine declaration order of each sampler
   char* fragShader = strdup( mProgramData->GetFragmentShader() );
-  char* nextPtr;
-  const char* token = strtok_r( fragShader, " ;\n", &nextPtr );
+  const char* token = strtok( fragShader, " ;\n");
   int samplerPosition = 0;
   while( token )
   {
     if( ( strncmp( token, "sampler2D", 9u ) == 0 ) || ( strncmp( token, "samplerCube", 11u ) == 0 ) )
     {
       bool found( false );
-      token = strtok_r( NULL, " ;\n", &nextPtr );
+      token = strtok( NULL, " ;\n");
       for( size_t i=0; i<samplerUniformLocations.size(); ++i )
       {
         if( samplerUniformLocations[i].position == -1 &&
@@ -298,7 +297,7 @@ void Program::GetActiveSamplerUniforms()
     }
     else
     {
-      token = strtok_r( NULL, " ;\n", &nextPtr );
+      token = strtok( NULL, " ;\n");
     }
   }
 

diff --git a/dali/internal/update/gestures/scene-graph-pan-gesture.cpp b/dali/internal/update/gestures/scene-graph-pan-gesture.cpp
index 596a391..d8a119a 100644 (file)
--- a/dali/internal/update/gestures/scene-graph-pan-gesture.cpp
+++ b/dali/internal/update/gestures/scene-graph-pan-gesture.cpp
@@ -642,8 +642,7 @@ void PanGesture::ResetDefaultProperties( BufferIndex updateBufferIndex )
 }
 
 PanGesture::PanGesture()
-: mPanning(),
-  mGestures(),
+: mGestures(),
   mWritePosition( 0 ),
   mReadPosition( 0 ),
   mNotAtTarget( false ),