[freetype2] ewaldhew-wip 7b97347 39/52: [cff] Properly use CF2 interpreter

[Hew Yih Shiuan Ewald]

branch: ewaldhew-wip
commit 7b97347401374721a3b083bc87325f66a5b2b1f4
Author: Ewald Hew <address@hidden>
Commit: Ewald Hew <address@hidden>

    [cff] Properly use CF2 interpreter
---
 src/cff/cffgload.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 0943dd7..90fcb8a 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -198,6 +198,7 @@
   {
     FT_Error     error;
     CFF_Decoder  decoder;
+    PS_Decoder   psdecoder;
     TT_Face      face = (TT_Face)glyph->root.face;
     FT_Bool      hinting, scaled, force_scaling;
     CFF_Font     cff  = (CFF_Font)face->extra.data;
@@ -434,7 +435,9 @@
       else
 #endif
       {
-        error = decoder_funcs->parse_charstrings( &decoder,
+        psaux->ps_decoder_init( &decoder, FALSE, &psdecoder );
+
+        error = decoder_funcs->parse_charstrings( &psdecoder,
                                                   charstring,
                                                   charstring_len );
 
@@ -449,7 +452,7 @@
           force_scaling = TRUE;
           glyph->hint   = hinting;
 
-          error = decoder_funcs->parse_charstrings( &decoder,
+          error = decoder_funcs->parse_charstrings( &psdecoder,
                                                     charstring,
                                                     charstring_len );
         }