summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/state.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/state.c b/src/state.c
index b9b7bbc..72bb759 100644
--- a/src/state.c
+++ b/src/state.c
@@ -37,7 +37,7 @@ static int fincmp(const void *a, const void *b)
37 return ((struct FingerState *)a)->id - ((struct FingerState *)b)->id; 37 return ((struct FingerState *)a)->id - ((struct FingerState *)b)->id;
38} 38}
39 39
40inline int abs15(int x) 40static inline int clamp15(int x)
41{ 41{
42 return x < -XMAX ? -XMAX : x > XMAX ? XMAX : x; 42 return x < -XMAX ? -XMAX : x > XMAX ? XMAX : x;
43} 43}
@@ -45,8 +45,8 @@ inline int abs15(int x)
45/* abslute scale is assumed to fit in 15 bits */ 45/* abslute scale is assumed to fit in 15 bits */
46inline int dist2(const struct FingerData *a, const struct FingerData *b) 46inline int dist2(const struct FingerData *a, const struct FingerData *b)
47{ 47{
48 int dx = abs15(a->position_x - b->position_x); 48 int dx = clamp15(a->position_x - b->position_x);
49 int dy = abs15(a->position_y - b->position_y); 49 int dy = clamp15(a->position_y - b->position_y);
50 50
51 return dx * dx + dy * dy; 51 return dx * dx + dy * dy;
52} 52}