From f0cee1a22c222a65ef68c9d64dc32fe43d5875dd Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Thu, 23 Feb 2017 08:23:39 +0100
Subject: [PATCH] * include/freetype/internal/tttypes.h (TT_Face):
 s/isCFF2/is_cff2/.

For orthogonality with other structure field names.

Update all users.
---
 ChangeLog                           | 8 ++++++++
 include/freetype/internal/tttypes.h | 4 +++-
 src/cff/cf2ft.c                     | 2 +-
 src/cff/cffobjs.c                   | 4 ++--
 src/truetype/ttgxvar.c              | 2 +-
 src/truetype/ttobjs.c               | 2 +-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 976efa1b5..24c66c15b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-02-23  Werner Lemberg  <wl@gnu.org>
+
+	* 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  <apodtele@gmail.com>
 
 	* src/smooth/ftgrays.c (gray_hline): Improve code.
diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h
index d6c57cecf..abe4dcd64 100644
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -1290,6 +1290,8 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    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_BEGIN_HEADER
     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;
diff --git a/src/cff/cf2ft.c b/src/cff/cf2ft.c
index 3a21a9bcb..5cca92a11 100644
--- 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 )
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 67bf0cc41..bcda2a913 100644
--- 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 ) )
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 0168120d9..690777549 100644
--- 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;
 
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index 00207bb46..fd0c4ddd3 100644
--- 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;