summaryrefslogtreecommitdiffstats
path: root/src/autofit/afloader.h
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2013-06-10 13:55:54 -0700
committerVictoria Lease <violets@google.com>2013-06-10 16:14:43 -0700
commit727dee178a392d20eb050d0c446f2fcc29058fa1 (patch)
treec3764963cd9267a20d27a3267af298e172529216 /src/autofit/afloader.h
parent8afe960626dbf326354b836fd4d63e05b6974195 (diff)
downloadandroid_external_freetype-727dee178a392d20eb050d0c446f2fcc29058fa1.tar.gz
android_external_freetype-727dee178a392d20eb050d0c446f2fcc29058fa1.tar.bz2
android_external_freetype-727dee178a392d20eb050d0c446f2fcc29058fa1.zip
Update freetype to 5e094c6fb2ddd6e8901a5679e2cbb8fa476a38ee
Integrated patches from freetype2 git repository, up to hashval 5e094c6fb2ddd6e8901a5679e2cbb8fa476a38ee, which is post-2.4.12. Most recent commit message from freetype git: [truetype] Improve handling of broken sbit advance widths. Noteworthy patches included: [cff] Add a new Type 2 interpreter and hinter. Add support for color embedded bitmaps (eg. color emoji). Change-Id: Ia8b6a67bc18f841b24f44edf80f81f663185b598
Diffstat (limited to 'src/autofit/afloader.h')
-rw-r--r--src/autofit/afloader.h30
1 files changed, 21 insertions, 9 deletions
diff --git a/src/autofit/afloader.h b/src/autofit/afloader.h
index eec0e92..1f34d17 100644
--- a/src/autofit/afloader.h
+++ b/src/autofit/afloader.h
@@ -25,11 +25,24 @@
FT_BEGIN_HEADER
- typedef struct AF_LoaderRec_
+ typedef struct AF_ModuleRec_* AF_Module;
+
+ /*
+ * The autofitter module's (global) data structure to communicate with
+ * actual fonts. If necessary, `local' data like the current face, the
+ * current face's auto-hint data, or the current glyph's parameters
+ * relevant to auto-hinting are `swapped in'. Cf. functions like
+ * `af_loader_reset' and `af_loader_load_g'.
+ */
+
+ typedef struct AF_LoaderRec_
{
- FT_Face face; /* current face */
- AF_FaceGlobals globals; /* current face globals */
- FT_GlyphLoader gloader; /* glyph loader */
+ /* current face data */
+ FT_Face face;
+ AF_FaceGlobals globals;
+
+ /* current glyph data */
+ FT_GlyphLoader gloader;
AF_GlyphHintsRec hints;
AF_ScriptMetrics metrics;
FT_Bool transformed;
@@ -43,21 +56,20 @@ FT_BEGIN_HEADER
FT_LOCAL( FT_Error )
- af_loader_init( AF_Loader loader,
- FT_Memory memory );
+ af_loader_init( AF_Module module );
FT_LOCAL( FT_Error )
- af_loader_reset( AF_Loader loader,
+ af_loader_reset( AF_Module module,
FT_Face face );
FT_LOCAL( void )
- af_loader_done( AF_Loader loader );
+ af_loader_done( AF_Module module );
FT_LOCAL( FT_Error )
- af_loader_load_glyph( AF_Loader loader,
+ af_loader_load_glyph( AF_Module module,
FT_Face face,
FT_UInt gindex,
FT_Int32 load_flags );