diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:29:17 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:29:17 +0000 |
| commit | 231ec9ffb13e4d4536fce9dceab545d9edcb9dba (patch) | |
| tree | 1e2f6a3d778a7f185ac3733b515f5b298fc8601e /src/Glyph.c | |
| parent | 35a608915a0512ca419fb0d4f3116fd68d2d8bc5 (diff) | |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGECYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-MERGE
Diffstat (limited to 'src/Glyph.c')
| -rw-r--r-- | src/Glyph.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Glyph.c b/src/Glyph.c index 6495e53..2d0f2c3 100644 --- a/src/Glyph.c +++ b/src/Glyph.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xrender/Glyph.c,v 1.12 2002/11/05 23:22:35 keithp Exp $ + * $Id$ * * Copyright © 2000 SuSE, Inc. * @@ -28,7 +28,7 @@ GlyphSet XRenderCreateGlyphSet (Display *dpy, _Xconst XRenderPictFormat *format) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); GlyphSet gsid; xRenderCreateGlyphSetReq *req; @@ -47,7 +47,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 +66,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 +88,7 @@ XRenderAddGlyphs (Display *dpy, _Xconst char *images, int nbyte_images) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderAddGlyphsReq *req; long len; @@ -116,7 +116,7 @@ XRenderFreeGlyphs (Display *dpy, _Xconst Glyph *gids, int nglyphs) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderFreeGlyphsReq *req; long len; @@ -148,7 +148,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 +233,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 +313,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 +392,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 +505,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 +616,7 @@ XRenderCompositeText32 (Display *dpy, _Xconst XGlyphElt32 *elts, int nelt) { - XExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderCompositeGlyphs32Req *req; GlyphSet glyphset; long len; |