Merge "use modern construct '= default' for special functions." into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / render / common / render-item.cpp

diff --git a/dali/internal/render/common/render-item.cpp b/dali/internal/render/common/render-item.cpp
old mode 100644 (file)
new mode 100755 (executable)
index b795530..5492878
--- a/dali/internal/render/common/render-item.cpp
+++ b/dali/internal/render/common/render-item.cpp
@@ -56,10 +56,7 @@ RenderItem::RenderItem()
 {
 }
 
-RenderItem::~RenderItem()
-{
-}
-
+RenderItem::~RenderItem() = default;
 
 ClippingBox RenderItem::CalculateViewportSpaceAABB( const Vector3& size, const int viewportWidth, const int viewportHeight ) const
 {
@@ -110,8 +107,8 @@ ClippingBox RenderItem::CalculateViewportSpaceAABB( const Vector3& size, const i
                         static_cast<float>( viewportWidth )  * 0.5f - aabb.x,
                         static_cast<float>( viewportHeight ) * 0.5f - aabb.y );
 
-  int x = static_cast< int >( roundf( aabbInScreen.x ) );
-  int y = static_cast< int >( roundf( aabbInScreen.y ) );
+  int x = static_cast< int >( floor( aabbInScreen.x ) );
+  int y = static_cast< int >( floor( aabbInScreen.y ) );
   int z = static_cast< int >( roundf( aabbInScreen.z ) );
   int w = static_cast< int >( roundf( aabbInScreen.w ) );