From a5d80f02f6d63f3cc757a965654ef061f0a972e1 Mon Sep 17 00:00:00 2001 From: Jason Gerecke Date: Fri, 5 Dec 2014 15:13:34 -0800 Subject: [PATCH] Remove spurious addition from range normalization calculation The presence of a "+1" in the range calculation prevents the normalization functions from returning a value of "1.0" when absinfo->value has reached its maximum. Signed-off-by: Jason Gerecke Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- src/evdev-tablet.c | 4 ++-- test/tablet.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/evdev-tablet.c b/src/evdev-tablet.c index 6f18f9a0..4f1bc768 100644 --- a/src/evdev-tablet.c +++ b/src/evdev-tablet.c @@ -105,7 +105,7 @@ tablet_update_tool(struct tablet_dispatch *tablet, static inline double normalize_pressure_or_dist(const struct input_absinfo * absinfo) { - double range = absinfo->maximum - absinfo->minimum + 1; + double range = absinfo->maximum - absinfo->minimum; double value = (absinfo->value - absinfo->minimum) / range; return value; @@ -113,7 +113,7 @@ normalize_pressure_or_dist(const struct input_absinfo * absinfo) { static inline double normalize_tilt(const struct input_absinfo * absinfo) { - double range = absinfo->maximum - absinfo->minimum + 1; + double range = absinfo->maximum - absinfo->minimum; double value = (absinfo->value - absinfo->minimum) / range; /* Map to the (-1, 1) range */ diff --git a/test/tablet.c b/test/tablet.c index 6d98bebd..367c4db4 100644 --- a/test/tablet.c +++ b/test/tablet.c @@ -438,13 +438,13 @@ START_TEST(normalization) litest_event(dev, EV_ABS, ABS_TILT_X, - tilt_vertical_absinfo->maximum + 1); + tilt_vertical_absinfo->maximum); if (tilt_horizontal_absinfo != NULL) litest_event(dev, EV_ABS, ABS_TILT_Y, - tilt_horizontal_absinfo->maximum + 1); + tilt_horizontal_absinfo->maximum); litest_event(dev, EV_SYN, SYN_REPORT, 0);