From: Seungho BAEK <sbsh.baek@samsung.com>
Date: Thu, 12 Mar 2020 00:17:26 +0000 (+0000)
Subject: Merge "Delete Unused internal methods in Visuals" into devel/master
X-Git-Tag: dali_1.9.3~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=7ec8efc622e4c3131d6a9ae00cb8ea505d8b3923;hp=ca65ff7c094c18e906c5b01c8b023c5c9c4ccbe2

Merge "Delete Unused internal methods in Visuals" into devel/master
---

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
index 4e72473..21c00de 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
@@ -2403,12 +2403,14 @@ int UtcDaliImageViewReloadFailedOnResourceReadySignal(void)
 
 int UtcDaliImageViewLoadRemoteSVG(void)
 {
-  tet_infoline("Test reloading failed image from within signal handler.");
+  tet_infoline("Test load from a remote server.");
 
   ToolkitTestApplication application;
   Toolkit::ImageView imageView;
   imageView = Toolkit::ImageView::New(  );
   imageView.SetImage("https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/check.svg");
+  // Victor. Temporary (or permanent?) update as the url above seems not to work from time to time ...
+  imageView.SetImage("https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/SVG_logo.svg/64px-SVG_logo.svg.png");
   imageView.SetParentOrigin( ParentOrigin::TOP_LEFT );
   imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
   imageView.SetSize(300, 300);
diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index d6ee5d7..e5e237b 100644
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -31,7 +31,7 @@ namespace Toolkit
 
 const unsigned int TOOLKIT_MAJOR_VERSION = 1;
 const unsigned int TOOLKIT_MINOR_VERSION = 9;
-const unsigned int TOOLKIT_MICRO_VERSION = 1;
+const unsigned int TOOLKIT_MICRO_VERSION = 2;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED
diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 7d63a05..358197c 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    Dali 3D engine Toolkit
-Version:    1.9.1
+Version:    1.9.2
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT