[freetype2] master 2873010 1/2: [cff] Handle T2 operator only with old CFF engine (#47157).

[Werner LEMBERG]

branch: master
commit 2873010d1538996e902cdafac52e22cc39fd4df1
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [cff] Handle T2 operator only with old CFF engine (#47157).
    
    * src/cff/cffparse.c (cff_parser_run) <opcode 31>: Enclose with
---
 ChangeLog          |    7 +++++++
 src/cff/cffparse.c |    2 ++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ceb6166..25f771b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2016-02-15  Werner Lemberg  <address@hidden>
 
+       [cff] Handle T2 operator only with old CFF engine (#47157).
+
+       * src/cff/cffparse.c (cff_parser_run) <opcode 31>: Enclose with
+       #ifdef CFF_CONFIG_OPTION_OLD_ENGINE...#endif.
+
+2016-02-15  Werner Lemberg  <address@hidden>
+
        [cff] Partially handle `load' and `store' ops in old CFF engine.
 
        Now all glyphs of MM CFFs like `ITCGaramondMM-It.otf' can be
diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c
index 921c1a1..9b935c3 100644
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -1049,6 +1049,7 @@
         else if ( v > 246 )
           p += 1;
       }
+#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
       else if ( v == 31 )
       {
         /* a Type 2 charstring */
@@ -1177,6 +1178,7 @@
           stack++;
         }
       }
+#endif /* CFF_CONFIG_OPTION_OLD_ENGINE */
       else
       {
         /* This is not a number, hence it's an operator.  Compute its code */