Module Name: xsrc
Committed By: mrg
Date: Thu Mar 20 01:04:22 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-mga/dist/src: mga_exa.c
xsrc/external/mit/xf86-video-savage/dist/src: savage_exa.c
xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c
Log Message:
- avoid casting from int to a pointer.
- call miPointerSetPosition() correctly for this ABI.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c:1.1.1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c:1.1.1.4 Wed Mar 19 23:53:10 2014
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c Thu Mar 20 01:04:22 2014
@@ -729,7 +729,7 @@ mgaDownloadFromScreen(PixmapPtr pSrc, in
{
PMGA(pSrc);
- char *src = (char *) exaGetPixmapFirstPixel(pSrc);
+ char *src = (char *)(unsigned long) exaGetPixmapFirstPixel(pSrc);
int src_pitch = exaGetPixmapPitch(pSrc);
int cpp = (pSrc->drawable.bitsPerPixel + 7) / 8;
Index: xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c
diff -u xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c:1.1.1.6 xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c:1.2
--- xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c:1.1.1.6 Wed Mar 19 23:53:15 2014
+++ xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c Thu Mar 20 01:04:22 2014
@@ -567,7 +567,7 @@ SavageUploadToScreen(PixmapPtr pDst, int
Bool
SavageDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int dst_pitch)
{
- unsigned char *src = (unsigned char *) exaGetPixmapFirstPixel(pSrc);
+ unsigned char *src = (unsigned char *) (unsigned long) exaGetPixmapFirstPixel(pSrc);
int src_pitch = exaGetPixmapPitch(pSrc);
int bpp = pSrc->drawable.bitsPerPixel;
Index: xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
diff -u xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.3 xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.4
--- xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.3 Mon Jun 3 08:50:49 2013
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c Thu Mar 20 01:04:22 2014
@@ -9362,7 +9362,7 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg,
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 13
miPointerSetPosition(inputInfo.pointer, Absolute, x, y);
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
- miPointerSetPosition(inputInfo.pointer, x, y);
+ miPointerSetPosition(inputInfo.pointer, &x, &y);
#else
UpdateCurrentTime();
miPointerAbsoluteCursor(x, y, currentTime.milliseconds);
