Update freetype to 2.5.4.

third_party/freetype/src/cff/cffgload.c

 /***************************************************************************/
 /*                                                                         */
 /*  cffgload.c                                                             */
 /*                                                                         */
 /*    OpenType Glyph Loader (body).                                        */
 /*                                                                         */
-/*  Copyright 1996-2013 by                                                 */
+/*  Copyright 1996-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 "../../include/freetype/internal/ftdebug.h"
-#include "../../include/freetype/internal/ftstream.h"
-#include "../../include/freetype/internal/sfnt.h"
-#include "../../include/freetype/ftoutln.h"
-#include "../../include/freetype/ftcffdrv.h"
+#include <ft2build.h>
+#include FT_INTERNAL_DEBUG_H
+#include FT_INTERNAL_STREAM_H
+#include FT_INTERNAL_SFNT_H
+#include FT_OUTLINE_H
+#include FT_CFF_DRIVER_H
 
 #include "cffobjs.h"
 #include "cffload.h"
 #include "cffgload.h"
 #include "cf2ft.h"      /* for cf2_decoder_parse_charstrings */
 
 #include "cfferrs.h"
 
 
   /*************************************************************************/
@@ skipping 392 matching lines @@
       FT_Byte  fd_index = cff_fd_select_get( &cff->fd_select, glyph_index );
 
 
       if ( fd_index >= cff->num_subfonts )
       {
         FT_TRACE4(( "cff_decoder_prepare: invalid CID subfont index\n" ));
         error = FT_THROW( Invalid_File_Format );
         goto Exit;
       }
 
-      FT_TRACE3(( "glyph index %d (subfont %d):\n", glyph_index, fd_index ));
+      FT_TRACE3(( "  in subfont %d:\n", fd_index ));
 
       sub = cff->subfonts[fd_index];
 
       if ( builder->hints_funcs && size )
       {
         CFF_Internal  internal = (CFF_Internal)size->root.internal;
 
 
         /* for CFFs without subfonts, this value has already been set */
         builder->hints_globals = (void *)internal->subfonts[fd_index];
       }
     }
-#ifdef FT_DEBUG_LEVEL_TRACE
-    else
-      FT_TRACE3(( "glyph index %d:\n", glyph_index ));
-#endif
 
     decoder->num_locals    = sub->local_subrs_index.count;
     decoder->locals        = sub->local_subrs;
     decoder->locals_bias   = cff_compute_bias(
                                decoder->cff->top_font.font_dict.charstring_type,
                                decoder->num_locals );
 
     decoder->glyph_width   = sub->private_dict.default_width;
     decoder->nominal_width = sub->private_dict.nominal_width;
 
@@ skipping 236 matching lines @@
   {
 #ifndef FT_CONFIG_OPTION_INCREMENTAL
     FT_UNUSED( length );
 #endif
 
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
     /* For incremental fonts get the character data using the */
     /* callback function.                                     */
     if ( face->root.internal->incremental_interface )
     {
-      FT_Data data;
+      FT_Data  data;
 
 
       data.pointer = *pointer;
       data.length  = length;
 
       face->root.internal->incremental_interface->funcs->free_glyph_data(
         face->root.internal->incremental_interface->object, &data );
     }
     else
 #endif /* FT_CONFIG_OPTION_INCREMENTAL */
@@ skipping 455 matching lines @@
               break;
             case 35:
               op = cff_op_flex;
               break;
             case 36:
               op = cff_op_hflex1;
               break;
             case 37:
               op = cff_op_flex1;
               break;
-            /*default: */  /* XYQ 2007-9-6: we can't just quit if we see some reserved op */
-              /* decrement ip for syntax error message */
-             /* ip--;*/
+            default:
+              FT_TRACE4(( " unknown op (12, %d)\n", v ));
+              break;
             }
           }
           break;
         case 13:
           op = cff_op_hsbw;
           break;
         case 14:
           op = cff_op_endchar;
           break;
         case 16:
@@ skipping 110 matching lines @@
           decoder->read_width = 0;
           req_args            = 0;
         }
 
         req_args &= 0x000F;
         if ( num_args < req_args )
           goto Stack_Underflow;
         args     -= req_args;
         num_args -= req_args;
 
-                /* Sunliang.Liu sync 221's revison. */
-                if (args > decoder->stack + CFF_MAX_OPERANDS)
-                        goto Stack_Overflow;
-
         /* At this point, `args' points to the first argument of the  */
         /* operand in case `req_args' isn't zero.  Otherwise, we have */
         /* to adjust `args' manually.                                 */
 
         /* Note that we only pop arguments from the stack which we    */
         /* really need and can digest so that we can continue in case */
         /* of superfluous stack elements.                             */
 
         switch ( op )
         {
@@ skipping 657 matching lines @@
 
             error = cff_operator_seac( decoder,
                                        0L, args[-4], args[-3],
                                        (FT_Int)( args[-2] >> 16 ),
                                        (FT_Int)( args[-1] >> 16 ) );
 
             decoder->glyph_width = glyph_width;
           }
           else
           {
-            if ( !error )
-              error = FT_Err_Ok;
-
             cff_builder_close_contour( builder );
 
             /* close hints recording session */
             if ( hinter )
             {
               if ( hinter->close( hinter->hints,
                                   builder->current->n_points ) )
                 goto Syntax_Error;
 
               /* apply hints to the loaded glyph outline now */
-              hinter->apply( hinter->hints,
-                             builder->current,
-                             (PSH_Globals)builder->hints_globals,
-                             decoder->hint_mode );
+              error = hinter->apply( hinter->hints,
+                                     builder->current,
+                                     (PSH_Globals)builder->hints_globals,
+                                     decoder->hint_mode );
+              if ( error )
+                goto Fail;
             }
 
             /* add current outline to the glyph slot */
             FT_GlyphLoader_Add( builder->loader );
           }
 
           /* return now! */
           FT_TRACE4(( "\n" ));
           return error;
 
@@ skipping 685 matching lines @@
             glyph->root.bitmap_top  = metrics.vertBearingY;
           }
           else
           {
             glyph->root.bitmap_left = metrics.horiBearingX;
             glyph->root.bitmap_top  = metrics.horiBearingY;
           }
 
           /* compute linear advance widths */
 
-          ( (SFNT_Service)face->sfnt )->get_metrics( face, 0,
-                                                     glyph_index,
-                                                     &dummy,
-                                                     &advance );
+          (void)( (SFNT_Service)face->sfnt )->get_metrics( face, 0,
+                                                           glyph_index,
+                                                           &dummy,
+                                                           &advance );
           glyph->root.linearHoriAdvance = advance;
 
           has_vertical_info = FT_BOOL(
                                 face->vertical_info                   &&
                                 face->vertical.number_Of_VMetrics > 0 );
 
           /* get the vertical metrics from the vtmx table if we have one */
           if ( has_vertical_info )
           {
-            ( (SFNT_Service)face->sfnt )->get_metrics( face, 1,
-                                                       glyph_index,
-                                                       &dummy,
-                                                       &advance );
+            (void)( (SFNT_Service)face->sfnt )->get_metrics( face, 1,
+                                                             glyph_index,
+                                                             &dummy,
+                                                             &advance );
             glyph->root.linearVertAdvance = advance;
           }
           else
           {
             /* make up vertical ones */
             if ( face->os2.version != 0xFFFFU )
               glyph->root.linearVertAdvance = (FT_Pos)
                 ( face->os2.sTypoAscender - face->os2.sTypoDescender );
             else
               glyph->root.linearVertAdvance = (FT_Pos)
@@ skipping 216 matching lines @@
         has_vertical_info = FT_BOOL( face->vertical_info                   &&
                                      face->vertical.number_Of_VMetrics > 0 );
 
         /* get the vertical metrics from the vtmx table if we have one */
         if ( has_vertical_info )
         {
           FT_Short   vertBearingY = 0;
           FT_UShort  vertAdvance  = 0;
 
 
-          ( (SFNT_Service)face->sfnt )->get_metrics( face, 1,
-                                                     glyph_index,
-                                                     &vertBearingY,
-                                                     &vertAdvance );
+          (void)( (SFNT_Service)face->sfnt )->get_metrics( face, 1,
+                                                           glyph_index,
+                                                           &vertBearingY,
+                                                           &vertAdvance );
           metrics->vertBearingY = vertBearingY;
           metrics->vertAdvance  = vertAdvance;
         }
         else
         {
           /* make up vertical ones */
           if ( face->os2.version != 0xFFFFU )
             metrics->vertAdvance = (FT_Pos)( face->os2.sTypoAscender -
                                              face->os2.sTypoDescender );
           else
@@ skipping 74 matching lines @@
                                             metrics->vertAdvance );
         }
       }
     }
 
     return error;
   }
 
 
 /* END */