diff options
| author | Werner Lemberg <wl@gnu.org> | 2016-12-20 12:27:22 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2016-12-20 12:27:22 +0100 |
| commit | 70704b34ace5667ac700a5d85d7d8a1ba2b58da0 (patch) | |
| tree | 9248f615cbca9953e8ea9d526d0a23211f1d88fc /src | |
| parent | 59b0b3a76c767393f1d9d28ece314b4e03b0f661 (diff) | |
| download | freetype2-70704b34ace5667ac700a5d85d7d8a1ba2b58da0.tar.gz | |
[truetype] Improve logic for getting fast advance widths.
* src/cff/cffdrivr.c (cff_get_advances), src/truetype/ttdriver.c
(tt_get_advances): Use `is_default_instance' for test; this gets
recomputed after changing blend coordinates.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cff/cffdrivr.c | 8 | ||||
| -rw-r--r-- | src/truetype/ttdriver.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index 3e0ef8614..3f426c658 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -219,8 +219,8 @@ { #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT /* no fast retrieval for blended MM fonts without VVAR table */ - if ( ( FT_HAS_MULTIPLE_MASTERS( face ) && ttface->blend ) && - !( var && var->vadvance_adjust ) ) + if ( !ttface->is_default_instance && + !( var && var->vadvance_adjust ) ) return FT_THROW( Unimplemented_Feature ); #endif @@ -251,8 +251,8 @@ { #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT /* no fast retrieval for blended MM fonts without HVAR table */ - if ( ( FT_HAS_MULTIPLE_MASTERS( face ) && ttface->blend ) && - !( var && var->hadvance_adjust ) ) + if ( !ttface->is_default_instance && + !( var && var->hadvance_adjust ) ) return FT_THROW( Unimplemented_Feature ); #endif diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c index 66e721eb9..91ddff589 100644 --- a/src/truetype/ttdriver.c +++ b/src/truetype/ttdriver.c @@ -238,8 +238,8 @@ { #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT /* no fast retrieval for blended MM fonts without VVAR table */ - if ( ( FT_HAS_MULTIPLE_MASTERS( ttface ) && face->blend ) && - !( var && var->vadvance_adjust ) ) + if ( !face->is_default_instance && + !( var && var->vadvance_adjust ) ) return FT_THROW( Unimplemented_Feature ); #endif @@ -258,8 +258,8 @@ { #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT /* no fast retrieval for blended MM fonts without HVAR table */ - if ( ( FT_HAS_MULTIPLE_MASTERS( ttface ) && face->blend ) && - !( var && var->hadvance_adjust ) ) + if ( !face->is_default_instance && + !( var && var->hadvance_adjust ) ) return FT_THROW( Unimplemented_Feature ); #endif |