xf86-video-nv: src/nv_cursor.c src/riva_cursor.c
Alan Coopersmith
alanc at kemper.freedesktop.org
Mon Nov 26 13:15:00 PST 2007
src/nv_cursor.c | 4 ++--
src/riva_cursor.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 100f5e24da2cbc79ed761083daa9a00b107008ab
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date: Mon Nov 26 13:14:40 2007 -0800
xcalloc needs 2 args, Xcalloc takes one - yay for inconsistency!
diff --git a/src/nv_cursor.c b/src/nv_cursor.c
index abaaab2..73e3fc6 100644
--- a/src/nv_cursor.c
+++ b/src/nv_cursor.c
@@ -135,11 +135,11 @@ TransformCursor (NVPtr pNv)
/* convert to color cursor */
if(pNv->alphaCursor) {
dwords = 64 * 64;
- if(!(tmp = xcalloc(dwords * 4))) return;
+ if(!(tmp = Xcalloc(dwords * 4))) return;
ConvertCursor8888(pNv, pNv->curImage, tmp);
} else {
dwords = (32 * 32) >> 1;
- if(!(tmp = xcalloc(dwords * 4))) return;
+ if(!(tmp = Xcalloc(dwords * 4))) return;
ConvertCursor1555(pNv, pNv->curImage, (CARD16*)tmp);
}
diff --git a/src/riva_cursor.c b/src/riva_cursor.c
index 77a3bfe..35d6a58 100644
--- a/src/riva_cursor.c
+++ b/src/riva_cursor.c
@@ -72,7 +72,7 @@ RivaTransformCursor (RivaPtr pRiva)
int i, dwords;
dwords = (32 * 32) >> 1;
- if(!(tmp = xcalloc(dwords * 4))) return;
+ if(!(tmp = Xcalloc(dwords * 4))) return;
RivaConvertCursor1555(pRiva, pRiva->curImage, (CARD16*)tmp);
for(i = 0; i < dwords; i++)
More information about the xorg-commit
mailing list