[freetype2-demos] master 56dc44a: [ttdebug] Add support for GETVARIATION and GETDATA opcodes.

[Werner LEMBERG]

branch: master
commit 56dc44ab568baf45737e132a36bbc376919f0577
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [ttdebug] Add support for GETVARIATION and GETDATA opcodes.
    
    * src/ttdebug.c: Include FT_MULTIPLE_MASTERS_H.
    (multimaster): New global variable.
    (OpStr): Updated.
    (main): Call `FT_Get_MM_Var' to initialize MM support.
---
 ChangeLog     |  9 +++++++++
 src/ttdebug.c | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f5e7a8..6446516 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2019-05-22  Werner Lemberg  <address@hidden>
 
+       [ttdebug] Add support for GETVARIATION and GETDATA opcodes.
+
+       * src/ttdebug.c: Include FT_MULTIPLE_MASTERS_H.
+       (multimaster): New global variable.
+       (OpStr): Updated.
+       (main): Call `FT_Get_MM_Var' to initialize MM support.
+
+2019-05-22  Werner Lemberg  <address@hidden>
+
        * src/ttdebug.c (OpStr): Improve opcode mnemonics.
 
 2019-05-22  Alexei Podtelezhnikov  <address@hidden>
diff --git a/src/ttdebug.c b/src/ttdebug.c
index 6cae6cc..ada0e3c 100644
--- a/src/ttdebug.c
+++ b/src/ttdebug.c
@@ -52,6 +52,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
+#include FT_MULTIPLE_MASTERS_H
 #include "common.h"
 #include "mlgetopt.h"
 
@@ -76,6 +77,8 @@
   static TT_Size       size;       /* truetype size       */
   static TT_GlyphSlot  glyph;      /* truetype glyph slot */
 
+  static FT_MM_Var    *multimaster;
+
   static unsigned int  tt_interpreter_versions[3];
   static int           num_tt_interpreter_versions;
   static unsigned int  dflt_tt_interpreter_version;
@@ -286,8 +289,8 @@
 
     /* 0x90 */
     /*  INS_$90  */   PACK( 0, 0 ),
-    /*  INS_$91  */   PACK( 0, 0 ),
-    /*  INS_$92  */   PACK( 0, 0 ),
+    /*  GETVAR   */   PACK( 0, 0 ),
+    /*  GETDATA  */   PACK( 0, 1 ),
     /*  INS_$93  */   PACK( 0, 0 ),
     /*  INS_$94  */   PACK( 0, 0 ),
     /*  INS_$95  */   PACK( 0, 0 ),
@@ -578,8 +581,8 @@
 
     /* 0x90 */
     "INS_$90",
-    "INS_$91",
-    "INS_$92",
+    "GETVARIATION",
+    "GETDATA",
     "INS_$93",
     "INS_$94",
     "INS_$95",
@@ -2181,6 +2184,11 @@
         Abort( "this is not a TrueType font" );
       }
 
+      FT_Done_MM_Var( library, multimaster );
+      error = FT_Get_MM_Var( (FT_Face)face, &multimaster );
+      if ( error )
+        multimaster = NULL;
+
       size = (TT_Size)face->root.size;
 
       error = FT_Set_Char_Size( (FT_Face)face,