From 2eb7a9f3f23a401b4d92e5ac690269465bd65263 Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Mon, 13 May 2019 15:39:45 +0100 Subject: [PATCH] Fix build error with gcc 5.4.1 Change-Id: Ie80e411d861c2ee16b77becb4299418896691e9b --- dali/internal/event/events/pan-gesture-recognizer.cpp | 4 ++-- dali/internal/event/events/tap-gesture-recognizer.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dali/internal/event/events/pan-gesture-recognizer.cpp b/dali/internal/event/events/pan-gesture-recognizer.cpp index cadad3a..7a2d4ad 100644 --- a/dali/internal/event/events/pan-gesture-recognizer.cpp +++ b/dali/internal/event/events/pan-gesture-recognizer.cpp @@ -50,11 +50,11 @@ PanGestureRecognizer::PanGestureRecognizer( Observer& observer, Vector2 screenSi mObserver( observer ), mState( Clear ), mThresholdAdjustmentsRemaining( 0 ), - mThresholdTotalAdjustments( MINIMUM_MOTION_DISTANCE_BEFORE_PAN * MINIMUM_MOTION_DISTANCE_TO_THRESHOLD_ADJUSTMENTS_RATIO ), + mThresholdTotalAdjustments( static_cast( MINIMUM_MOTION_DISTANCE_BEFORE_PAN * MINIMUM_MOTION_DISTANCE_TO_THRESHOLD_ADJUSTMENTS_RATIO ) ), mPrimaryTouchDownTime( 0 ), mMinimumTouchesRequired( request.minTouches ), mMaximumTouchesRequired( request.maxTouches ), - mMinimumDistanceSquared( MINIMUM_MOTION_DISTANCE_BEFORE_PAN_SQUARED ), + mMinimumDistanceSquared( static_cast( MINIMUM_MOTION_DISTANCE_BEFORE_PAN_SQUARED ) ), mMinimumMotionEvents( MINIMUM_MOTION_EVENTS_BEFORE_PAN ), mMotionEvents( 0 ) { diff --git a/dali/internal/event/events/tap-gesture-recognizer.cpp b/dali/internal/event/events/tap-gesture-recognizer.cpp index 1129d9a..fa3a0b1 100644 --- a/dali/internal/event/events/tap-gesture-recognizer.cpp +++ b/dali/internal/event/events/tap-gesture-recognizer.cpp @@ -132,8 +132,8 @@ void TapGestureRecognizer::SendEvent(const Integration::TouchEvent& event) else if (pointState == PointState::DOWN) { const Vector2& screen( point.GetScreenPosition() ); - Vector2 distanceDelta(abs(mTouchPosition.x - screen.x), - abs(mTouchPosition.y - screen.y)); + Vector2 distanceDelta(std::abs(mTouchPosition.x - screen.x), + std::abs(mTouchPosition.y - screen.y)); uint32_t timeDelta = event.time - mLastTapTime; @@ -211,8 +211,8 @@ void TapGestureRecognizer::EmitSingleTap( uint32_t time, const Integration::Poin { TapGestureEvent event( Gesture::Started ); const Vector2& screen( point.GetScreenPosition() ); - Vector2 distanceDelta(abs(mTouchPosition.x - screen.x), - abs(mTouchPosition.y - screen.y)); + Vector2 distanceDelta(std::abs(mTouchPosition.x - screen.x), + std::abs(mTouchPosition.y - screen.y)); if (distanceDelta.x > MAXIMUM_MOTION_ALLOWED || distanceDelta.y > MAXIMUM_MOTION_ALLOWED ) -- 2.7.4