diff options
| author | Jordan Crouse <jordan.crouse@amd.com> | 2008-08-25 11:34:36 -0600 |
|---|---|---|
| committer | Jordan Crouse <jordan.crouse@amd.com> | 2008-08-25 11:34:36 -0600 |
| commit | c6339a360b611514155e5101dc2c5bc6472d8865 (patch) | |
| tree | 24d980a9b138903ecd87dbb9ae2b7c23ff052855 /src/lx_cursor.c | |
| parent | 38e868271bd24be7a884c8c56772b25cd6fa6f1d (diff) | |
[LX] - RandR 1.2 updates
Remove a flag that was making EXA pixmaps break horribly.
Also, Make the new code compile for Hardy and warning cleanups.
Diffstat (limited to 'src/lx_cursor.c')
| -rw-r--r-- | src/lx_cursor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lx_cursor.c b/src/lx_cursor.c index ca74dd6..64ea9c9 100644 --- a/src/lx_cursor.c +++ b/src/lx_cursor.c @@ -28,6 +28,7 @@ #endif #include "xf86.h" +#include "xf86i2c.h" #include "xf86Crtc.h" #include "geode.h" @@ -42,7 +43,7 @@ LXCursorInit(ScreenPtr pScrn) } static int -_getrow(char *src, int stride, int x, int y) +_getrow(unsigned char *src, int stride, int x, int y) { x = ((x & ~31) << 1) | (x & 31); src += y * stride; @@ -50,7 +51,7 @@ _getrow(char *src, int stride, int x, int y) } static int -_getmask(char *src, int stride, int x, int y) +_getmask(unsigned char *src, int stride, int x, int y) { x = ((x & ~31) << 1) | (1 << 5) | (x & 31); src += y * stride; @@ -62,7 +63,6 @@ LXLoadCursorImage(ScrnInfoPtr pScrni, unsigned char *src) { GeodeRec *pGeode = GEODEPTR(pScrni); unsigned long andMask[32], xorMask[32]; - unsigned char *ptr = src; int y, x; for (y = 0; y < 32; y++) { |