Merge branch 'devel/master' into tizen

diff --git a/dali/internal/adaptor/tizen-wayland/framework-tizen.cpp b/dali/internal/adaptor/tizen-wayland/framework-tizen.cpp
index 09ee3fb..086332f 100644 (file)
--- a/dali/internal/adaptor/tizen-wayland/framework-tizen.cpp
+++ b/dali/internal/adaptor/tizen-wayland/framework-tizen.cpp
@@ -818,6 +818,12 @@ std::string Framework::GetResourcePath()
   {
     resourcePath = value;
   }
+
+  if( resourcePath.back() != '/' )
+  {
+    resourcePath+="/";
+  }
+
 #endif //TIZEN_PLATFORM_CONFIG_SUPPORTED
 
   return resourcePath;

diff --git a/dali/internal/adaptor/ubuntu/framework-ubuntu.cpp b/dali/internal/adaptor/ubuntu/framework-ubuntu.cpp
index 6588896..29abb88 100644 (file)
--- a/dali/internal/adaptor/ubuntu/framework-ubuntu.cpp
+++ b/dali/internal/adaptor/ubuntu/framework-ubuntu.cpp
@@ -219,6 +219,11 @@ std::string Framework::GetResourcePath()
     resourcePath = value;
   }
 
+  if( resourcePath.back() != '/' )
+  {
+    resourcePath+="/";
+  }
+
   return resourcePath;
 }
 

diff --git a/dali/internal/adaptor/windows/framework-win.cpp b/dali/internal/adaptor/windows/framework-win.cpp
index 1fe8890..9f1b827 100755 (executable)
--- a/dali/internal/adaptor/windows/framework-win.cpp
+++ b/dali/internal/adaptor/windows/framework-win.cpp
@@ -244,6 +244,11 @@ std::string Framework::GetResourcePath()
     resourcePath = value;\r
   }\r
 \r
+  if( resourcePath.back() != '/' )\r
+  {\r
+    resourcePath+="/";\r
+  }\r
+\r
   return resourcePath;\r
 }\r
 \r

diff --git a/dali/internal/graphics/gles/gles-abstraction.h b/dali/internal/graphics/gles/gles-abstraction.h
index 16f7cd2..8dc63e6 100644 (file)
--- a/dali/internal/graphics/gles/gles-abstraction.h
+++ b/dali/internal/graphics/gles/gles-abstraction.h
@@ -32,6 +32,11 @@ class GlesAbstraction
 
 public:
 
+  /**
+   * Destructor
+   */
+  virtual ~GlesAbstraction() {};
+
   virtual void ReadBuffer( GLenum mode ) = 0;
 
   virtual void DrawRangeElements( GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid* indices ) = 0;

diff --git a/dali/internal/graphics/gles/gles2-implementation.h b/dali/internal/graphics/gles/gles2-implementation.h
index 054d877..5bab59b 100644 (file)
--- a/dali/internal/graphics/gles/gles2-implementation.h
+++ b/dali/internal/graphics/gles/gles2-implementation.h
@@ -40,7 +40,7 @@ class Gles2Implementation : public GlesAbstraction
 public:
   Gles2Implementation() {}
 
-  ~Gles2Implementation() {}
+  ~Gles2Implementation() override {}
 
   void ReadBuffer( GLenum mode ) override
   {

diff --git a/dali/internal/graphics/gles/gles3-implementation.h b/dali/internal/graphics/gles/gles3-implementation.h
index fca29c8..ace3849 100644 (file)
--- a/dali/internal/graphics/gles/gles3-implementation.h
+++ b/dali/internal/graphics/gles/gles3-implementation.h
@@ -39,7 +39,7 @@ class Gles3Implementation : public GlesAbstraction
 public:
   Gles3Implementation() {}
 
-  ~Gles3Implementation() {}
+  ~Gles3Implementation() override {}
 
   void ReadBuffer( GLenum mode ) override
   {

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

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 3abe668..35b9469 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.23
+Version:    1.4.24
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT