xserver: Branch 'server-1.4-branch' - 2 commits

[Eric Anholt]

 dix/getevents.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 3e9ecdcb132bb223febc396626211aa2681e4c79 (from a964d541283e93b1096150275ba2d95594bf77ea)
Author: Matthieu Herrb <matthieu at bluenote.herrb.com>
Date:   Thu Aug 23 22:11:56 2007 +0200

    Remove an extra cast.
    
    Thou should not apply patches manually without testing.
    (cherry picked from commit a66c0f1dca2958835ff65a5b50579e3304ed316a)

diff --git a/dix/getevents.c b/dix/getevents.c
index 52b74bd..162fa45 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -250,7 +250,7 @@ acceleratePointer(DeviceIntPtr pDev, int
             }
         }
         else {
-		mult = pow((float)((float)dx * (float)dx + (float)dy * (float)dy),
+		mult = pow((float)dx * (float)dx + (float)dy * (float)dy,
                        ((float)(pDev->ptrfeed->ctrl.num) /
                         (float)(pDev->ptrfeed->ctrl.den) - 1.0) /
                        2.0) / 2.0;
diff-tree a964d541283e93b1096150275ba2d95594bf77ea (from bcd6708895e5c2fda423bb13fe42b078ef293b13)
Author: Otto Moerbeek <otto at openbsd.org>
Date:   Thu Aug 23 21:59:25 2007 +0200

    A high resolution device that's moving fast can potentially generate
    an int overflow, making dx*dx+dy*dy negative. Now pow(negative,
    non-integer) yields NaN, so you loose.  Use fp math to avoid that.
    (cherry picked from commit 12d27cf33c6d963eae77795c0d247175907162a5)

diff --git a/dix/getevents.c b/dix/getevents.c
index 2a10038..52b74bd 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -250,7 +250,7 @@ acceleratePointer(DeviceIntPtr pDev, int
             }
         }
         else {
-            mult = pow((float)(dx * dx + dy * dy),
+		mult = pow((float)((float)dx * (float)dx + (float)dy * (float)dy),
                        ((float)(pDev->ptrfeed->ctrl.num) /
                         (float)(pDev->ptrfeed->ctrl.den) - 1.0) /
                        2.0) / 2.0;