ref: f0cee1a22c222a65ef68c9d64dc32fe43d5875dd
parent: 761d9e418bb76499cf9d12bfbddf8e7ae7ff96fb
author: Werner Lemberg <[email protected]>
date: Thu Feb 23 03:23:39 EST 2017
* include/freetype/internal/tttypes.h (TT_Face): s/isCFF2/is_cff2/. For orthogonality with other structure field names. Update all users.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-02-23 Werner Lemberg <[email protected]>
+
+ * include/freetype/internal/tttypes.h (TT_Face): s/isCFF2/is_cff2/.
+
+ For orthogonality with other structure field names.
+
+ Update all users.
+
2017-02-22 Alexei Podtelezhnikov <[email protected]>
* src/smooth/ftgrays.c (gray_hline): Improve code.
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -1290,6 +1290,8 @@
/* */
/* glyf_offset :: The file offset of the `glyf' table. */
/* */
+ /* is_cff2 :: Set if the font format is CFF2. */
+ /* */
/* doblend :: A boolean which is set if the font should */
/* be blended (this is for GX var). */
/* */
@@ -1492,7 +1494,7 @@
FT_ULong glyf_len;
FT_ULong glyf_offset; /* since 2.7.1 */
- FT_Bool isCFF2; /* since 2.7.1 */
+ FT_Bool is_cff2; /* since 2.7.1 */
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
FT_Bool doblend;
--- a/src/cff/cf2ft.c
+++ b/src/cff/cf2ft.c
@@ -373,7 +373,7 @@
&scaled );
/* copy isCFF2 boolean from TT_Face to CF2_Font */
- font->isCFF2 = builder->face->isCFF2;
+ font->isCFF2 = builder->face->is_cff2;
font->renderingFlags = 0;
if ( hinted )
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -560,8 +560,8 @@
error = face->goto_table( face, TTAG_CFF2, stream, 0 );
if ( !error )
{- cff2 = 1;
- face->isCFF2 = cff2;
+ cff2 = 1;
+ face->is_cff2 = cff2;
}
if ( FT_ERR_EQ( error, Table_Missing ) )
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -2083,7 +2083,7 @@
FT_TRACE5(( "\n" ));
- if ( !face->isCFF2 && !blend->glyphoffsets )
+ if ( !face->is_cff2 && !blend->glyphoffsets )
if ( FT_SET_ERROR( ft_var_load_gvar( face ) ) )
goto Exit;
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -1215,7 +1215,7 @@
face = (TT_Face)size->root.face;
/* nothing to do for CFF2 */
- if ( face->isCFF2 )
+ if ( face->is_cff2 )
return FT_Err_Ok;
size->ttmetrics.valid = FALSE;