diff options
Diffstat (limited to 'src/autofit')
| -rw-r--r-- | src/autofit/afglobal.c | 2 | ||||
| -rw-r--r-- | src/autofit/afhints.h | 6 | ||||
| -rw-r--r-- | src/autofit/afmodule.c | 16 | ||||
| -rw-r--r-- | src/autofit/aftypes.h | 8 | ||||
| -rw-r--r-- | src/autofit/ft-hb.c | 10 | ||||
| -rw-r--r-- | src/autofit/ft-hb.h | 2 |
6 files changed, 22 insertions, 22 deletions
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c index 6c7717e54..ede27eb16 100644 --- a/src/autofit/afglobal.c +++ b/src/autofit/afglobal.c @@ -356,7 +356,7 @@ globals->scale_down_factor = 0; #ifdef FT_CONFIG_OPTION_USE_HARFBUZZ - globals->hb_font = _hb_ft_font_create( face, NULL ); + globals->hb_font = hb_ft_font_create_( face, NULL ); globals->hb_buf = hb_buffer_create(); #endif diff --git a/src/autofit/afhints.h b/src/autofit/afhints.h index 0f1c90860..d1cf9529b 100644 --- a/src/autofit/afhints.h +++ b/src/autofit/afhints.h @@ -375,14 +375,14 @@ FT_BEGIN_HEADER #ifdef FT_DEBUG_AUTOFIT #define AF_HINTS_DO_HORIZONTAL( h ) \ - ( !_af_debug_disable_horz_hints && \ + ( !af_debug_disable_horz_hints_ && \ !AF_HINTS_TEST_SCALER( h, AF_SCALER_FLAG_NO_HORIZONTAL ) ) #define AF_HINTS_DO_VERTICAL( h ) \ - ( !_af_debug_disable_vert_hints && \ + ( !af_debug_disable_vert_hints_ && \ !AF_HINTS_TEST_SCALER( h, AF_SCALER_FLAG_NO_VERTICAL ) ) -#define AF_HINTS_DO_BLUES( h ) ( !_af_debug_disable_blue_hints ) +#define AF_HINTS_DO_BLUES( h ) ( !af_debug_disable_blue_hints_ ) #else /* !FT_DEBUG_AUTOFIT */ diff --git a/src/autofit/afmodule.c b/src/autofit/afmodule.c index 54b9e564f..92e5156ab 100644 --- a/src/autofit/afmodule.c +++ b/src/autofit/afmodule.c @@ -43,14 +43,14 @@ #endif - int _af_debug_disable_horz_hints; - int _af_debug_disable_vert_hints; - int _af_debug_disable_blue_hints; + int af_debug_disable_horz_hints_; + int af_debug_disable_vert_hints_; + int af_debug_disable_blue_hints_; /* we use a global object instead of a local one for debugging */ - static AF_GlyphHintsRec _af_debug_hints_rec[1]; + static AF_GlyphHintsRec af_debug_hints_rec_[1]; - void* _af_debug_hints = _af_debug_hints_rec; + void* af_debug_hints_ = af_debug_hints_rec_; #endif #include <freetype/internal/ftobjs.h> @@ -423,8 +423,8 @@ FT_UNUSED( ft_module ); #ifdef FT_DEBUG_AUTOFIT - if ( _af_debug_hints_rec->memory ) - af_glyph_hints_done( _af_debug_hints_rec ); + if ( af_debug_hints_rec_->memory ) + af_glyph_hints_done( af_debug_hints_rec_ ); #endif } @@ -443,7 +443,7 @@ /* in debug mode, we use a global object that survives this routine */ - AF_GlyphHints hints = _af_debug_hints_rec; + AF_GlyphHints hints = af_debug_hints_rec_; AF_LoaderRec loader[1]; FT_UNUSED( size ); diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h index 3a0878e08..661519449 100644 --- a/src/autofit/aftypes.h +++ b/src/autofit/aftypes.h @@ -57,10 +57,10 @@ FT_BEGIN_HEADER #ifdef FT_DEBUG_AUTOFIT -extern int _af_debug_disable_horz_hints; -extern int _af_debug_disable_vert_hints; -extern int _af_debug_disable_blue_hints; -extern void* _af_debug_hints; +extern int af_debug_disable_horz_hints_; +extern int af_debug_disable_vert_hints_; +extern int af_debug_disable_blue_hints_; +extern void* af_debug_hints_; #endif /* FT_DEBUG_AUTOFIT */ diff --git a/src/autofit/ft-hb.c b/src/autofit/ft-hb.c index 7ba1bfa55..260ebdc1b 100644 --- a/src/autofit/ft-hb.c +++ b/src/autofit/ft-hb.c @@ -36,7 +36,7 @@ */ static hb_blob_t * -_hb_ft_reference_table (hb_face_t *face, hb_tag_t tag, void *user_data) +hb_ft_reference_table_ (hb_face_t *face, hb_tag_t tag, void *user_data) { FT_Face ft_face = (FT_Face) user_data; FT_Byte *buffer; @@ -68,7 +68,7 @@ _hb_ft_reference_table (hb_face_t *face, hb_tag_t tag, void *user_data) } static hb_face_t * -_hb_ft_face_create (FT_Face ft_face, +hb_ft_face_create_ (FT_Face ft_face, hb_destroy_func_t destroy) { hb_face_t *face; @@ -83,7 +83,7 @@ _hb_ft_face_create (FT_Face ft_face, face = hb_face_create (blob, ft_face->face_index); hb_blob_destroy (blob); } else { - face = hb_face_create_for_tables (_hb_ft_reference_table, ft_face, destroy); + face = hb_face_create_for_tables (hb_ft_reference_table_, ft_face, destroy); } hb_face_set_index (face, ft_face->face_index); @@ -93,13 +93,13 @@ _hb_ft_face_create (FT_Face ft_face, } hb_font_t * -_hb_ft_font_create (FT_Face ft_face, +hb_ft_font_create_ (FT_Face ft_face, hb_destroy_func_t destroy) { hb_font_t *font; hb_face_t *face; - face = _hb_ft_face_create (ft_face, destroy); + face = hb_ft_face_create_ (ft_face, destroy); font = hb_font_create (face); hb_face_destroy (face); return font; diff --git a/src/autofit/ft-hb.h b/src/autofit/ft-hb.h index db0b35e9c..0d3ca206d 100644 --- a/src/autofit/ft-hb.h +++ b/src/autofit/ft-hb.h @@ -29,7 +29,7 @@ #include <hb.h> -hb_font_t * _hb_ft_font_create (FT_Face ft_face, +hb_font_t * hb_ft_font_create_ (FT_Face ft_face, hb_destroy_func_t destroy); #endif |