[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.
This commit is contained in:
parent
59b0b3a76c
commit
70704b34ac
|
@ -1,3 +1,11 @@
|
||||||
|
2016-12-20 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
[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.
|
||||||
|
|
||||||
2016-12-20 Ben Wagner <bungeman@google.com>
|
2016-12-20 Ben Wagner <bungeman@google.com>
|
||||||
Werner Lemberg <wl@gnu.org>
|
Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
|
|
@ -219,8 +219,8 @@
|
||||||
{
|
{
|
||||||
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
||||||
/* no fast retrieval for blended MM fonts without VVAR table */
|
/* no fast retrieval for blended MM fonts without VVAR table */
|
||||||
if ( ( FT_HAS_MULTIPLE_MASTERS( face ) && ttface->blend ) &&
|
if ( !ttface->is_default_instance &&
|
||||||
!( var && var->vadvance_adjust ) )
|
!( var && var->vadvance_adjust ) )
|
||||||
return FT_THROW( Unimplemented_Feature );
|
return FT_THROW( Unimplemented_Feature );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -251,8 +251,8 @@
|
||||||
{
|
{
|
||||||
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
||||||
/* no fast retrieval for blended MM fonts without HVAR table */
|
/* no fast retrieval for blended MM fonts without HVAR table */
|
||||||
if ( ( FT_HAS_MULTIPLE_MASTERS( face ) && ttface->blend ) &&
|
if ( !ttface->is_default_instance &&
|
||||||
!( var && var->hadvance_adjust ) )
|
!( var && var->hadvance_adjust ) )
|
||||||
return FT_THROW( Unimplemented_Feature );
|
return FT_THROW( Unimplemented_Feature );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -238,8 +238,8 @@
|
||||||
{
|
{
|
||||||
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
||||||
/* no fast retrieval for blended MM fonts without VVAR table */
|
/* no fast retrieval for blended MM fonts without VVAR table */
|
||||||
if ( ( FT_HAS_MULTIPLE_MASTERS( ttface ) && face->blend ) &&
|
if ( !face->is_default_instance &&
|
||||||
!( var && var->vadvance_adjust ) )
|
!( var && var->vadvance_adjust ) )
|
||||||
return FT_THROW( Unimplemented_Feature );
|
return FT_THROW( Unimplemented_Feature );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -258,8 +258,8 @@
|
||||||
{
|
{
|
||||||
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
||||||
/* no fast retrieval for blended MM fonts without HVAR table */
|
/* no fast retrieval for blended MM fonts without HVAR table */
|
||||||
if ( ( FT_HAS_MULTIPLE_MASTERS( ttface ) && face->blend ) &&
|
if ( !face->is_default_instance &&
|
||||||
!( var && var->hadvance_adjust ) )
|
!( var && var->hadvance_adjust ) )
|
||||||
return FT_THROW( Unimplemented_Feature );
|
return FT_THROW( Unimplemented_Feature );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue