diff options
author | marha <marha@users.sourceforge.net> | 2014-09-21 18:14:18 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-09-21 18:14:18 +0200 |
commit | 4e080e0165d18887e2a0fccd7f30cf20fd04b178 (patch) | |
tree | dbefa5addb60abe7a5c52dbc1daea7d6e0c9d4d0 /libXfont/include/X11/fonts/fontutil.h | |
parent | e16399e57caac9e859a7d28921c73ef9839b571e (diff) | |
parent | d0f70707dde032e662dbd5bc70df6ac915403abe (diff) | |
download | vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.tar.gz vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.tar.bz2 vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
libXfont/src/fontfile/fontfile.c
libXfont/src/util/utilbitmap.c
Diffstat (limited to 'libXfont/include/X11/fonts/fontutil.h')
-rw-r--r-- | libXfont/include/X11/fonts/fontutil.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libXfont/include/X11/fonts/fontutil.h b/libXfont/include/X11/fonts/fontutil.h index 71d507b1a..ed55b89e9 100644 --- a/libXfont/include/X11/fonts/fontutil.h +++ b/libXfont/include/X11/fonts/fontutil.h @@ -8,17 +8,17 @@ extern int CheckFSFormat(fsBitmapFormat, fsBitmapFormatMask, int *, int *, int *, int *, int *); extern void FontComputeInfoAccelerators(FontInfoPtr); -extern void GetGlyphs ( FontPtr font, unsigned long count, - unsigned char *chars, FontEncoding fontEncoding, +extern void GetGlyphs ( FontPtr font, unsigned long count, + unsigned char *chars, FontEncoding fontEncoding, unsigned long *glyphcount, CharInfoPtr *glyphs ); -extern void QueryGlyphExtents ( FontPtr pFont, CharInfoPtr *charinfo, +extern void QueryGlyphExtents ( FontPtr pFont, CharInfoPtr *charinfo, unsigned long count, ExtentInfoRec *info ); -extern Bool QueryTextExtents ( FontPtr pFont, unsigned long count, +extern Bool QueryTextExtents ( FontPtr pFont, unsigned long count, unsigned char *chars, ExtentInfoRec *info ); extern Bool ParseGlyphCachingMode ( char *str ); extern void InitGlyphCaching ( void ); extern void SetGlyphCachingMode ( int newmode ); -extern int add_range ( fsRange *newrange, int *nranges, fsRange **range, +extern int add_range ( fsRange *newrange, int *nranges, fsRange **range, Bool charset_subset ); #endif /* _FONTUTIL_H_ */ |