diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-04-20 15:41:45 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-04-21 14:22:52 +1000 |
| commit | e4901905903c5630a1092c69e42f313abd05187b (patch) | |
| tree | eee868fd6ccf8a2ddef41de8d2fb519e9d5549c1 | |
| parent | 81c6e79f42cc263349e04c0d82b3a85d6b557885 (diff) | |
dix: reduce scope of tmp and mult.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
| -rw-r--r-- | dix/ptrveloc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c index dcb4e4b04..bcaeb74c9 100644 --- a/dix/ptrveloc.c +++ b/dix/ptrveloc.c @@ -1118,7 +1118,6 @@ acceleratePointerPredictable( ValuatorMask* val, CARD32 evtime) { - float tmp, mult; /* no need to init */ int dx = 0, dy = 0, tmpi; DeviceVelocityPtr velocitydata = GetDevicePredictableAccelData(dev); Bool soften = TRUE; @@ -1146,6 +1145,8 @@ acceleratePointerPredictable( } if (dev->ptrfeed && dev->ptrfeed->ctrl.num) { + float mult; + /* invoke acceleration profile to determine acceleration */ mult = ComputeAcceleration (dev, velocitydata, dev->ptrfeed->ctrl.threshold, @@ -1163,6 +1164,7 @@ acceleratePointerPredictable( /* Calculate the new delta (with accel) and drop it back * into the valuator masks */ if (dx) { + float tmp; tmp = mult * fdx + dev->last.remainder[0]; /* Since it may not be apparent: lrintf() does not offer * strong statements about rounding; however because we @@ -1174,6 +1176,7 @@ acceleratePointerPredictable( dev->last.remainder[0] = tmp - (float)tmpi; } if (dy) { + float tmp; tmp = mult * fdy + dev->last.remainder[1]; tmpi = lrintf(tmp); valuator_mask_set(val, 1, tmpi); |