[autofit] Pass glyph index to hinting function.

No functionality change yet.

* src/autofit/aftypes.h (AF_WritingSystem_ApplyHintsFunc): Pass
glyph index.

* src/autofit/afcjk.c, src/autofit/afcjk.h (af_cjk_hints_apply),
src/autofit/afdummy.c (af_dummy_hints_apply), src/autofit/afindic.c
(af_indic_hints_apply), src/autofit/aflatin.c
(af_latin_hints_apply), src/autofit/aflatin2.c
(af_latin2_hints_apply), src/autofit/afloader.c (af_loader_load_g):
Updated.
This commit is contained in:
Werner Lemberg 2015-09-03 06:47:30 +02:00
parent 40103a3af0
commit 8cbbcf6b98
9 changed files with 40 additions and 9 deletions

View File

@ -1,3 +1,19 @@
2015-09-03 Werner Lemberg <wl@gnu.org>
[autofit] Pass glyph index to hinting function.
No functionality change yet.
* src/autofit/aftypes.h (AF_WritingSystem_ApplyHintsFunc): Pass
glyph index.
* src/autofit/afcjk.c, src/autofit/afcjk.h (af_cjk_hints_apply),
src/autofit/afdummy.c (af_dummy_hints_apply), src/autofit/afindic.c
(af_indic_hints_apply), src/autofit/aflatin.c
(af_latin_hints_apply), src/autofit/aflatin2.c
(af_latin2_hints_apply), src/autofit/afloader.c (af_loader_load_g):
Updated.
2015-08-30 Werner Lemberg <wl@gnu.org>
[autofit] Code clean-up.

View File

@ -2181,7 +2181,8 @@
/* Apply the complete hinting algorithm to a CJK glyph. */
FT_LOCAL_DEF( FT_Error )
af_cjk_hints_apply( AF_GlyphHints hints,
af_cjk_hints_apply( FT_UInt glyph_index,
AF_GlyphHints hints,
FT_Outline* outline,
AF_CJKMetrics metrics )
{
@ -2189,6 +2190,7 @@
int dim;
FT_UNUSED( metrics );
FT_UNUSED( glyph_index );
error = af_glyph_hints_reload( hints, outline );

View File

@ -115,7 +115,8 @@ FT_BEGIN_HEADER
AF_CJKMetrics metrics );
FT_LOCAL( FT_Error )
af_cjk_hints_apply( AF_GlyphHints hints,
af_cjk_hints_apply( FT_UInt glyph_index,
AF_GlyphHints hints,
FT_Outline* outline,
AF_CJKMetrics metrics );

View File

@ -38,11 +38,14 @@
static FT_Error
af_dummy_hints_apply( AF_GlyphHints hints,
af_dummy_hints_apply( FT_UInt glyph_index,
AF_GlyphHints hints,
FT_Outline* outline )
{
FT_Error error;
FT_UNUSED( glyph_index );
error = af_glyph_hints_reload( hints, outline );
if ( !error )

View File

@ -79,12 +79,13 @@
static FT_Error
af_indic_hints_apply( AF_GlyphHints hints,
af_indic_hints_apply( FT_UInt glyph_index,
AF_GlyphHints hints,
FT_Outline* outline,
AF_CJKMetrics metrics )
{
/* use CJK routines */
return af_cjk_hints_apply( hints, outline, metrics );
return af_cjk_hints_apply( glyph_index, hints, outline, metrics );
}

View File

@ -2836,7 +2836,8 @@
/* Apply the complete hinting algorithm to a latin glyph. */
static FT_Error
af_latin_hints_apply( AF_GlyphHints hints,
af_latin_hints_apply( FT_UInt glyph_index,
AF_GlyphHints hints,
FT_Outline* outline,
AF_LatinMetrics metrics )
{
@ -2845,6 +2846,8 @@
AF_LatinAxis axis;
FT_UNUSED( glyph_index );
error = af_glyph_hints_reload( hints, outline );
if ( error )

View File

@ -2300,13 +2300,16 @@
static FT_Error
af_latin2_hints_apply( AF_GlyphHints hints,
af_latin2_hints_apply( FT_UInt glyph_index,
AF_GlyphHints hints,
FT_Outline* outline,
AF_LatinMetrics metrics )
{
FT_Error error;
int dim;
FT_UNUSED( glyph_index );
error = af_glyph_hints_reload( hints, outline );
if ( error )

View File

@ -150,7 +150,8 @@
if ( writing_system_class->style_hints_apply )
writing_system_class->style_hints_apply( hints,
writing_system_class->style_hints_apply( glyph_index,
hints,
&gloader->base.outline,
metrics );
}

View File

@ -217,7 +217,8 @@ extern void* _af_debug_hints;
AF_StyleMetrics metrics );
typedef void
(*AF_WritingSystem_ApplyHintsFunc)( AF_GlyphHints hints,
(*AF_WritingSystem_ApplyHintsFunc)( FT_UInt glyph_index,
AF_GlyphHints hints,
FT_Outline* outline,
AF_StyleMetrics metrics );