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/services/svcid.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/services/svcid.h')
-rw-r--r-- | include/freetype/internal/services/svcid.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/freetype/internal/services/svcid.h b/include/freetype/internal/services/svcid.h index 47fef62..2e391f2 100644 --- a/include/freetype/internal/services/svcid.h +++ b/include/freetype/internal/services/svcid.h @@ -4,7 +4,7 @@ /* */ /* The FreeType CID font services (specification). */ /* */ -/* Copyright 2007 by Derek Clegg. */ +/* Copyright 2007, 2009 by Derek Clegg, Michael Toftdal. */ /* */ /* This file is part of the FreeType project, and may only be used, */ /* modified, and distributed under the terms of the FreeType project */ @@ -31,10 +31,19 @@ FT_BEGIN_HEADER const char* *registry, const char* *ordering, FT_Int *supplement ); + typedef FT_Error + (*FT_CID_GetIsInternallyCIDKeyedFunc)( FT_Face face, + FT_Bool *is_cid ); + typedef FT_Error + (*FT_CID_GetCIDFromGlyphIndexFunc)( FT_Face face, + FT_UInt glyph_index, + FT_UInt *cid ); FT_DEFINE_SERVICE( CID ) { FT_CID_GetRegistryOrderingSupplementFunc get_ros; + FT_CID_GetIsInternallyCIDKeyedFunc get_is_cid; + FT_CID_GetCIDFromGlyphIndexFunc get_cid_from_glyph_index; }; /* */ |