diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-19 12:16:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-19 12:16:20 +0000 |
| commit | 0b53765917ae196147886189ca3514a07e0eb45e (patch) | |
| tree | 0188ad84af0b6949528ff8c53c2d16f24a9f1eea /xorg-server/hw/xfree86/common | |
| parent | 0b8629ada4293370d220bbb7e6c195c711baee7d (diff) | |
| download | vcxsrv-0b53765917ae196147886189ca3514a07e0eb45e.tar.gz vcxsrv-0b53765917ae196147886189ca3514a07e0eb45e.tar.bz2 vcxsrv-0b53765917ae196147886189ca3514a07e0eb45e.zip | |
svn merge -r537:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/hw/xfree86/common')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Xinput.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c index 7723ba683..dba3370f3 100644 --- a/xorg-server/hw/xfree86/common/xf86Xinput.c +++ b/xorg-server/hw/xfree86/common/xf86Xinput.c @@ -86,6 +86,7 @@ #include "windowstr.h" /* screenIsSaved */ #include <stdarg.h> +#include <stdint.h> /* for int64_t */ #include <X11/Xpoll.h> @@ -1177,12 +1178,11 @@ xf86ScaleAxis(int Cx, int Rxlow ) { int X; - int dSx = Sxhigh - Sxlow; - int dRx = Rxhigh - Rxlow; + int64_t dSx = Sxhigh - Sxlow; + int64_t dRx = Rxhigh - Rxlow; - dSx = Sxhigh - Sxlow; if (dRx) { - X = ((dSx * (Cx - Rxlow)) / dRx) + Sxlow; + X = (int)(((dSx * (Cx - Rxlow)) / dRx) + Sxlow); } else { X = 0; |