Update freetype to 2.5.4.

third_party/freetype/src/type1/t1gload.c

 /***************************************************************************/
 /*                                                                         */
 /*  t1gload.c                                                              */
 /*                                                                         */
 /*    Type 1 Glyph Loader (body).                                          */
 /*                                                                         */
-/*  Copyright 1996-2006, 2008-2010, 2013 by                                */
+/*  Copyright 1996-2006, 2008-2010, 2013, 2014 by                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
 /*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
 /*  this file you indicate that you have read the license and              */
 /*  understand and accept it fully.                                        */
 /*                                                                         */
 /***************************************************************************/
 
 
-#include "../../include/ft2build.h"
+#include <ft2build.h>
 #include "t1gload.h"
-#include "../../include/freetype/internal/ftcalc.h"
-#include "../../include/freetype/internal/ftdebug.h"
-#include "../../include/freetype/internal/ftstream.h"
-#include "../../include/freetype/ftoutln.h"
-#include "../../include/freetype/internal/psaux.h"
+#include FT_INTERNAL_CALC_H
+#include FT_INTERNAL_DEBUG_H
+#include FT_INTERNAL_STREAM_H
+#include FT_OUTLINE_H
+#include FT_INTERNAL_POSTSCRIPT_AUX_H
 
 #include "t1errors.h"
 
 
   /*************************************************************************/
   /*                                                                       */
   /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
   /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log  */
   /* messages during execution.                                            */
   /*                                                                       */
@@ skipping 151 matching lines @@
     decoder.buildchar     = face->buildchar;
     decoder.len_buildchar = face->len_buildchar;
 
     *max_advance = 0;
 
     /* for each glyph, parse the glyph charstring and extract */
     /* the advance width                                      */
     for ( glyph_index = 0; glyph_index < type1->num_glyphs; glyph_index++ )
     {
       /* now get load the unscaled outline */
-      error = T1_Parse_Glyph( &decoder, glyph_index );
+      (void)T1_Parse_Glyph( &decoder, glyph_index );
       if ( glyph_index == 0 || decoder.builder.advance.x > *max_advance )
         *max_advance = decoder.builder.advance.x;
 
       /* ignore the error if one occurred - skip to next glyph */
     }
 
     psaux->t1_decoder_funcs->done( &decoder );
 
     return FT_Err_Ok;
   }
@@ skipping 66 matching lines @@
     T1_GlyphSlot            glyph = (T1_GlyphSlot)t1glyph;
     FT_Error                error;
     T1_DecoderRec           decoder;
     T1_Face                 face = (T1_Face)t1glyph->face;
     FT_Bool                 hinting;
     T1_Font                 type1         = &face->type1;
     PSAux_Service           psaux         = (PSAux_Service)face->psaux;
     const T1_Decoder_Funcs  decoder_funcs = psaux->t1_decoder_funcs;
 
     FT_Matrix               font_matrix;
-    FT_Vector               font_offset = {0, 0};
+    FT_Vector               font_offset;
     FT_Data                 glyph_data;
     FT_Bool                 must_finish_decoder = FALSE;
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
     FT_Bool                 glyph_data_loaded = 0;
 #endif
 
 
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
     if ( glyph_index >= (FT_UInt)face->root.num_glyphs &&
          !face->root.internal->incremental_interface   )
 #else
     if ( glyph_index >= (FT_UInt)face->root.num_glyphs )
 #endif /* FT_CONFIG_OPTION_INCREMENTAL */
     {
       error = FT_THROW( Invalid_Argument );
       goto Exit;
     }
 
+    FT_TRACE1(( "T1_Load_Glyph: glyph index %d\n", glyph_index ));
+
     FT_ASSERT( ( face->len_buildchar == 0 ) == ( face->buildchar == NULL ) );
 
     if ( load_flags & FT_LOAD_NO_RECURSE )
       load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING;
 
     if ( t1size )
     {
       glyph->x_scale = t1size->metrics.x_scale;
       glyph->y_scale = t1size->metrics.y_scale;
     }
@@ skipping 195 matching lines @@
 #endif
 
     if ( must_finish_decoder )
       decoder_funcs->done( &decoder );
 
     return error;
   }
 
 
 /* END */