general/freetype2
2
0
Fork 0
mirror of git://git.sv.nongnu.org/freetype/freetype2.git synced 2026-01-19 04:52:09 +00:00
Code Issues Projects Releases Wiki Activity

[ttgxvar] Fix caching of scalars when there are intermediate tuples.

Browse Source 
For example, with `GoogleSansFlex-Regular.ttf` at ROND=100, the 'Q' glyph
was misrendering.

* src/truetype/ttgxvar.c (TT_Vary_Apply_Glyph_Deltas): Reset `tupleScalars`
  earlier.
This commit is contained in:
Behdad Esfahbod
2025-08-08 01:34:30 -06:00
committed by Werner Lemberg
parent aa2ee67b3d
commit 670d0b2121
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/truetype/ttgxvar.c
View File

@@ -4431,6 +4431,9 @@
tupleDataSize = FT_NEXT_USHORT( p );
tupleIndex = FT_NEXT_USHORT( p );
if ( tupleIndex & GX_TI_INTERMEDIATE_TUPLE )
tupleScalars = NULL;
if ( tupleIndex & GX_TI_EMBEDDED_TUPLE_COORD )
{
if ( 2 * blend->num_axis > (FT_UInt)( stream->limit - p ) )
@@ -4449,7 +4452,10 @@
}
else if ( ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) < blend->tuplecount )
{
FT_Fixed scalar = tupleScalars[tupleIndex & GX_TI_TUPLE_INDEX_MASK];
FT_Fixed scalar =
tupleScalars
? tupleScalars[tupleIndex & GX_TI_TUPLE_INDEX_MASK]
: (FT_Fixed)-0x20000;
if ( scalar != (FT_Fixed)-0x20000 )
@@ -4485,8 +4491,6 @@
im_start_coords[j] = FT_fdot14ToFixed( FT_NEXT_SHORT( p ) );
for ( j = 0; j < blend->num_axis; j++ )
im_end_coords[j] = FT_fdot14ToFixed( FT_NEXT_SHORT( p ) );
tupleScalars = NULL;
}
apply = ft_var_apply_tuple( blend,