From e0fb25b6057c8531f855a9b24030b15619cc9f0b Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 28 Mar 2010 18:31:14 +0000 Subject: xserver git update 28-3-2010 --- xorg-server/Xext/xf86bigfont.c | 5 +++-- xorg-server/Xext/xf86bigfontsrv.h | 34 ++++++++++++++++++++++++++++++++++ xorg-server/dix/dixfonts.c | 3 +-- xorg-server/glx/glxcmdsswap.c | 8 ++++---- xorg-server/mi/miinitext.c | 2 +- xorg-server/os/log.c | 3 +-- xorg-server/render/glyph.c | 3 +++ 7 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 xorg-server/Xext/xf86bigfontsrv.h diff --git a/xorg-server/Xext/xf86bigfont.c b/xorg-server/Xext/xf86bigfont.c index ba8b60358..a4eb3f659 100644 --- a/xorg-server/Xext/xf86bigfont.c +++ b/xorg-server/Xext/xf86bigfont.c @@ -74,6 +74,7 @@ #include "protocol-versions.h" #include +#include "xf86bigfontsrv.h" static void XF86BigfontResetProc( ExtensionEntry * /* extEntry */ @@ -143,7 +144,7 @@ CheckForShmSyscall(void) #endif void -XFree86BigfontExtensionInit() +XFree86BigfontExtensionInit(void) { if (AddExtension(XF86BIGFONTNAME, XF86BigfontNumberEvents, @@ -302,7 +303,7 @@ XF86BigfontFreeFontShm( /* Called upon fatal signal. */ void -XF86BigfontCleanup() +XF86BigfontCleanup(void) { #ifdef HAS_SHM while (ShmList) diff --git a/xorg-server/Xext/xf86bigfontsrv.h b/xorg-server/Xext/xf86bigfontsrv.h new file mode 100644 index 000000000..2c78dc4c9 --- /dev/null +++ b/xorg-server/Xext/xf86bigfontsrv.h @@ -0,0 +1,34 @@ +/* + * Copyright © 2010 Yaakov Selkowitz + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef _XF86BIGFONTSRV_H_ +#define _XF86BIGFONTSRV_H_ + +#include + +extern void XFree86BigfontExtensionInit(void); +extern void XF86BigfontFreeFontShm(FontPtr); +extern void XF86BigfontCleanup(void); + +#endif diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c index 329318d5d..6dc819313 100644 --- a/xorg-server/dix/dixfonts.c +++ b/xorg-server/dix/dixfonts.c @@ -71,8 +71,7 @@ Equipment Corporation. #endif #ifdef XF86BIGFONT -#define _XF86BIGFONT_SERVER_ -#include +#include "xf86bigfontsrv.h" #endif #define QUERYCHARINFO(pci, pr) *(pr) = (pci)->metrics diff --git a/xorg-server/glx/glxcmdsswap.c b/xorg-server/glx/glxcmdsswap.c index f1c0ce69f..c414dc8e2 100644 --- a/xorg-server/glx/glxcmdsswap.c +++ b/xorg-server/glx/glxcmdsswap.c @@ -354,7 +354,7 @@ int __glXDispSwap_CreateGLXPbufferSGIX(__GLXclientState *cl, GLbyte *pc) int __glXDispSwap_DestroyPbuffer(__GLXclientState *cl, GLbyte *pc) { - xGLXDestroyPbufferReq *req = (xGLXDestroyPbufferReq *) req; + xGLXDestroyPbufferReq *req = (xGLXDestroyPbufferReq *) pc; __GLX_DECLARE_SWAP_VARIABLES; __GLX_SWAP_INT(&req->pbuffer); @@ -364,7 +364,7 @@ int __glXDispSwap_DestroyPbuffer(__GLXclientState *cl, GLbyte *pc) int __glXDispSwap_DestroyGLXPbufferSGIX(__GLXclientState *cl, GLbyte *pc) { - xGLXDestroyGLXPbufferSGIXReq *req = (xGLXDestroyGLXPbufferSGIXReq *) req; + xGLXDestroyGLXPbufferSGIXReq *req = (xGLXDestroyGLXPbufferSGIXReq *) pc; __GLX_DECLARE_SWAP_VARIABLES; __GLX_SWAP_INT(&req->pbuffer); @@ -375,7 +375,7 @@ int __glXDispSwap_DestroyGLXPbufferSGIX(__GLXclientState *cl, GLbyte *pc) int __glXDispSwap_ChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc) { xGLXChangeDrawableAttributesReq *req = - (xGLXChangeDrawableAttributesReq *) req; + (xGLXChangeDrawableAttributesReq *) pc; __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; CARD32 *attribs; @@ -392,7 +392,7 @@ int __glXDispSwap_ChangeDrawableAttributesSGIX(__GLXclientState *cl, GLbyte *pc) { xGLXChangeDrawableAttributesSGIXReq *req = - (xGLXChangeDrawableAttributesSGIXReq *) req; + (xGLXChangeDrawableAttributesSGIXReq *) pc; __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; CARD32 *attribs; diff --git a/xorg-server/mi/miinitext.c b/xorg-server/mi/miinitext.c index 2a67fd371..692be86f4 100644 --- a/xorg-server/mi/miinitext.c +++ b/xorg-server/mi/miinitext.c @@ -185,7 +185,7 @@ typedef void (*InitExtension)(INITARGS); #include #endif #ifdef XF86BIGFONT -#include +#include #endif #ifdef RES #include diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c index 0002e59f0..f4832c12f 100644 --- a/xorg-server/os/log.c +++ b/xorg-server/os/log.c @@ -99,8 +99,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #endif #ifdef XF86BIGFONT -#define _XF86BIGFONT_SERVER_ -#include +#include "xf86bigfontsrv.h" #endif #ifdef DDXOSVERRORF diff --git a/xorg-server/render/glyph.c b/xorg-server/render/glyph.c index 0b864ad4d..f0f3b1913 100644 --- a/xorg-server/render/glyph.c +++ b/xorg-server/render/glyph.c @@ -217,6 +217,9 @@ FindGlyphByHash (unsigned char sha1[20], int format) GlyphRefPtr gr; CARD32 signature = *(CARD32 *) sha1; + if (!globalGlyphs[format].hashSet) + return NULL; + gr = FindGlyphRef (&globalGlyphs[format], signature, TRUE, sha1); -- cgit v1.2.3