From 3b8c60954e2b64aa87810f083b1ae3fda473a7cb Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 1 Aug 2017 19:35:14 +0900 Subject: [PATCH] Revert "elm gesture layer - use fabs not abs when actually comparing floats" This reverts commit 2d4d836018387470b5df2c59119ab6cc81188e94. Don't pretend to fix an issue found by a static analyzer by introducing another issue that even clang warns about. Fixes: elm_gesture_layer.c:2533: warning: using floating point absolute value function 'fabs' when argument is of integer type [-Wabsolute-value] if ((fabs(st->info.mx) > ELM_GESTURE_MINIMUM_MOMENTUM) || ^ --- src/lib/elementary/elm_gesture_layer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c index 3a29734216..6baa8417cb 100644 --- a/src/lib/elementary/elm_gesture_layer.c +++ b/src/lib/elementary/elm_gesture_layer.c @@ -2530,8 +2530,9 @@ _momentum_test(Evas_Object *obj, st->line_end.y = pe_local.y; st->t_end = pe_local.timestamp; - if ((fabs(st->info.mx) > ELM_GESTURE_MINIMUM_MOMENTUM) || - (fabs(st->info.my) > ELM_GESTURE_MINIMUM_MOMENTUM)) + // FIXME: mx,my are int while the momentum is float. Fishy logic here. + if ((abs(st->info.mx) > ELM_GESTURE_MINIMUM_MOMENTUM) || + (abs(st->info.my) > ELM_GESTURE_MINIMUM_MOMENTUM)) state_to_report = ELM_GESTURE_STATE_END; else state_to_report = ELM_GESTURE_STATE_ABORT;