Revert "[Tizen] Match the arguments type in 'max' function" 98/111198/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Fri, 20 Jan 2017 02:19:21 +0000 (11:19 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Fri, 20 Jan 2017 02:19:27 +0000 (11:19 +0900)
This reverts commit 8291e49c793797380b613492950f1bf8213218f9.

Change-Id: If00b911f389c68a7a996a8acc4be364cab283a47

dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp

index 471f371..eadaa49 100644 (file)
@@ -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)
     {