From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Fri, 20 Jan 2017 02:19:21 +0000 (+0900)
Subject: Revert "[Tizen] Match the arguments type in 'max' function"
X-Git-Tag: accepted/tizen/common/20170123.182454~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F98%2F111198%2F1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Revert "[Tizen] Match the arguments type in 'max' function"

This reverts commit 8291e49c793797380b613492950f1bf8213218f9.

Change-Id: If00b911f389c68a7a996a8acc4be364cab283a47
---

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp
index 471f371..eadaa49 100644
--- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp
@@ -248,7 +248,7 @@ unsigned int FixedRuler::GetPageFromPosition(float position, bool wrap) const
     {
       position = WrapInDomain(position, mDomain.min, mDomain.max);
     }
-    page = std::max(static_cast<double>(0.0f), static_cast<double>(floor((position - mDomain.min) / mSpacing + 0.5f)));
+    page = std::max(static_cast<double>(0.0f), floor((position - mDomain.min) / mSpacing + 0.5f));
 
     if(wrap)
     {