From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Tue, 10 Jan 2017 10:22:29 +0000 (+0900)
Subject: Match the arguments type in 'max' function
X-Git-Tag: dali_1.2.23~15^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F109559%2F1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Match the arguments type in 'max' function

- Fix the matching:
  'max(double, float)' -> 'max(double, double)'

Change-Id: I07a8737d2d1a3934b7588aa8d925dd2389455ef4
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
---

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 eadaa49..471f371 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), floor((position - mDomain.min) / mSpacing + 0.5f));
+    page = std::max(static_cast<double>(0.0f), static_cast<double>(floor((position - mDomain.min) / mSpacing + 0.5f)));
 
     if(wrap)
     {