Merge "Revert "Addd to check privilege for capture"" into devel/master

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp
index a247f7d..0e640e7 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp
@@ -183,7 +183,7 @@ void TestApplication::DoUpdate( unsigned int intervalMilliseconds, const char* l
 bool TestApplication::Render( unsigned int intervalMilliseconds, const char* location )
 {
   DoUpdate( intervalMilliseconds, location );
-  mCore->Render( mRenderStatus );
+  mCore->Render( mRenderStatus, false );
 
   mFrame++;
 
@@ -209,7 +209,7 @@ bool TestApplication::GetRenderNeedsUpdate()
 bool TestApplication::RenderOnly( )
 {
   // Update Time values
-  mCore->Render( mRenderStatus );
+  mCore->Render( mRenderStatus, false );
 
   mFrame++;
 

diff --git a/dali/devel-api/adaptor-framework/gif-loading.cpp b/dali/devel-api/adaptor-framework/gif-loading.cpp
index 2d5094b..3d8e785 100644 (file)
--- a/dali/devel-api/adaptor-framework/gif-loading.cpp
+++ b/dali/devel-api/adaptor-framework/gif-loading.cpp
@@ -1042,7 +1042,7 @@ open_file:
 
         FlushFrames( animated, prop.w, prop.h, thisFrame, previousFrame, lastPreservedFrame );
       }
-      // if we hve a frame BUT the image is not animated... different
+      // if we have a frame BUT the image is not animated. different
       // path
       else if( (thisFrame) && (!thisFrame->data) && (!animated.animated) )
       {
@@ -1152,6 +1152,17 @@ public:
       munmap( loaderInfo.fileData.globalMap , loaderInfo.fileData.length );
       loaderInfo.fileData.globalMap  = nullptr;
     }
+
+    // Delete all image frames
+    for( auto &&frame : loaderInfo.animated.frames )
+    {
+      if( frame.data != nullptr )
+      {
+        // De-allocate memory of the frame data.
+        delete[] frame.data;
+        frame.data = nullptr;
+      }
+    }
   }
 
   std::string mUrl;

diff --git a/dali/devel-api/text-abstraction/script.cpp b/dali/devel-api/text-abstraction/script.cpp
index 2314f2d..a22d085 100644 (file)
--- a/dali/devel-api/text-abstraction/script.cpp
+++ b/dali/devel-api/text-abstraction/script.cpp
@@ -250,13 +250,14 @@ Script GetCharacterScript( Character character )
 
   // The Emoji which map to standardized Unicode characters
   // 1. Emoticons ( 1F601 - 1F64F )
-  // 2. Dingbats ( 2702 - 27B0 )
+  // 2. Dingbats ( 2700 - 27BF )
   // 3. Transport and map symbols ( 1F680 - 1F6C0 )
   // 4. Enclosed characters ( 24C2 - 1F251 )
   // 5. Uncategorized :-S
   // 6. Additional Emoticons ( 1F600 - 1F636 )
-  // 6b. Additional transport and map symbols ( 1F681 - 1F6C5 )
+  // 6b. Additional transport and map symbols ( 1F680 - 1F6FF ): http://unicode.org/charts/PDF/U1F680.pdf
   // 6c. Other additional symbols ( 1F30D - 1F567 )
+  // 7. Supplemental Symbols and Pictographs ( 1F900–1F9FF ): http://unicode.org/charts/PDF/U1F900.pdf
 
   // Symbols. Work around for these symbols.
   // 0x25cb
@@ -804,8 +805,13 @@ Script GetCharacterScript( Character character )
           return ARABIC;
         }
         // U+1f170 4. Enclosed characters: negative squared latin capital letter A
-        // U+1f6c5 6b. Additional transport and map symbols
-        if( ( 0x1f170 <= character ) && ( character <= 0x1f6c5 ) )
+        // U+1f6ff 6b. Additional transport and map symbols
+        if( ( 0x1f170 <= character ) && ( character <= 0x1f6ff ) )
+        {
+          return EMOJI;
+        }
+        // 7. Supplemental Symbols and Pictographs
+        if( ( 0x1f900 <= character ) && ( character <= 0x1f9ff ) )
         {
           return EMOJI;
         }

diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp
index a0ca5f5..31cf0fd 100644 (file)
--- a/dali/internal/adaptor/common/combined-update-render-controller.cpp
+++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp
@@ -108,7 +108,8 @@ CombinedUpdateRenderController::CombinedUpdateRenderController( AdaptorInternalS
   mUseElapsedTimeAfterWait( FALSE ),
   mNewSurface( NULL ),
   mPostRendering( FALSE ),
-  mSurfaceResized( FALSE )
+  mSurfaceResized( FALSE ),
+  mForceClear( FALSE )
 {
   LOG_EVENT_TRACE;
 
@@ -198,6 +199,7 @@ void CombinedUpdateRenderController::Resume()
     AddPerformanceMarker( PerformanceInterface::RESUME );
 
     mRunning = TRUE;
+    mForceClear = TRUE;
   }
 }
 
@@ -504,9 +506,11 @@ void CombinedUpdateRenderController::UpdateRenderThread()
     Integration::RenderStatus renderStatus;
 
     AddPerformanceMarker( PerformanceInterface::RENDER_START );
-    mCore.Render( renderStatus );
+    mCore.Render( renderStatus, mForceClear );
     AddPerformanceMarker( PerformanceInterface::RENDER_END );
 
+    mForceClear = false;
+
     if( renderStatus.NeedsPostRender() )
     {
       mRenderHelper.PostRender( isRenderingToFbo );

diff --git a/dali/internal/adaptor/common/combined-update-render-controller.h b/dali/internal/adaptor/common/combined-update-render-controller.h
index d318ea9..2e2dcad 100644 (file)
--- a/dali/internal/adaptor/common/combined-update-render-controller.h
+++ b/dali/internal/adaptor/common/combined-update-render-controller.h
@@ -333,6 +333,7 @@ private:
 
   volatile unsigned int             mPostRendering;                    ///< Whether post-rendering is taking place (set by the event & render threads, read by the render-thread).
   volatile unsigned int             mSurfaceResized;                   ///< Will be set to resize the surface (set by the event-thread, read & cleared by the update-render thread).
+  volatile unsigned int             mForceClear;                       ///< Will be set to clear forcely
 };
 
 } // namespace Adaptor

diff --git a/dali/internal/adaptor/tizen/framework-tizen.cpp b/dali/internal/adaptor/tizen/framework-tizen.cpp
index d934bc8..4c7e03b 100644 (file)
--- a/dali/internal/adaptor/tizen/framework-tizen.cpp
+++ b/dali/internal/adaptor/tizen/framework-tizen.cpp
@@ -795,7 +795,12 @@ std::string Framework::GetResourcePath()
 {
   std::string resourcePath = "";
 #if defined( TIZEN_PLATFORM_CONFIG_SUPPORTED ) && TIZEN_PLATFORM_CONFIG_SUPPORTED
-  resourcePath = app_get_resource_path();
+  char* app_rsc_path = app_get_resource_path();
+  if (app_rsc_path)
+  {
+    resourcePath = app_rsc_path;
+    free(app_rsc_path);
+  }
 #else // For backwards compatibility with older Tizen versions
 
   // "DALI_APPLICATION_PACKAGE" is used to get the already configured Application package path.

diff --git a/dali/public-api/dali-adaptor-version.cpp b/dali/public-api/dali-adaptor-version.cpp
index d961b8b..f60d5c6 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 = 3;
-const unsigned int ADAPTOR_MICRO_VERSION = 10;
+const unsigned int ADAPTOR_MICRO_VERSION = 13;
 const char * const ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index a4ae273..350414d 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -19,7 +19,7 @@
 
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.3.10
+Version:    1.3.13
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT