Update freetype to latest version of ASOP.

src/base/ftgloadr.c

 /***************************************************************************/
 /*                                                                         */
 /*  ftgloadr.c                                                             */
 /*                                                                         */
 /*    The FreeType glyph loader (body).                                    */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2004, 2005, 2006, 2010 by                        */
+/*  Copyright 2002-2006, 2010, 2013 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 <ft2build.h>
+#include FT_INTERNAL_DEBUG_H
 #include FT_INTERNAL_GLYPH_LOADER_H
 #include FT_INTERNAL_MEMORY_H
 #include FT_INTERNAL_OBJECTS_H
 
 #undef  FT_COMPONENT
 #define FT_COMPONENT  trace_gloader
 
 
   /*************************************************************************/
   /*************************************************************************/
@@ skipping 182 matching lines @@
 
     /* check points & tags */
     new_max = base->n_points + current->n_points + n_points;
     old_max = loader->max_points;
 
     if ( new_max > old_max )
     {
       new_max = FT_PAD_CEIL( new_max, 8 );
 
       if ( new_max > FT_OUTLINE_POINTS_MAX )
-        return FT_Err_Array_Too_Large;
+        return FT_THROW( Array_Too_Large );
 
       if ( FT_RENEW_ARRAY( base->points, old_max, new_max ) ||
            FT_RENEW_ARRAY( base->tags,   old_max, new_max ) )
         goto Exit;
 
       if ( loader->use_extra )
       {
         if ( FT_RENEW_ARRAY( loader->base.extra_points,
                              old_max * 2, new_max * 2 ) )
           goto Exit;
@@ skipping 11 matching lines @@
 
     /* check contours */
     old_max = loader->max_contours;
     new_max = base->n_contours + current->n_contours +
               n_contours;
     if ( new_max > old_max )
     {
       new_max = FT_PAD_CEIL( new_max, 4 );
 
       if ( new_max > FT_OUTLINE_CONTOURS_MAX )
-        return FT_Err_Array_Too_Large;
+        return FT_THROW( Array_Too_Large );
 
       if ( FT_RENEW_ARRAY( base->contours, old_max, new_max ) )
         goto Exit;
 
       adjust = 1;
       loader->max_contours = new_max;
     }
 
     if ( adjust )
       FT_GlyphLoader_Adjust_Points( loader );
@@ skipping 46 matching lines @@
 
     current->outline.n_points   = 0;
     current->outline.n_contours = 0;
     current->num_subglyphs      = 0;
 
     FT_GlyphLoader_Adjust_Points   ( loader );
     FT_GlyphLoader_Adjust_Subglyphs( loader );
   }
 
 
-  /* add current glyph to the base image - and prepare for another */
+  /* add current glyph to the base image -- and prepare for another */
   FT_BASE_DEF( void )
   FT_GlyphLoader_Add( FT_GlyphLoader  loader )
   {
     FT_GlyphLoad  base;
     FT_GlyphLoad  current;
 
     FT_UInt       n_curr_contours;
     FT_UInt       n_base_points;
     FT_UInt       n;
 
@@ skipping 60 matching lines @@
       out->n_contours = (short)num_contours;
 
       FT_GlyphLoader_Adjust_Points( target );
     }
 
     return error;
   }
 
 
 /* END */