[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 4a62922 1/4: src/truetype/ttgxvar.[ch]: s/avar_checke
From: |
Werner LEMBERG |
Subject: |
[freetype2] master 4a62922 1/4: src/truetype/ttgxvar.[ch]: s/avar_checked/avar_loaded/. |
Date: |
Mon, 13 Mar 2017 02:43:38 -0400 (EDT) |
branch: master
commit 4a62922bf8b8d9309db2ae8431469ee2b8cd7adf
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
src/truetype/ttgxvar.[ch]: s/avar_checked/avar_loaded/.
---
ChangeLog | 4 ++++
src/truetype/ttgxvar.c | 8 ++++----
src/truetype/ttgxvar.h | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b115836..43ef3fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-12 Werner Lemberg <address@hidden>
+
+ src/truetype/ttgxvar.[ch]: s/avar_checked/avar_loaded/.
+
2017-03-08 Werner Lemberg <address@hidden>
[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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 4a62922 1/4: src/truetype/ttgxvar.[ch]: s/avar_checked/avar_loaded/.,
Werner LEMBERG <=