[dali_1.2.24] Merge branch 'devel/master'

Change-Id: I4fe0fed3fcd4b97eaae27d1db4d23ce2b44ef33c

diff --git a/adaptors/public-api/dali-adaptor-version.cpp b/adaptors/public-api/dali-adaptor-version.cpp
index f40df50..5a2afcc 100644 (file)
--- a/adaptors/public-api/dali-adaptor-version.cpp
+++ b/adaptors/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 = 2;
-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/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.cpp b/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.cpp
index 3d80c50..11a3356 100644 (file)
--- a/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.cpp
+++ b/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -17,6 +17,13 @@
 
 #include "utc-image-loading-common.h"
 
+double GetTimeMilliseconds( Integration::PlatformAbstraction& abstraction )
+{
+  timespec timeSpec;
+  clock_gettime( CLOCK_MONOTONIC, &timeSpec );
+  return ( timeSpec.tv_sec * 1e3 ) + ( timeSpec.tv_nsec / 1e6 );
+}
+
 /** Live platform abstraction recreated for each test case. */
 Integration::PlatformAbstraction * gAbstraction = 0;
 

diff --git a/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h b/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h
index d82f98e..cc6f713 100644 (file)
--- a/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h
+++ b/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -65,14 +65,6 @@ const char* const VALID_IMAGES[] = {
 };
 const unsigned NUM_VALID_IMAGES = sizeof(VALID_IMAGES) / sizeof(VALID_IMAGES[0]);
 
-/** Returns elapsed milliseconds. */
-double GetTimeMilliseconds( Integration::PlatformAbstraction& abstraction )
-{
-  timespec timeSpec;
-  clock_gettime( CLOCK_MONOTONIC, &timeSpec );
-  return ( timeSpec.tv_sec * 1e3 ) + ( timeSpec.tv_nsec / 1e6 );
-}
-
 } // anon namespace
 
 /** Live platform abstraction recreated for each test case. */
@@ -82,6 +74,7 @@ extern Integration::PlatformAbstraction * gAbstraction;
 typedef std::pair<ImageDimensions, std::pair<FittingMode::Type, std::pair<SamplingMode::Type, bool> > > ImageParameters;
 extern std::vector<ImageParameters> gCancelAttributes;
 
+double GetTimeMilliseconds( Integration::PlatformAbstraction& abstraction ); ///< Returns elapsed milliseconds.
 
 void utc_dali_loading_startup(void);
 void utc_dali_loading_cleanup(void);

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index f80e37f..5486f87 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -14,7 +14,7 @@
 
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.2.23
+Version:    1.2.24
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-2-Clause and MIT