[freetype2] master 6812f17 6/7: [truetype] Adjust font variation flags for MVAR.

[Werner LEMBERG]

branch: master
commit 6812f17472c8430d89ff29071be701cef3e9de78
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [truetype] Adjust font variation flags for MVAR.
    
    * include/freetype/internal/tttypes.h (TT_FACE_FLAG_VAR_XXX):
    Remove all flags related to MVAR; replace it with...
    (TT_FACE_FLAG_VAR_MVAR): ...this new macro.
    (TT_Face): Remove `mvar_support' field (which was still unused).
---
 ChangeLog                           |    9 +++++++
 include/freetype/internal/tttypes.h |   49 ++---------------------------------
 2 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a02eae6..ae04c26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-01-08  Werner Lemberg  <address@hidden>
+
+       [truetype] Adjust font variation flags for MVAR.
+
+       * include/freetype/internal/tttypes.h (TT_FACE_FLAG_VAR_XXX):
+       Remove all flags related to MVAR; replace it with...
+       (TT_FACE_FLAG_VAR_MVAR): ...this new macro.
+       (TT_Face): Remove `mvar_support' field (which was still unused).
+
 2017-01-06  Werner Lemberg  <address@hidden>
 
        [truetype] More GX code shuffling.
diff --git a/include/freetype/internal/tttypes.h 
b/include/freetype/internal/tttypes.h
index 67b7f7b..6af7303 100644
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -1084,49 +1084,8 @@ FT_BEGIN_HEADER
 #define TT_FACE_FLAG_VAR_BSB       ( 1 << 6 )
 #define TT_FACE_FLAG_VAR_VORG      ( 1 << 7 )
 
-  /* MVAR gasp data */
-#define TT_FACE_FLAG_VAR_GASP_0  ( 1 << 20 )
-#define TT_FACE_FLAG_VAR_GASP_1  ( 1 << 21 )
-#define TT_FACE_FLAG_VAR_GASP_2  ( 1 << 22 )
-#define TT_FACE_FLAG_VAR_GASP_3  ( 1 << 23 )
-#define TT_FACE_FLAG_VAR_GASP_4  ( 1 << 24 )
-#define TT_FACE_FLAG_VAR_GASP_5  ( 1 << 25 )
-#define TT_FACE_FLAG_VAR_GASP_6  ( 1 << 26 )
-#define TT_FACE_FLAG_VAR_GASP_7  ( 1 << 27 )
-#define TT_FACE_FLAG_VAR_GASP_8  ( 1 << 28 )
-#define TT_FACE_FLAG_VAR_GASP_9  ( 1 << 29 )
-
-  /* The following flag macros are for the field `mvar_support'. */
-
-  /* remaining MVAR data */
-#define TT_FACE_FLAG_VAR_CPHT  ( 1 <<  0 )
-#define TT_FACE_FLAG_VAR_HASC  ( 1 <<  1 )
-#define TT_FACE_FLAG_VAR_HCLA  ( 1 <<  2 )
-#define TT_FACE_FLAG_VAR_HCLD  ( 1 <<  3 )
-#define TT_FACE_FLAG_VAR_HCOF  ( 1 <<  4 )
-#define TT_FACE_FLAG_VAR_HCRN  ( 1 <<  5 )
-#define TT_FACE_FLAG_VAR_HCRS  ( 1 <<  6 )
-#define TT_FACE_FLAG_VAR_HDSC  ( 1 <<  7 )
-#define TT_FACE_FLAG_VAR_HLGP  ( 1 <<  8 )
-#define TT_FACE_FLAG_VAR_SBXO  ( 1 <<  9 )
-#define TT_FACE_FLAG_VAR_SBXS  ( 1 << 10 )
-#define TT_FACE_FLAG_VAR_SBYO  ( 1 << 11 )
-#define TT_FACE_FLAG_VAR_SBYS  ( 1 << 12 )
-#define TT_FACE_FLAG_VAR_SPXO  ( 1 << 13 )
-#define TT_FACE_FLAG_VAR_SPXS  ( 1 << 14 )
-#define TT_FACE_FLAG_VAR_SPYO  ( 1 << 15 )
-#define TT_FACE_FLAG_VAR_SPYS  ( 1 << 16 )
-#define TT_FACE_FLAG_VAR_STRO  ( 1 << 17 )
-#define TT_FACE_FLAG_VAR_STRS  ( 1 << 18 )
-#define TT_FACE_FLAG_VAR_UNDO  ( 1 << 19 )
-#define TT_FACE_FLAG_VAR_UNDS  ( 1 << 20 )
-#define TT_FACE_FLAG_VAR_VASC  ( 1 << 21 )
-#define TT_FACE_FLAG_VAR_VCOF  ( 1 << 22 )
-#define TT_FACE_FLAG_VAR_VCRN  ( 1 << 23 )
-#define TT_FACE_FLAG_VAR_VCRS  ( 1 << 24 )
-#define TT_FACE_FLAG_VAR_VDSC  ( 1 << 25 )
-#define TT_FACE_FLAG_VAR_VLGP  ( 1 << 26 )
-#define TT_FACE_FLAG_VAR_XHGT  ( 1 << 27 )
+  /* MVAR */
+#define TT_FACE_FLAG_VAR_MVAR  ( 1 << 8 )
 
 
   /*************************************************************************/
@@ -1312,9 +1271,6 @@ FT_BEGIN_HEADER
   /*                            For example, TT_FACE_FLAG_VAR_FVAR is only */
   /*                            set if we have at least one design axis.   */
   /*                                                                       */
-  /*    mvar_support         :: Flags that indicate which metrics          */
-  /*                            variations are supported.                  */
-  /*                                                                       */
   /*    horz_metrics_size    :: The size of the `hmtx' table.              */
   /*                                                                       */
   /*    vert_metrics_size    :: The size of the `vmtx' table.              */
@@ -1508,7 +1464,6 @@ FT_BEGIN_HEADER
 
     FT_Bool               is_default_instance;   /* since 2.7.1 */
     FT_UInt32             variation_support;     /* since 2.7.1 */
-    FT_UInt32             mvar_support;          /* since 2.7.1 */
 #endif
 
     /* since version 2.2 */