Update freetype to 2.5.4.

third_party/freetype/src/pshinter/pshalgo.c

 /***************************************************************************/
 /*                                                                         */
 /*  pshalgo.c                                                              */
 /*                                                                         */
 /*    PostScript hinting algorithm (body).                                 */
 /*                                                                         */
-/*  Copyright 2001-2010, 2012, 2013 by                                     */
+/*  Copyright 2001-2010, 2012-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/ftobjs.h"
-#include "../../include/freetype/internal/ftdebug.h"
-#include "../../include/freetype/internal/ftcalc.h"
+#include <ft2build.h>
+#include FT_INTERNAL_OBJECTS_H
+#include FT_INTERNAL_DEBUG_H
+#include FT_INTERNAL_CALC_H
 #include "pshalgo.h"
 
 #include "pshnterr.h"
 
 
 #undef  FT_COMPONENT
 #define FT_COMPONENT  trace_pshalgo2
 
 
 #ifdef DEBUG_HINTER
@@ skipping 858 matching lines @@
   /*************************************************************************/
 
 #define PSH_ZONE_MIN  -3200000L
 #define PSH_ZONE_MAX  +3200000L
 
 #define xxDEBUG_ZONES
 
 
 #ifdef DEBUG_ZONES
 
-#include "../../include/freetype/config/ftstdlib.h"
+#include FT_CONFIG_STANDARD_LIBRARY_H
 
   static void
   psh_print_zone( PSH_Zone  zone )
   {
     printf( "zone [scale,delta,min,max] = [%.3f,%.3f,%d,%d]\n",
              zone->scale / 65536.0,
              zone->delta / 64.0,
              zone->min,
              zone->max );
   }
@@ skipping 487 matching lines @@
     {
       PSH_Point  first = glyph->contours[n].start;
       PSH_Point  point, before, after;
 
 
       if ( glyph->contours[n].count == 0 )
         continue;
 
       point  = first;
       before = point;
-      after  = point;
 
       do
       {
         before = before->prev;
         if ( before == first )
           goto Skip;
 
       } while ( before->org_u == point->org_u );
 
       first = point = before->next;
@@ skipping 652 matching lines @@
             point->cur_u = FT_MulFix( point->org_u, scale ) + delta;
 
         goto Next_Contour;
       }
 
       /* there are more than 2 strong points in this contour; we */
       /* need to interpolate weak points between them            */
       start = first;
       do
       {
-        point = first;
-
         /* skip consecutive fitted points */
         for (;;)
         {
           next = first->next;
           if ( next == start )
             goto Next_Contour;
 
           if ( !psh_point_is_fitted( next ) )
             break;
 
@@ skipping 202 matching lines @@
 
 #ifndef DEBUG_HINTER
     psh_glyph_done( glyph );
 #endif
 
     return error;
   }
 
 
 /* END */