[freetype2] ewaldhew-wip 8e2151f 25/36: fixes for compilation

[Hew Yih Shiuan Ewald]

branch: ewaldhew-wip
commit 8e2151f1db98824f97df285d54cf303cab5d68bd
Author: Ewald Hew <address@hidden>
Commit: Ewald Hew <address@hidden>

    fixes for compilation
---
 include/freetype/internal/psaux.h |  3 ---
 src/psaux/psintrp.c               | 37 +++++++++++++++++++------------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/include/freetype/internal/psaux.h 
b/include/freetype/internal/psaux.h
index 7dcd9ee..0c9cf23 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -1002,7 +1002,6 @@ FT_BEGIN_HEADER
   typedef void
   (*CFF_Builder_Close_Contour_Func)( CFF_Builder*  builder );
 
-  /* static */
   typedef FT_Error
   (*CFF_Builder_Add_Contour_Func)( CFF_Builder*  builder );
 
@@ -1010,7 +1009,6 @@ FT_BEGIN_HEADER
 
   typedef struct  CFF_Builder_FuncsRec_
   {
-    /* static */
     void
     (*init)( CFF_Builder*   builder,
              TT_Face        face,
@@ -1018,7 +1016,6 @@ FT_BEGIN_HEADER
              CFF_GlyphSlot  glyph,
              FT_Bool        hinting );
 
-    /* static */
     void
     (*done)( CFF_Builder*  builder );
 
diff --git a/src/psaux/psintrp.c b/src/psaux/psintrp.c
index fd51517..fab9ea9 100644
--- a/src/psaux/psintrp.c
+++ b/src/psaux/psintrp.c
@@ -491,7 +491,7 @@
 
     /* Stuff for Type 1 */
     FT_Int     known_othersubr_result_cnt = 0;
-    FT_Bool    large_int;
+    FT_Bool    large_int = FALSE;
 #define PS_STORAGE_SIZE 3
     CF2_F16Dot16  results[PS_STORAGE_SIZE];   /* for othersubr results */
     FT_Int        result_cnt = 0;
@@ -777,7 +777,7 @@
           FT_ASSERT( ( cf2_stack_count( opStack ) == 2 ) );
 
           hint_pos = ADD_INT32( cf2_stack_getReal( opStack, 0 ),
-                              font->decoder->builder->left_bearing.y );
+                                font->decoder->builder.left_bearing->y );
 
           cf2_stack_setReal( opStack, 0, hint_pos );
         }
@@ -817,7 +817,7 @@
           FT_ASSERT( ( cf2_stack_count( opStack ) == 2 ) );
 
           hint_pos = ADD_INT32( cf2_stack_getReal( opStack, 0 ),
-                              font->decoder->builder->left_bearing.x );
+                                font->decoder->builder.left_bearing->x );
 
           cf2_stack_setReal( opStack, 0, hint_pos );
         }
@@ -996,10 +996,10 @@
           /* set up the new CFF region and pointer */
           subrNum = cf2_stack_popInt( opStack );
 
-          if ( font->isT1 && decoder->subrs_hash )
+          if ( font->isT1 && decoder->locals_hash )
           {
             size_t*  val = ft_hash_num_lookup( subrNum,
-                                               decoder->subrs_hash );
+                                               decoder->locals_hash );
 
             if ( val )
               subrNum = *val;
@@ -1209,8 +1209,8 @@
 
                       FT_ASSERT( ( cf2_stack_count( opStack ) == 6 ) );
 
-                      lsb = ( op2 == cf2_escVSTEM3 ? 
font->decoder->builder->left_bearing.x
-                                                   : 
font->decoder->builder->left_bearing.y );
+                      lsb = ( op2 == cf2_escVSTEM3 ? 
font->decoder->builder.left_bearing->x
+                                                   : 
font->decoder->builder.left_bearing->y );
 
                       v0 = cf2_stack_getReal( opStack, 0 );
                       v1 = cf2_stack_getReal( opStack, 2 );
@@ -1295,9 +1295,10 @@
                       FT_Pos   adx   = cf2_stack_popFixed ( opStack );
                       FT_Pos   asb   = cf2_stack_popFixed ( opStack );
 
+                      /* TODO(ewaldhew): 
                       lastError = t1operator_seac( decoder,
                                                    asb, adx, ady,
-                                                   bchar, achar );
+                                                   bchar, achar ); */
                       goto exit;
                     }
                   }
@@ -1317,16 +1318,16 @@
 
                       builder = &font->decoder->builder;
                       
-                      builder->advance.y = cf2_stack_popFixed( opStack );
-                      builder->advance.x = cf2_stack_popFixed( opStack );
+                      builder->advance->y = cf2_stack_popFixed( opStack );
+                      builder->advance->x = cf2_stack_popFixed( opStack );
 
                       lsb_y = cf2_stack_popFixed( opStack );
                       lsb_x = cf2_stack_popFixed( opStack );
 
-                      builder->left_bearing.x = ADD_INT32( 
builder->left_bearing.x,
-                                                           lsb_x );
-                      builder->left_bearing.y = ADD_INT32( 
builder->left_bearing.y,
-                                                           lsb_y );
+                      builder->left_bearing->x = ADD_INT32( 
builder->left_bearing->x,
+                                                            lsb_x );
+                      builder->left_bearing->y = ADD_INT32( 
builder->left_bearing->y,
+                                                            lsb_y );
 
                       haveWidth = TRUE;
 
@@ -2183,13 +2184,13 @@
 
           builder = &font->decoder->builder;
           
-          builder->advance.x = cf2_stack_popFixed( opStack );
-          builder->advance.y = 0;
+          builder->advance->x = cf2_stack_popFixed( opStack );
+          builder->advance->y = 0;
 
           lsb_x = cf2_stack_popFixed( opStack );
 
-          builder->left_bearing.x = ADD_INT32( builder->left_bearing.x,
-                                               lsb_x );
+          builder->left_bearing->x = ADD_INT32( builder->left_bearing->x,
+                                                lsb_x );
 
           haveWidth = TRUE;