xf86-video-nv: src/nv_cursor.c src/riva_cursor.c
Ian Romanick
idr at kemper.freedesktop.org
Wed Nov 21 15:35:11 PST 2007
src/nv_cursor.c | 6 +++---
src/riva_cursor.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit e9ada35b4d24abd44bc5d811b59c6f25af5984f4
Author: Ian Romanick <idr at us.ibm.com>
Date: Wed Nov 21 15:35:06 2007 -0800
Build fix for recent removal of ALLOCATE_LOCAL and DEALLOCATE_LOCAL
diff --git a/src/nv_cursor.c b/src/nv_cursor.c
index a648f60..abaaab2 100644
--- a/src/nv_cursor.c
+++ b/src/nv_cursor.c
@@ -135,18 +135,18 @@ TransformCursor (NVPtr pNv)
/* convert to color cursor */
if(pNv->alphaCursor) {
dwords = 64 * 64;
- if(!(tmp = ALLOCATE_LOCAL(dwords * 4))) return;
+ if(!(tmp = xcalloc(dwords * 4))) return;
ConvertCursor8888(pNv, pNv->curImage, tmp);
} else {
dwords = (32 * 32) >> 1;
- if(!(tmp = ALLOCATE_LOCAL(dwords * 4))) return;
+ if(!(tmp = xcalloc(dwords * 4))) return;
ConvertCursor1555(pNv, pNv->curImage, (CARD16*)tmp);
}
for(i = 0; i < dwords; i++)
pNv->CURSOR[i] = tmp[i];
- DEALLOCATE_LOCAL(tmp);
+ xfree(tmp);
}
static void
diff --git a/src/riva_cursor.c b/src/riva_cursor.c
index b8dc2bf..77a3bfe 100644
--- a/src/riva_cursor.c
+++ b/src/riva_cursor.c
@@ -72,13 +72,13 @@ RivaTransformCursor (RivaPtr pRiva)
int i, dwords;
dwords = (32 * 32) >> 1;
- if(!(tmp = ALLOCATE_LOCAL(dwords * 4))) return;
+ if(!(tmp = xcalloc(dwords * 4))) return;
RivaConvertCursor1555(pRiva, pRiva->curImage, (CARD16*)tmp);
for(i = 0; i < dwords; i++)
pRiva->riva.CURSOR[i] = tmp[i];
- DEALLOCATE_LOCAL(tmp);
+ xfree(tmp);
}
static void
More information about the xorg-commit
mailing list