diff options
| author | Werner Lemberg <wl@gnu.org> | 2016-12-21 20:27:48 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2016-12-21 20:27:48 +0100 |
| commit | e6a429e2c7c3126d3ff46b6d69bd21d645ecccd5 (patch) | |
| tree | 2861a27b08291528910af450f3815358fb7affc9 /src/truetype/ttdriver.c | |
| parent | 64a91137f13fbc11b6bac393be978d191eee7633 (diff) | |
| download | freetype2-e6a429e2c7c3126d3ff46b6d69bd21d645ecccd5.tar.gz | |
[cff, truetype] Another try for #49829.
* src/cff/cffdrivr.c: Don't include
`FT_SERVICE_METRICS_VARIATIONS_H'.
(cff_get_advances): Use `ttface->variation_support'.
* src/truetype/ttdriver.c (tt_get_advances): Use
`ttface->variation_support'.
* src/truetype/ttgload.c (TT_Process_Simple_Glyph,
load_truetype_glyph): Use `ttface->variation_support'.
Diffstat (limited to 'src/truetype/ttdriver.c')
| -rw-r--r-- | src/truetype/ttdriver.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c index 91ddff589..e7f3c0ebe 100644 --- a/src/truetype/ttdriver.c +++ b/src/truetype/ttdriver.c @@ -226,11 +226,6 @@ FT_UInt nn; TT_Face face = (TT_Face)ttface; -#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT - FT_Service_MetricsVariations var = - (FT_Service_MetricsVariations)face->var; -#endif - /* XXX: TODO: check for sbits */ @@ -238,8 +233,8 @@ { #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT /* no fast retrieval for blended MM fonts without VVAR table */ - if ( !face->is_default_instance && - !( var && var->vadvance_adjust ) ) + if ( !face->is_default_instance && + !( face->variation_support & TT_FACE_FLAG_VAR_VADVANCE ) ) return FT_THROW( Unimplemented_Feature ); #endif @@ -258,8 +253,8 @@ { #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT /* no fast retrieval for blended MM fonts without HVAR table */ - if ( !face->is_default_instance && - !( var && var->hadvance_adjust ) ) + if ( !face->is_default_instance && + !( face->variation_support & TT_FACE_FLAG_VAR_HADVANCE ) ) return FT_THROW( Unimplemented_Feature ); #endif |