diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-08 23:42:34 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-09-08 23:46:56 +0200 |
| commit | d0f70707dde032e662dbd5bc70df6ac915403abe (patch) | |
| tree | 19a595625f8cdedc3662a8638f65451208103dfd /libXfont/include/X11/fonts/bitmap.h | |
| parent | cb346e228aeb500cd61ec86644c034c238332d3b (diff) | |
| download | vcxsrv-d0f70707dde032e662dbd5bc70df6ac915403abe.tar.gz vcxsrv-d0f70707dde032e662dbd5bc70df6ac915403abe.tar.bz2 vcxsrv-d0f70707dde032e662dbd5bc70df6ac915403abe.zip | |
Updated to libXfont 1.5.0
Diffstat (limited to 'libXfont/include/X11/fonts/bitmap.h')
| -rw-r--r-- | libXfont/include/X11/fonts/bitmap.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libXfont/include/X11/fonts/bitmap.h b/libXfont/include/X11/fonts/bitmap.h index c02342759..7309ac60a 100644 --- a/libXfont/include/X11/fonts/bitmap.h +++ b/libXfont/include/X11/fonts/bitmap.h @@ -74,10 +74,10 @@ typedef struct _BitmapFont { #define NUM_SEGMENTS(n) \ (((n)+BITMAP_FONT_SEGMENT_SIZE-1)/BITMAP_FONT_SEGMENT_SIZE) -extern int bitmapGetGlyphs ( FontPtr pFont, unsigned long count, - unsigned char *chars, FontEncoding charEncoding, +extern int bitmapGetGlyphs ( FontPtr pFont, unsigned long count, + unsigned char *chars, FontEncoding charEncoding, unsigned long *glyphCount, CharInfoPtr *glyphs ); -extern int bitmapGetMetrics ( FontPtr pFont, unsigned long count, +extern int bitmapGetMetrics ( FontPtr pFont, unsigned long count, unsigned char *chars, FontEncoding charEncoding, unsigned long *glyphCount, xCharInfo **glyphs ); @@ -88,14 +88,14 @@ extern int bitmapComputeWeight ( FontPtr pFont ); extern void BitmapRegisterFontFileFunctions ( void ); -extern int BitmapOpenScalable ( FontPathElementPtr fpe, FontPtr *pFont, +extern int BitmapOpenScalable ( FontPathElementPtr fpe, FontPtr *pFont, int flags, FontEntryPtr entry, char *fileName, - FontScalablePtr vals, fsBitmapFormat format, - fsBitmapFormatMask fmask, + FontScalablePtr vals, fsBitmapFormat format, + fsBitmapFormatMask fmask, FontPtr non_cachable_font ); -extern int BitmapGetInfoScalable ( FontPathElementPtr fpe, - FontInfoPtr pFontInfo, FontEntryPtr entry, - FontNamePtr fontName, char *fileName, +extern int BitmapGetInfoScalable ( FontPathElementPtr fpe, + FontInfoPtr pFontInfo, FontEntryPtr entry, + FontNamePtr fontName, char *fileName, FontScalablePtr vals ); #endif /* _BITMAP_H_ */ |