ref: 4a62922bf8b8d9309db2ae8431469ee2b8cd7adf
parent: 7bbb91fbf47fc0775cc9705673caf0c47a81f94b
author: Werner Lemberg <[email protected]>
date: Sun Mar 12 06:19:53 EDT 2017
src/truetype/ttgxvar.[ch]: s/avar_checked/avar_loaded/.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-12 Werner Lemberg <[email protected]>
+
+ src/truetype/ttgxvar.[ch]: s/avar_checked/avar_loaded/.
+
2017-03-08 Werner Lemberg <[email protected]>
[sfnt] Another fix for buggy variation fonts.
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -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,
--- a/src/truetype/ttgxvar.h
+++ b/src/truetype/ttgxvar.h
@@ -235,7 +235,7 @@
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;