Merge branch 'devel/master' into tizen

diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp
index 3416ed8..2c297e0 100755 (executable)
--- a/dali/internal/adaptor/common/adaptor-impl.cpp
+++ b/dali/internal/adaptor/common/adaptor-impl.cpp
@@ -397,7 +397,7 @@ void Adaptor::Start()
     Dali::TizenPlatform::ImageLoader::SetMaxTextureSize( mGLES.GetMaxTextureSize() );
 
     std::string systemCachePath = GetSystemCachePath();
-    if( systemCachePath.c_str() != NULL )
+    if( ! systemCachePath.empty() )
     {
       const int dir_err = system( std::string( "mkdir " + systemCachePath ).c_str() );
       if (-1 == dir_err)

diff --git a/dali/internal/system/common/abort-handler.cpp b/dali/internal/system/common/abort-handler.cpp
index fa70d22..696570e 100644 (file)
--- a/dali/internal/system/common/abort-handler.cpp
+++ b/dali/internal/system/common/abort-handler.cpp
@@ -47,7 +47,7 @@ AbortHandler::~AbortHandler()
   int signum;
   for ( signum = 1; signum < _NSIG; signum++ )
   {
-    if ( mSignalMask & (1 << (signum-1) ) )
+    if ( mSignalMask & (1ULL << (signum-1) ) )
     {
       // set signals back to default handling
       signal( signum, mSignalOldHandlers[signum-1] );
@@ -70,7 +70,7 @@ bool AbortHandler::AbortOnSignal( int signum )
   if ( SIG_ERR != signalHandlerPrevious )
     {
       mSignalOldHandlers[signum-1] = signalHandlerPrevious;
-      mSignalMask |= ( 1 << (signum-1) );
+      mSignalMask |= ( 1ULL << (signum-1) );
       status = true;
     }
   }

diff --git a/dali/public-api/dali-adaptor-version.cpp b/dali/public-api/dali-adaptor-version.cpp
index f18dace..70e4306 100644 (file)
--- a/dali/public-api/dali-adaptor-version.cpp
+++ b/dali/public-api/dali-adaptor-version.cpp
@@ -28,7 +28,7 @@ namespace Dali
 
 const unsigned int ADAPTOR_MAJOR_VERSION = 1;
 const unsigned int ADAPTOR_MINOR_VERSION = 4;
-const unsigned int ADAPTOR_MICRO_VERSION = 36;
+const unsigned int ADAPTOR_MICRO_VERSION = 37;
 const char * const ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 8feb201..c1e5f7a 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -17,7 +17,7 @@
 
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.4.36
+Version:    1.4.37
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT