diff options
author | David 'Digit' Turner <digit@google.com> | 2009-06-08 15:18:21 +0200 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2009-06-08 15:18:21 +0200 |
commit | 77f63d23f7d380b0ff02c18fd6a154ab9063128a (patch) | |
tree | 14b8437e23a816c57512fe472fdef4c7875c2eba /include/freetype/internal/ftdriver.h | |
parent | d04869994887b14ee43c9f8a9a8597193b5a7107 (diff) | |
download | android_external_freetype-77f63d23f7d380b0ff02c18fd6a154ab9063128a.tar.gz android_external_freetype-77f63d23f7d380b0ff02c18fd6a154ab9063128a.tar.bz2 android_external_freetype-77f63d23f7d380b0ff02c18fd6a154ab9063128a.zip |
Integrate FreeType 2.3.9 into the donut tree.
This is done to get fixes for a few security-related issues.
NOTE: the auto-hinter hasn't been changed to avoid modifying the rendering
of characters. The 2.3.9 code contains minor fixes (not security-related)
that could in theory do that (though extensive testing is needed to
evaluate its real impact on Android).
Diffstat (limited to 'include/freetype/internal/ftdriver.h')
-rw-r--r-- | include/freetype/internal/ftdriver.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/freetype/internal/ftdriver.h b/include/freetype/internal/ftdriver.h index f37864a..854abad 100644 --- a/include/freetype/internal/ftdriver.h +++ b/include/freetype/internal/ftdriver.h @@ -23,6 +23,7 @@ #include <ft2build.h> #include FT_MODULE_H + FT_BEGIN_HEADER @@ -90,12 +91,14 @@ FT_BEGIN_HEADER (*FT_CharMap_CharNextFunc)( FT_CharMap charmap, FT_Long charcode ); + typedef FT_Error (*FT_Face_GetKerningFunc)( FT_Face face, FT_UInt left_glyph, FT_UInt right_glyph, FT_Vector* kerning ); + typedef FT_Error (*FT_Face_AttachFunc)( FT_Face face, FT_Stream stream ); @@ -105,7 +108,7 @@ FT_BEGIN_HEADER (*FT_Face_GetAdvancesFunc)( FT_Face face, FT_UInt first, FT_UInt count, - FT_UInt flags, + FT_Int32 flags, FT_Fixed* advances ); |