[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:
parent
40103a3af0
commit
8cbbcf6b98
16
ChangeLog
16
ChangeLog
|
@ -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>
|
2015-08-30 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
[autofit] Code clean-up.
|
[autofit] Code clean-up.
|
||||||
|
|
|
@ -2181,7 +2181,8 @@
|
||||||
/* Apply the complete hinting algorithm to a CJK glyph. */
|
/* Apply the complete hinting algorithm to a CJK glyph. */
|
||||||
|
|
||||||
FT_LOCAL_DEF( FT_Error )
|
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,
|
FT_Outline* outline,
|
||||||
AF_CJKMetrics metrics )
|
AF_CJKMetrics metrics )
|
||||||
{
|
{
|
||||||
|
@ -2189,6 +2190,7 @@
|
||||||
int dim;
|
int dim;
|
||||||
|
|
||||||
FT_UNUSED( metrics );
|
FT_UNUSED( metrics );
|
||||||
|
FT_UNUSED( glyph_index );
|
||||||
|
|
||||||
|
|
||||||
error = af_glyph_hints_reload( hints, outline );
|
error = af_glyph_hints_reload( hints, outline );
|
||||||
|
|
|
@ -115,7 +115,8 @@ FT_BEGIN_HEADER
|
||||||
AF_CJKMetrics metrics );
|
AF_CJKMetrics metrics );
|
||||||
|
|
||||||
FT_LOCAL( FT_Error )
|
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,
|
FT_Outline* outline,
|
||||||
AF_CJKMetrics metrics );
|
AF_CJKMetrics metrics );
|
||||||
|
|
||||||
|
|
|
@ -38,11 +38,14 @@
|
||||||
|
|
||||||
|
|
||||||
static FT_Error
|
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_Outline* outline )
|
||||||
{
|
{
|
||||||
FT_Error error;
|
FT_Error error;
|
||||||
|
|
||||||
|
FT_UNUSED( glyph_index );
|
||||||
|
|
||||||
|
|
||||||
error = af_glyph_hints_reload( hints, outline );
|
error = af_glyph_hints_reload( hints, outline );
|
||||||
if ( !error )
|
if ( !error )
|
||||||
|
|
|
@ -79,12 +79,13 @@
|
||||||
|
|
||||||
|
|
||||||
static FT_Error
|
static FT_Error
|
||||||
af_indic_hints_apply( AF_GlyphHints hints,
|
af_indic_hints_apply( FT_UInt glyph_index,
|
||||||
|
AF_GlyphHints hints,
|
||||||
FT_Outline* outline,
|
FT_Outline* outline,
|
||||||
AF_CJKMetrics metrics )
|
AF_CJKMetrics metrics )
|
||||||
{
|
{
|
||||||
/* use CJK routines */
|
/* use CJK routines */
|
||||||
return af_cjk_hints_apply( hints, outline, metrics );
|
return af_cjk_hints_apply( glyph_index, hints, outline, metrics );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2836,7 +2836,8 @@
|
||||||
/* Apply the complete hinting algorithm to a latin glyph. */
|
/* Apply the complete hinting algorithm to a latin glyph. */
|
||||||
|
|
||||||
static FT_Error
|
static FT_Error
|
||||||
af_latin_hints_apply( AF_GlyphHints hints,
|
af_latin_hints_apply( FT_UInt glyph_index,
|
||||||
|
AF_GlyphHints hints,
|
||||||
FT_Outline* outline,
|
FT_Outline* outline,
|
||||||
AF_LatinMetrics metrics )
|
AF_LatinMetrics metrics )
|
||||||
{
|
{
|
||||||
|
@ -2845,6 +2846,8 @@
|
||||||
|
|
||||||
AF_LatinAxis axis;
|
AF_LatinAxis axis;
|
||||||
|
|
||||||
|
FT_UNUSED( glyph_index );
|
||||||
|
|
||||||
|
|
||||||
error = af_glyph_hints_reload( hints, outline );
|
error = af_glyph_hints_reload( hints, outline );
|
||||||
if ( error )
|
if ( error )
|
||||||
|
|
|
@ -2300,13 +2300,16 @@
|
||||||
|
|
||||||
|
|
||||||
static FT_Error
|
static FT_Error
|
||||||
af_latin2_hints_apply( AF_GlyphHints hints,
|
af_latin2_hints_apply( FT_UInt glyph_index,
|
||||||
|
AF_GlyphHints hints,
|
||||||
FT_Outline* outline,
|
FT_Outline* outline,
|
||||||
AF_LatinMetrics metrics )
|
AF_LatinMetrics metrics )
|
||||||
{
|
{
|
||||||
FT_Error error;
|
FT_Error error;
|
||||||
int dim;
|
int dim;
|
||||||
|
|
||||||
|
FT_UNUSED( glyph_index );
|
||||||
|
|
||||||
|
|
||||||
error = af_glyph_hints_reload( hints, outline );
|
error = af_glyph_hints_reload( hints, outline );
|
||||||
if ( error )
|
if ( error )
|
||||||
|
|
|
@ -150,7 +150,8 @@
|
||||||
|
|
||||||
|
|
||||||
if ( writing_system_class->style_hints_apply )
|
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,
|
&gloader->base.outline,
|
||||||
metrics );
|
metrics );
|
||||||
}
|
}
|
||||||
|
|
|
@ -217,7 +217,8 @@ extern void* _af_debug_hints;
|
||||||
AF_StyleMetrics metrics );
|
AF_StyleMetrics metrics );
|
||||||
|
|
||||||
typedef void
|
typedef void
|
||||||
(*AF_WritingSystem_ApplyHintsFunc)( AF_GlyphHints hints,
|
(*AF_WritingSystem_ApplyHintsFunc)( FT_UInt glyph_index,
|
||||||
|
AF_GlyphHints hints,
|
||||||
FT_Outline* outline,
|
FT_Outline* outline,
|
||||||
AF_StyleMetrics metrics );
|
AF_StyleMetrics metrics );
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue