[freetype2] ewaldhew-wip f1b9729: minor fixes

[Hew Yih Shiuan Ewald]

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

    minor fixes
---
 include/freetype/internal/psaux.h |  3 ---
 src/psaux/psintrp.c               | 14 +++++++-------
 src/type1/t1gload.c               | 34 +++++++++++++++++-----------------
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/include/freetype/internal/psaux.h 
b/include/freetype/internal/psaux.h
index 188072b..4f97afe 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -961,7 +961,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 );
 
@@ -969,7 +968,6 @@ FT_BEGIN_HEADER
 
   typedef struct  CFF_Builder_FuncsRec_
   {
-    /* static */
     void
     (*init)( CFF_Builder*   builder,
              TT_Face        face,
@@ -977,7 +975,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 233da71..4a15c3a 100644
--- a/src/psaux/psintrp.c
+++ b/src/psaux/psintrp.c
@@ -791,7 +791,7 @@
                      &haveWidth,
                      0 );
 
-        if ( font->decoder->width_only )
+        if ( decoder->width_only )
           goto exit;
 
         break;
@@ -831,7 +831,7 @@
                      &haveWidth,
                      0 );
 
-        if ( font->decoder->width_only )
+        if ( decoder->width_only )
           goto exit;
 
         break;
@@ -852,7 +852,7 @@
         /* width is defined or default after this */
         haveWidth = TRUE;
 
-        if ( font->decoder->width_only )
+        if ( decoder->width_only )
           goto exit;
 
         curY = ADD_INT32( curY, cf2_stack_popFixed( opStack ) );
@@ -2391,7 +2391,7 @@
         /* width is defined or default after this */
         haveWidth = TRUE;
 
-        if ( font->decoder->width_only )
+        if ( decoder->width_only )
           goto exit;
 
         /* close path if still open */
@@ -2479,7 +2479,7 @@
                      &haveWidth,
                      0 );
 
-        if ( font->decoder->width_only )
+        if ( decoder->width_only )
           goto exit;
 
         if ( op1 == cf2_cmdHINTMASK )
@@ -2545,7 +2545,7 @@
         /* width is defined or default after this */
         haveWidth = TRUE;
 
-        if ( font->decoder->width_only )
+        if ( decoder->width_only )
           goto exit;
 
         curY = ADD_INT32( curY, cf2_stack_popFixed( opStack ) );
@@ -2572,7 +2572,7 @@
         /* width is defined or default after this */
         haveWidth = TRUE;
 
-        if ( font->decoder->width_only )
+        if ( decoder->width_only )
           goto exit;
 
         curX = ADD_INT32( curX, cf2_stack_popFixed( opStack ) );
diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c
index 6e5d3e8..227f0e0 100644
--- a/src/type1/t1gload.c
+++ b/src/type1/t1gload.c
@@ -39,23 +39,6 @@
 #define FT_COMPONENT  trace_t1gload
 
 
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /**********                                                      *********/
-  /**********            COMPUTE THE MAXIMUM ADVANCE WIDTH         *********/
-  /**********                                                      *********/
-  /**********    The following code is in charge of computing      *********/
-  /**********    the maximum advance width of the font.  It        *********/
-  /**********    quickly processes each glyph charstring to        *********/
-  /**********    extract the value from either a `sbw' or `seac'   *********/
-  /**********    operator.                                         *********/
-  /**********                                                      *********/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
   static FT_Error
   T1_Parse_Glyph_And_Get_Char_String( T1_Decoder  decoder,
                                       FT_UInt     glyph_index,
@@ -195,6 +178,23 @@
   }
 
 
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+  /**********                                                      *********/
+  /**********            COMPUTE THE MAXIMUM ADVANCE WIDTH         *********/
+  /**********                                                      *********/
+  /**********    The following code is in charge of computing      *********/
+  /**********    the maximum advance width of the font.  It        *********/
+  /**********    quickly processes each glyph charstring to        *********/
+  /**********    extract the value from either a `sbw' or `seac'   *********/
+  /**********    operator.                                         *********/
+  /**********                                                      *********/
+  /*************************************************************************/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
   FT_LOCAL_DEF( FT_Error )
   T1_Compute_Max_Advance( T1_Face  face,
                           FT_Pos*  max_advance )