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/src/FreeType/ftfuncs.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/src/FreeType/ftfuncs.h')
| -rw-r--r-- | libXfont/src/FreeType/ftfuncs.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libXfont/src/FreeType/ftfuncs.h b/libXfont/src/FreeType/ftfuncs.h index 068a59523..6545dfabd 100644 --- a/libXfont/src/FreeType/ftfuncs.h +++ b/libXfont/src/FreeType/ftfuncs.h @@ -158,7 +158,7 @@ typedef struct _FTFont{ static int FreeTypeOpenFace(FTFacePtr *facep, char *FTFileName, char *realFileName, int faceNumber); static void FreeTypeFreeFace(FTFacePtr face); -static int +static int FreeTypeOpenInstance(FTInstancePtr *instancep, FTFacePtr face, char *FTFileName, FTNormalisedTransformationPtr trans, int spacing, FontBitmapFormatPtr bmfmt, @@ -169,20 +169,20 @@ FreeTypeInstanceGetGlyph(unsigned idx, int flags, CharInfoPtr *g, FTInstancePtr static int FreeTypeInstanceGetGlyphMetrics(unsigned idx, int flags, xCharInfo **metrics, FTInstancePtr instance ); -static int -FreeTypeRasteriseGlyph(unsigned idx, int flags, CharInfoPtr tgp, +static int +FreeTypeRasteriseGlyph(unsigned idx, int flags, CharInfoPtr tgp, FTInstancePtr instance, int hasMetrics ); static void FreeTypeFreeFont(FTFontPtr font); static void FreeTypeFreeXFont(FontPtr pFont, int freeProps); static void FreeTypeUnloadXFont(FontPtr pFont); static int -FreeTypeAddProperties(FTFontPtr font, FontScalablePtr vals, FontInfoPtr info, +FreeTypeAddProperties(FTFontPtr font, FontScalablePtr vals, FontInfoPtr info, char *fontname, int rawAverageWidth, Bool font_properties); static int FreeTypeFontGetGlyph(unsigned code, int flags, CharInfoPtr *g, FTFontPtr font); static int FreeTypeLoadFont(FTFontPtr font, FontInfoPtr info, FTFacePtr face, char *FTFileName, FontScalablePtr vals, FontEntryPtr entry, - FontBitmapFormatPtr bmfmt, FT_Int32 load_flags, + FontBitmapFormatPtr bmfmt, FT_Int32 load_flags, struct TTCapInfo *tmp_ttcap, char *dynStrTTCapCodeRange, int ttcap_spacing ); |