Merge "Add Keyboard repeat setting changed signal to Window" into devel/master

diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp
index e111bdb..b94f90d 100644 (file)
--- a/dali/internal/adaptor/common/adaptor-impl.cpp
+++ b/dali/internal/adaptor/common/adaptor-impl.cpp
@@ -409,7 +409,10 @@ void Adaptor::Start()
     (*iter)->OnStart();
   }
 
-  mAddOnManager->Start();
+  if (mAddOnManager)
+  {
+    mAddOnManager->Start();
+  }
 }
 
 // Dali::Internal::Adaptor::Adaptor::Pause
@@ -425,7 +428,10 @@ void Adaptor::Pause()
     }
 
     // Extensions
-    mAddOnManager->Pause();
+    if (mAddOnManager)
+    {
+      mAddOnManager->Pause();
+    }
 
     // Pause all windows event handlers when adaptor paused
     for( auto window : mWindows )
@@ -462,7 +468,10 @@ void Adaptor::Resume()
     }
 
     // Resume AddOnManager
-    mAddOnManager->Resume();
+    if (mAddOnManager)
+    {
+      mAddOnManager->Resume();
+    }
 
     // Inform observers that we have resumed.
     for( ObserverContainer::iterator iter = mObservers.begin(), endIter = mObservers.end(); iter != endIter; ++iter )
@@ -495,7 +504,10 @@ void Adaptor::Stop()
       (*iter)->OnStop();
     }
 
-    mAddOnManager->Stop();
+    if (mAddOnManager)
+    {
+      mAddOnManager->Stop();
+    }
 
     mThreadController->Stop();
 
@@ -1212,6 +1224,12 @@ bool Adaptor::AddIdleEnterer( CallbackBase* callback, bool forceAdd )
     idleAdded = mCallbackManager->AddIdleEntererCallback( callback );
   }
 
+  if( !idleAdded )
+  {
+    // Delete callback
+    delete callback;
+  }
+
   return idleAdded;
 }
 

diff --git a/dali/internal/imaging/common/loader-jpeg-turbo.cpp b/dali/internal/imaging/common/loader-jpeg-turbo.cpp
index 2566d26..1848a1c 100755 (executable)
--- a/dali/internal/imaging/common/loader-jpeg-turbo.cpp
+++ b/dali/internal/imaging/common/loader-jpeg-turbo.cpp
@@ -229,22 +229,22 @@ void AddExifFieldPropertyMap( Dali::Property::Map& out, const ExifEntry& entry,
     }
     case EXIF_FORMAT_SHORT:
     {
-      out.Insert( shortName, ConvertExifNumeric<int, unsigned short>(entry) );
+      out.Insert( shortName, ConvertExifNumeric<int, uint16_t>(entry) );
       break;
     }
     case EXIF_FORMAT_LONG:
     {
-      out.Insert( shortName, ConvertExifNumeric<int, unsigned long>(entry) );
+      out.Insert( shortName, ConvertExifNumeric<int, uint32_t>(entry) );
       break;
     }
     case EXIF_FORMAT_SSHORT:
     {
-      out.Insert( shortName, ConvertExifNumeric<int, short>(entry) );
+      out.Insert( shortName, ConvertExifNumeric<int, int16_t>(entry) );
       break;
     }
     case EXIF_FORMAT_SLONG:
     {
-      out.Insert( shortName, ConvertExifNumeric<int, long>(entry) );
+      out.Insert( shortName, ConvertExifNumeric<int, int32_t>(entry) );
       break;
     }
     case EXIF_FORMAT_FLOAT:

diff --git a/dali/internal/legacy/common/tizen-platform-abstraction.cpp b/dali/internal/legacy/common/tizen-platform-abstraction.cpp
index 4d60fee..104c07b 100644 (file)
--- a/dali/internal/legacy/common/tizen-platform-abstraction.cpp
+++ b/dali/internal/legacy/common/tizen-platform-abstraction.cpp
@@ -43,7 +43,7 @@ struct TizenPlatformAbstraction::TimerCallback : ConnectionTracker
 {
   Dali::Timer mTimer;
   TizenPlatformAbstraction* mOwner;
-  CallbackBase* mCallback;
+  std::unique_ptr< CallbackBase > mCallback;
   const uint32_t mIdNumber;
 
   static uint32_t sNextTimerId;
@@ -51,12 +51,15 @@ struct TizenPlatformAbstraction::TimerCallback : ConnectionTracker
   TimerCallback(TizenPlatformAbstraction* owner, CallbackBase* callback, uint32_t ms)
   : mTimer(Dali::Timer::New(ms)),
     mOwner(owner),
-    mCallback(callback),
-    mIdNumber(sNextTimerId++)
+    mCallback( std::unique_ptr< CallbackBase >( callback ) ),
+    mIdNumber(++sNextTimerId)
   {
     mTimer.TickSignal().Connect( this, &TimerCallback::Tick );
     mTimer.Start();
   }
+  ~TimerCallback()
+  {
+  }
 
   bool Tick()
   {
@@ -194,7 +197,7 @@ uint32_t TizenPlatformAbstraction::StartTimer( uint32_t milliseconds, CallbackBa
   TimerCallback* timerCallbackPtr = new TimerCallback(this, callback, milliseconds);
 
   // Stick it in the list
-  mTimerPairsWaiting.push_back(timerCallbackPtr);
+  mTimerPairsWaiting.push_back( std::unique_ptr< TimerCallback >( timerCallbackPtr ) );
 
   return timerCallbackPtr->mIdNumber;
 }
@@ -203,7 +206,7 @@ void TizenPlatformAbstraction::CancelTimer ( uint32_t timerId )
 {
   auto iter = std::remove_if(
     mTimerPairsWaiting.begin(), mTimerPairsWaiting.end(),
-    [&timerId]( TimerCallback* timerCallbackPtr )
+    [&timerId]( std::unique_ptr< TimerCallback >& timerCallbackPtr )
     {
       if( timerCallbackPtr->mIdNumber == timerId )
       {
@@ -224,7 +227,9 @@ void TizenPlatformAbstraction::RunTimerFunction(TimerCallback& timerPtr)
 {
   CallbackBase::Execute( *timerPtr.mCallback );
 
-  std::vector<TimerCallback*>::iterator timerIter = std::find( mTimerPairsWaiting.begin(), mTimerPairsWaiting.end(), &timerPtr );
+  std::vector< std::unique_ptr< TimerCallback > >::iterator timerIter = std::find_if( mTimerPairsWaiting.begin(), mTimerPairsWaiting.end(),
+                                                                                      [&]( std::unique_ptr< TimerCallback >& p )
+                                                                                      { return p.get() == &timerPtr;} );
 
   if( timerIter == std::end(mTimerPairsWaiting) )
   {

diff --git a/dali/internal/legacy/common/tizen-platform-abstraction.h b/dali/internal/legacy/common/tizen-platform-abstraction.h
index c288cd1..fe4b018 100644 (file)
--- a/dali/internal/legacy/common/tizen-platform-abstraction.h
+++ b/dali/internal/legacy/common/tizen-platform-abstraction.h
@@ -26,6 +26,7 @@
 // EXTERNAL INCLUDES
 #include <cstdint>
 #include <string>
+#include <memory>
 #include <dali/integration-api/platform-abstraction.h>
 
 namespace Dali
@@ -130,8 +131,8 @@ private:
 
   std::string mDataStoragePath;
 
-  std::vector<TimerCallback*> mTimerPairsWaiting;
-  std::vector<TimerCallback*> mTimerPairsSpent;
+  std::vector< std::unique_ptr< TimerCallback > > mTimerPairsWaiting;
+  std::vector< std::unique_ptr< TimerCallback > > mTimerPairsSpent;
 };
 
 /**

diff --git a/dali/public-api/dali-adaptor-version.cpp b/dali/public-api/dali-adaptor-version.cpp
index b0fb3aa..b46fb1d 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 = 9;
-const unsigned int ADAPTOR_MICRO_VERSION = 22;
+const unsigned int ADAPTOR_MICRO_VERSION = 23;
 const char * const ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

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