diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 19:39:46 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 19:39:46 +0000 |
| commit | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (patch) | |
| tree | c1e02b9d3509aa97703aa4b540d4cd22ec4600ed /xorg-server/render/render.c | |
| parent | dc3c299dd0995549e2a6973ca0f25b254afd38a5 (diff) | |
| download | vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.gz vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.bz2 vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.zip | |
Added xorg-server-1.6.2.tar.gz
Diffstat (limited to 'xorg-server/render/render.c')
| -rw-r--r-- | xorg-server/render/render.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/xorg-server/render/render.c b/xorg-server/render/render.c index 638aa46a3..7cb93bd18 100644 --- a/xorg-server/render/render.c +++ b/xorg-server/render/render.c @@ -210,11 +210,9 @@ int (*SProcRenderVector[RenderNumberRequests])(ClientPtr) = { SProcRenderCreateConicalGradient }; -static void -RenderResetProc (ExtensionEntry *extEntry); - int RenderErrBase; -DevPrivateKey RenderClientPrivateKey; +static int RenderClientPrivateKeyIndex; +DevPrivateKey RenderClientPrivateKey = &RenderClientPrivateKeyIndex; typedef struct _RenderClient { int major_version; @@ -252,17 +250,12 @@ RenderExtensionInit (void) extEntry = AddExtension (RENDER_NAME, 0, RenderNumberErrors, ProcRenderDispatch, SProcRenderDispatch, - RenderResetProc, StandardMinorOpcode); + NULL, StandardMinorOpcode); if (!extEntry) return; RenderErrBase = extEntry->errorBase; } -static void -RenderResetProc (ExtensionEntry *extEntry) -{ -} - static int ProcRenderQueryVersion (ClientPtr client) { @@ -305,8 +298,6 @@ findVisual (ScreenPtr pScreen, VisualID vid) return 0; } -extern char *ConnectionInfo; - static int ProcRenderQueryPictFormats (ClientPtr client) { @@ -1580,21 +1571,19 @@ ProcRenderCreateCursor (ClientPtr client) stride = BitmapBytePad(width); nbytes_mono = stride*height; - srcbits = (unsigned char *)xalloc(nbytes_mono); + srcbits = xcalloc(1, nbytes_mono); if (!srcbits) { xfree (argbbits); return (BadAlloc); } - mskbits = (unsigned char *)xalloc(nbytes_mono); + mskbits = xcalloc(1, nbytes_mono); if (!mskbits) { xfree(argbbits); xfree(srcbits); return (BadAlloc); } - bzero ((char *) mskbits, nbytes_mono); - bzero ((char *) srcbits, nbytes_mono); if (pSrc->format == PICT_a8r8g8b8) { |