Add extra std headers and use fabs, fround where needed.

Change-Id: I3192ac905e99de922c47955c32d748c727b26f0f

diff --git a/dali-toolkit/devel-api/builder/tree-node.cpp b/dali-toolkit/devel-api/builder/tree-node.cpp
index 3d9eed7..f8473ad 100644 (file)
--- a/dali-toolkit/devel-api/builder/tree-node.cpp
+++ b/dali-toolkit/devel-api/builder/tree-node.cpp
@@ -16,7 +16,9 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

+#include <cctype>

 #include <cstring>
 #include <cstring>

+#include <string>

 #include <algorithm>
 
 // INTERNAL INCLUDES
 #include <algorithm>
 
 // INTERNAL INCLUDES

diff --git a/dali-toolkit/internal/builder/json-parser-state.cpp b/dali-toolkit/internal/builder/json-parser-state.cpp
index 3691838..636bac1 100644 (file)
--- a/dali-toolkit/internal/builder/json-parser-state.cpp
+++ b/dali-toolkit/internal/builder/json-parser-state.cpp
@@ -19,6 +19,7 @@
 #include <dali-toolkit/internal/builder/json-parser-state.h>
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/internal/builder/json-parser-state.h>
 
 // EXTERNAL INCLUDES

+#include <string>

 #include <algorithm>
 
 namespace Dali
 #include <algorithm>
 
 namespace Dali

diff --git a/dali-toolkit/internal/image-loader/atlas-packer.cpp b/dali-toolkit/internal/image-loader/atlas-packer.cpp
index 26ad3e0..4becddf 100644 (file)
--- a/dali-toolkit/internal/image-loader/atlas-packer.cpp
+++ b/dali-toolkit/internal/image-loader/atlas-packer.cpp
@@ -19,7 +19,7 @@
 #include "atlas-packer.h"
 
 // EXTERNAL HEADER
 #include "atlas-packer.h"
 
 // EXTERNAL HEADER

-#include <stdlib.h> // For abs()
+#include <cstdlib> // For abs()

 #include <dali/integration-api/debug.h>
 
 namespace Dali
 #include <dali/integration-api/debug.h>
 
 namespace Dali


@@ -36,7 +36,7 @@ namespace
 
 bool ApproximatelyEqual( uint32_t a, uint32_t b  )
 {
 
 bool ApproximatelyEqual( uint32_t a, uint32_t b  )
 {

-  return abs( a-b ) <= 1;
+  return std::abs( static_cast<int32_t>( a - b ) ) <= 1;

 }
 
 uint16_t MaxDimension( const Uint16Pair& dimensions )
 }
 
 uint16_t MaxDimension( const Uint16Pair& dimensions )

diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp
index b35ce74..9d1b93d 100755 (executable)
--- a/dali-toolkit/internal/text/layouts/layout-engine.cpp
+++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <limits>
 
 // EXTERNAL INCLUDES
 #include <limits>

+#include <cmath>

 #include <dali/integration-api/debug.h>
 #include <dali/devel-api/text-abstraction/font-client.h>
 
 #include <dali/integration-api/debug.h>
 #include <dali/devel-api/text-abstraction/font-client.h>
 


@@ -397,7 +398,7 @@ struct Engine::Impl
       const GlyphInfo& glyph = *( glyphsBuffer + i );
       Vector2& position = *( glyphPositionsBuffer + i );
 
       const GlyphInfo& glyph = *( glyphsBuffer + i );
       Vector2& position = *( glyphPositionsBuffer + i );
 

-      position.x = std::round( penX + glyph.xBearing );
+      position.x = std::roundf( penX + glyph.xBearing );

       position.y = -glyph.yBearing;
 
       penX += ( glyph.advance + interGlyphExtraAdvance );
       position.y = -glyph.yBearing;
 
       penX += ( glyph.advance + interGlyphExtraAdvance );

diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
index a7b098a..5ca9858 100755 (executable)
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <limits>
 
 // EXTERNAL INCLUDES
 #include <limits>

+#include <cmath>

 #include <memory.h>
 #include <dali/public-api/adaptor-framework/key.h>
 #include <dali/integration-api/debug.h>
 #include <memory.h>
 #include <dali/public-api/adaptor-framework/key.h>
 #include <dali/integration-api/debug.h>


@@ -1440,7 +1441,7 @@ const std::string& Controller::GetDefaultOutlineProperties() const
 
 bool Controller::SetDefaultLineSpacing( float lineSpacing )
 {
 
 bool Controller::SetDefaultLineSpacing( float lineSpacing )
 {

-  if( std::abs(lineSpacing - mImpl->mLayoutEngine.GetDefaultLineSpacing()) > Math::MACHINE_EPSILON_1000 )
+  if( std::fabs( lineSpacing - mImpl->mLayoutEngine.GetDefaultLineSpacing() ) > Math::MACHINE_EPSILON_1000 )

   {
     mImpl->mLayoutEngine.SetDefaultLineSpacing(lineSpacing);
     mImpl->mRecalculateNaturalSize = true;
   {
     mImpl->mLayoutEngine.SetDefaultLineSpacing(lineSpacing);
     mImpl->mRecalculateNaturalSize = true;