minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

src/truetype/ttgxvar.[ch]: s/avar_checked/avar_loaded/.

This commit is contained in:
Werner Lemberg 2017-03-12 10:19:53 +01:00
parent 7bbb91fbf4
commit 4a62922bf8
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2017-03-12 Werner Lemberg <wl@gnu.org>
src/truetype/ttgxvar.[ch]: s/avar_checked/avar_loaded/.
2017-03-08 Werner Lemberg <wl@gnu.org>
[sfnt] Another fix for buggy variation fonts.

8
src/truetype/ttgxvar.c
View File

@ -320,7 +320,7 @@
FT_TRACE2(( "AVAR " ));
blend->avar_checked = TRUE;
blend->avar_loaded = TRUE;
error = face->goto_table( face, TTAG_avar, stream, &table_len );
if ( error )
{
@ -2124,7 +2124,7 @@
fvar_head.axisCount * num_instances ) )
goto Exit;
if ( fvar_head.instanceCount && !face->blend->avar_checked )
if ( fvar_head.instanceCount && !face->blend->avar_loaded )
ft_var_load_avar( face );
ns = mmvar->namedstyle;
@ -2564,7 +2564,7 @@
if ( FT_NEW_ARRAY( normalized, num_axes ) )
goto Exit;
if ( !face->blend->avar_checked )
if ( !face->blend->avar_loaded )
ft_var_load_avar( face );
ft_var_to_normalized( face, num_coords, coords, normalized );
@ -2613,7 +2613,7 @@
return error;
}
if ( !face->blend->avar_checked )
if ( !face->blend->avar_loaded )
ft_var_load_avar( face );
ft_var_to_design( face,

2
src/truetype/ttgxvar.h
View File

@ -235,7 +235,7 @@ FT_BEGIN_HEADER
FT_Fixed* normalized_stylecoords;
/* normalized_stylecoords[num_namedstyles][num_axis] */
FT_Bool avar_checked;
FT_Bool avar_loaded;
GX_AVarSegment avar_segment;
FT_Bool hvar_loaded;