From b7847ff75f88d0ce9bf0bb2e03e338218a446671 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Tue, 10 Jan 2017 19:22:29 +0900 Subject: [PATCH] Match the arguments type in 'max' function - Fix the matching: 'max(double, float)' -> 'max(double, double)' Change-Id: I07a8737d2d1a3934b7588aa8d925dd2389455ef4 Signed-off-by: Seoyeon Kim --- dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(0.0f), floor((position - mDomain.min) / mSpacing + 0.5f)); + page = std::max(static_cast(0.0f), static_cast(floor((position - mDomain.min) / mSpacing + 0.5f))); if(wrap) { -- 2.7.4