diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:13 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:13 +0000 |
| commit | dfea6bec2d256b103fa2ff235d1f4c5d847575e7 (patch) | |
| tree | 9df15e877668cec46332769264740ab2b5b24f3e /src/FreeType/ftfuncs.h | |
| parent | f89c45a5bfa0c138a62df688ebd36b8e24e32793 (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASE
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'src/FreeType/ftfuncs.h')
| -rw-r--r-- | src/FreeType/ftfuncs.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/FreeType/ftfuncs.h b/src/FreeType/ftfuncs.h index dadb546..6777667 100644 --- a/src/FreeType/ftfuncs.h +++ b/src/FreeType/ftfuncs.h @@ -174,8 +174,7 @@ static void FreeTypeFreeXFont(FontPtr pFont, int freeProps); static void FreeTypeUnloadXFont(FontPtr pFont); static int FreeTypeAddProperties(FTFontPtr font, FontScalablePtr vals, FontInfoPtr info, - char *fontname, - int rawAverageWidth); + 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, |