Merge branch 'devel/master' into tizen

diff --git a/build/android/build.sh b/build/android/build.sh
index 877b8ae..7d2b9c0 100755 (executable)
--- a/build/android/build.sh
+++ b/build/android/build.sh
@@ -28,7 +28,7 @@ if [ ! -d "$ANDROID_SDK" ]; then
     wget --quiet https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
     unzip -q sdk-tools-linux-4333796.zip
     tools/bin/sdkmanager --update $SdbProxyOptions
-    yes | tools/bin/sdkmanager $SdbProxyOptions "patcher;v4" "platform-tools" "platforms;android-29" "build-tools;29.0.2" "cmake;3.10.2.4988404" "ndk-bundle" "ndk;20.1.5948944"
+    yes | tools/bin/sdkmanager $SdbProxyOptions "patcher;v4" "platform-tools" "platforms;android-29" "build-tools;29.0.2" "cmake;3.10.2.4988404" "ndk-bundle" "ndk;22.1.7171670"
     cd -
   fi
 fi

diff --git a/examples/builder/examples.cpp b/examples/builder/examples.cpp
index 7ba6fef..fd5d42a 100644 (file)
--- a/examples/builder/examples.cpp
+++ b/examples/builder/examples.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -164,6 +164,8 @@ public:
   FileWatcher(void);
   ~FileWatcher(void);
   explicit FileWatcher(const std::string& fn)
+  : mLastTime(0),
+    mstringPath{}
   {
     SetFilename(fn);
   };
@@ -187,7 +189,8 @@ private:
 };
 
 FileWatcher::FileWatcher(void)
-: mLastTime(0)
+: mLastTime(0),
+  mstringPath{}
 {
 }
 

diff --git a/examples/gestures/gesture-example.cpp b/examples/gestures/gesture-example.cpp
index 129a1b7..04f783a 100644 (file)
--- a/examples/gestures/gesture-example.cpp
+++ b/examples/gestures/gesture-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@ const float   ROTATE_BACK_ANIMATION_DURATION(0.25f);
  */
 void AddHelpInfo(const std::string&& string, const Vector2& windowSize, Actor parent, Animation animation, float startTime, float endTime)
 {
-  Actor   text = TextLabel::New(std::move(string));
+  Actor   text = TextLabel::New(string);
   Vector3 position(windowSize * HELP_TEXT_POSITION_MULTIPLIER);
 
   text.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER);

diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp
index 1f62db9..c1374b1 100644 (file)
--- a/examples/scroll-view/scroll-view-example.cpp
+++ b/examples/scroll-view/scroll-view-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -105,7 +105,7 @@ const char* const IMAGE_PATHS[] = {
 
   NULL};
 
-const char* const GetNextImagePath()
+const char* GetNextImagePath()
 {
   static const char* const* imagePtr = &IMAGE_PATHS[0];
 

diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index 4f22b7a..eb38c27 100755 (executable)
--- a/packaging/com.samsung.dali-demo.spec
+++ b/packaging/com.samsung.dali-demo.spec
@@ -2,7 +2,7 @@
 
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    2.1.42
+Version:    2.1.46
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0