diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:50 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:50 +0000 |
| commit | 7faeec0e653838dc78d8df0c1eb10b833ff0c816 (patch) | |
| tree | 8a2b0a5e90b77b365a7dc3a0407ce02a6a672ee7 /src/Glyph.c | |
| parent | 3cdb1c4406d51f671f60f530c557ebfca81bfd3c (diff) | |
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
Diffstat (limited to 'src/Glyph.c')
| -rw-r--r-- | src/Glyph.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/Glyph.c b/src/Glyph.c index 6495e53..d221ea5 100644 --- a/src/Glyph.c +++ b/src/Glyph.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/lib/Xrender/Glyph.c,v 1.12 2002/11/05 23:22:35 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * @@ -28,7 +27,7 @@ GlyphSet XRenderCreateGlyphSet (Display *dpy, _Xconst XRenderPictFormat *format) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); GlyphSet gsid; xRenderCreateGlyphSetReq *req; @@ -47,7 +46,7 @@ XRenderCreateGlyphSet (Display *dpy, _Xconst XRenderPictFormat *format) GlyphSet XRenderReferenceGlyphSet (Display *dpy, GlyphSet existing) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); GlyphSet gsid; xRenderReferenceGlyphSetReq *req; @@ -66,7 +65,7 @@ XRenderReferenceGlyphSet (Display *dpy, GlyphSet existing) void XRenderFreeGlyphSet (Display *dpy, GlyphSet glyphset) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderFreeGlyphSetReq *req; RenderSimpleCheckExtension (dpy, info); @@ -88,7 +87,7 @@ XRenderAddGlyphs (Display *dpy, _Xconst char *images, int nbyte_images) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderAddGlyphsReq *req; long len; @@ -116,7 +115,7 @@ XRenderFreeGlyphs (Display *dpy, _Xconst Glyph *gids, int nglyphs) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderFreeGlyphsReq *req; long len; @@ -148,7 +147,7 @@ XRenderCompositeString8 (Display *dpy, _Xconst char *string, int nchar) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderCompositeGlyphs8Req *req; long len; xGlyphElt *elt; @@ -233,7 +232,7 @@ XRenderCompositeString16 (Display *dpy, _Xconst unsigned short *string, int nchar) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderCompositeGlyphs8Req *req; long len; xGlyphElt *elt; @@ -313,7 +312,7 @@ XRenderCompositeString32 (Display *dpy, _Xconst unsigned int *string, int nchar) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderCompositeGlyphs8Req *req; long len; xGlyphElt *elt; @@ -392,7 +391,7 @@ XRenderCompositeText8 (Display *dpy, _Xconst XGlyphElt8 *elts, int nelt) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderCompositeGlyphs8Req *req; GlyphSet glyphset; long len; @@ -505,7 +504,7 @@ XRenderCompositeText16 (Display *dpy, _Xconst XGlyphElt16 *elts, int nelt) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderCompositeGlyphs16Req *req; GlyphSet glyphset; long len; @@ -616,7 +615,7 @@ XRenderCompositeText32 (Display *dpy, _Xconst XGlyphElt32 *elts, int nelt) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderCompositeGlyphs32Req *req; GlyphSet glyphset; long len; |