X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fmath%2Fmath-utils.h;h=e9b92d9c2a631c67449b5cd9e6bc714ed45a4f25;hb=e6d04f8797a271f71f4d1646da6a68ab5060d344;hp=96df09bc5611d60dc13ccca40ace5eeb2fcb5b5f;hpb=eb6f5959d8f8e03bf8bfba6c3091bdb962ec0830;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/public-api/math/math-utils.h b/dali/public-api/math/math-utils.h
index 96df09b..e9b92d9 100644
--- a/dali/public-api/math/math-utils.h
+++ b/dali/public-api/math/math-utils.h
@@ -2,7 +2,7 @@
 #define __DALI_MATH_UTILS_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -18,6 +18,9 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <cstdint> // uint32_t
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/common/constants.h>
@@ -38,9 +41,9 @@ namespace Dali
  * @param[in] i Input number
  * @return The next power of two or i itself in case it's a power of two
  */
-inline unsigned int NextPowerOfTwo( unsigned int i )
+inline uint32_t NextPowerOfTwo( uint32_t i )
 {
-  DALI_ASSERT_ALWAYS(i <= 1u << (sizeof(unsigned) * 8 - 1) && "Return type cannot represent the next power of two greater than the argument.");
+  DALI_ASSERT_ALWAYS(i <= 1u << (sizeof(uint32_t) * 8 - 1) && "Return type cannot represent the next power of two greater than the argument.");
   if(i==0u)
   {
     return 1u;
@@ -63,7 +66,7 @@ inline unsigned int NextPowerOfTwo( unsigned int i )
  * @param[in] i Input number
  * @return    True if i is power of two.
  */
-inline bool IsPowerOfTwo( unsigned int i )
+inline bool IsPowerOfTwo( uint32_t i )
 {
   return (i != 0u) && ((i & (i - 1u)) == 0u);
 }
@@ -131,7 +134,7 @@ inline float GetRangedEpsilon( float a, float b )
   const float absA = fabsf( a );
   const float absB = fabsf( b );
   const float absF = absA > absB ? absA : absB;
-  const int absI = absF;
+  const int32_t absI = static_cast<int32_t>( absF ); // truncated
 
   float epsilon = Math::MACHINE_EPSILON_10000;
   if (absF < 0.1f)
@@ -207,12 +210,12 @@ inline bool Equals( float a, float b, float epsilon )
  * @param[in] pos decimal place
  * @return a rounded float
  */
-inline float Round(float value, int pos)
+inline float Round( float value, int32_t pos )
 {
   float temp;
-  temp = value * powf( 10, pos );
-  temp = floorf( temp + 0.5 );
-  temp *= powf( 10, -pos );
+  temp = value * powf( 10.f, static_cast<float>( pos ) );
+  temp = floorf( temp + 0.5f );
+  temp *= powf( 10.f, static_cast<float>( -pos ) );
   return temp;
 }
 
@@ -233,7 +236,7 @@ inline float Round(float value, int pos)
  * @endcode
  *
  * The value x will be confined to this domain.
- * If x is below 2 e.g. 0, then it is wraped to 6.
+ * If x is below 2 e.g. 0, then it is wrapped to 6.
  * If x is above or equal to 8 e.g. 8.1 then it is
  * wrapped to 2.1.
  *
@@ -275,8 +278,8 @@ inline float WrapInDomain(float x, float start, float end)
  * @endcode
  *
  * Knowing the shortest distance is useful with wrapped domains
- * to solve problems such as determing the closest object to
- * a given point, or determing whether turning left or turning
+ * to solve problems such as determining the closest object to
+ * a given point, or determining whether turning left or turning
  * right is the shortest route to get from angle 10 degrees
  * to angle 350 degrees (clearly in a 0-360 degree domain, turning
  * left 20 degrees is quicker than turning right 340 degrees).
@@ -334,7 +337,7 @@ inline float ShortestDistanceInDomain( float a, float b, float start, float end
  * @return -1 for negative values, +1 for positive values and 0 if value is 0
  */
 template <typename T>
-int Sign( T value )
+int32_t Sign( T value )
 {
   return ( T(0) < value ) - ( value < T(0) );
 }