Update freetype to 2.5.4.

third_party/freetype/src/cff/cf2blues.c

Index: third_party/freetype/src/cff/cf2blues.c
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/cff/cf2blues.c b/third_party/freetype/src/cff/cf2blues.c
similarity index 98%
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/cff/cf2blues.c
rename to third_party/freetype/src/cff/cf2blues.c
index 82943428e4a9848f7ea99bcdbe224bd63541a28d..250f89e0df46dc96d6b9fb1fecb1c6fe9d0f5bdd 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/cff/cf2blues.c
+++ b/third_party/freetype/src/cff/cf2blues.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Adobe's code for handling Blue Zones (body).                         */
 /*                                                                         */
-/*  Copyright 2009-2013 Adobe Systems Incorporated.                        */
+/*  Copyright 2009-2014 Adobe Systems Incorporated.                        */
 /*                                                                         */
 /*  This software, and all works of authorship, whether in source or       */
 /*  object code form as indicated by the copyright notice(s) included      */
@@ -37,7 +37,7 @@
 
 
 #include "cf2ft.h"
-#include "../../include/freetype/internal/ftdebug.h"
+#include FT_INTERNAL_DEBUG_H
 
 #include "cf2blues.h"
 #include "cf2hints.h"
@@ -86,11 +86,13 @@
     size_t     i;
     CF2_Fixed  emBoxBottom, emBoxTop;
 
+#if 0
     CF2_Int  unitsPerEm = font->unitsPerEm;
 
 
     if ( unitsPerEm == 0 )
       unitsPerEm = 1000;
+#endif
 
     FT_ZERO( blues );
     blues->scale = font->innerTransform.d;
@@ -406,11 +408,10 @@
       /* Note: constant changed from 0.5 to 0.6 to avoid a problem with */
       /*       10ppem Arial                                             */
 
-      blues->boost = FT_MulFix(
-                       cf2_floatToFixed( .6 ),
-                       ( cf2_intToFixed( 1 ) -
-                         FT_DivFix( blues->scale,
-                                    blues->blueScale ) ) );
+      blues->boost = cf2_floatToFixed( .6 ) -
+                       FT_MulDiv( cf2_floatToFixed ( .6 ),
+                                  blues->scale,
+                                  blues->blueScale );
       if ( blues->boost > 0x7FFF )
       {
         /* boost must remain less than 0.5, or baseline could go negative */