Commit 4a62922bf8b8d9309db2ae8431469ee2b8cd7adf
2017-03-12T10:19:53
src/truetype/ttgxvar.[ch]: s/avar_checked/avar_loaded/.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
diff --git a/ChangeLog b/ChangeLog
index b115836..43ef3fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index fa614ca..641d07c 100644
--- 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,
diff --git a/src/truetype/ttgxvar.h b/src/truetype/ttgxvar.h
index c59d528..0d1fb39 100644
--- a/src/truetype/ttgxvar.h
+++ b/src/truetype/ttgxvar.h
@@ -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;