Update freetype to 2.5.4.

third_party/freetype/src/pshinter/pshglob.c

Index: third_party/freetype/src/pshinter/pshglob.c
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/pshinter/pshglob.c b/third_party/freetype/src/pshinter/pshglob.c
similarity index 96%
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/pshinter/pshglob.c
rename to third_party/freetype/src/pshinter/pshglob.c
index 9e086dca418641398cf78eb0fdb951907eb345db..1bcc481b9b97e6b2d8f6ce2f416d9dbf9f99e6ca 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/pshinter/pshglob.c
+++ b/third_party/freetype/src/pshinter/pshglob.c
@@ -5,7 +5,7 @@
 /*    PostScript hinter global hinting management (body).                  */
 /*    Inspired by the new auto-hinter module.                              */
 /*                                                                         */
-/*  Copyright 2001-2004, 2006, 2010, 2012 by                               */
+/*  Copyright 2001-2004, 2006, 2010, 2012-2014 by                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used        */
@@ -17,9 +17,9 @@
 /***************************************************************************/
 
 
-#include "../../include/ft2build.h"
-#include "../../include/freetype/freetype.h"
-#include "../../include/freetype/internal/ftobjs.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_INTERNAL_OBJECTS_H
 #include "pshglob.h"
 
 #ifdef DEBUG_HINTER
@@ -311,14 +311,6 @@
 
         zone->org_top    = zone->org_ref;
         zone->org_bottom = zone->org_delta + zone->org_ref;
-		// XYQ 2006-3-11: FT PS hinter doesn't process wide zone well (all points shrinked to one horizontal line)
-		// therefore, we have to do some nasty thing here, because some fonts do give wide bottom zones.
-		// Our principle is to preserve the bottom line
-		// TEST DOC: bug#395 csl.pdf  letters "y", "j", etc.
-		if (zone->org_top - zone->org_bottom > 10) {
-			zone->org_top = zone->org_bottom;
-			zone->org_delta = 0;
-		}
       }
     }
 
@@ -758,14 +750,14 @@
   }
 
 
-  FT_LOCAL_DEF( FT_Error )
+  FT_LOCAL_DEF( void )
   psh_globals_set_scale( PSH_Globals  globals,
                          FT_Fixed     x_scale,
                          FT_Fixed     y_scale,
                          FT_Fixed     x_delta,
                          FT_Fixed     y_delta )
   {
-    PSH_Dimension  dim = &globals->dimension[0];
+    PSH_Dimension  dim;
 
 
     dim = &globals->dimension[0];
@@ -788,8 +780,6 @@
       psh_globals_scale_widths( globals, 1 );
       psh_blues_scale_zones( &globals->blues, y_scale, y_delta );
     }
-
-    return 0;
   }