Update freetype to 2.5.4.

third_party/freetype/src/cff/cffparse.c

Index: third_party/freetype/src/cff/cffparse.c
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/cff/cffparse.c b/third_party/freetype/src/cff/cffparse.c
similarity index 99%
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/cff/cffparse.c
rename to third_party/freetype/src/cff/cffparse.c
index b2d855395604024ec0a10cb9788f26875cb470fc..91bd5326c3e939b0cd3800df414fbc868404eb65 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/cff/cffparse.c
+++ b/third_party/freetype/src/cff/cffparse.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CFF token stream parser (body)                                       */
 /*                                                                         */
-/*  Copyright 1996-2004, 2007-2013 by                                      */
+/*  Copyright 1996-2004, 2007-2014 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -16,10 +16,10 @@
 /***************************************************************************/
 
 
-#include "../../include/ft2build.h"
+#include <ft2build.h>
 #include "cffparse.h"
-#include "../../include/freetype/internal/ftstream.h"
-#include "../../include/freetype/internal/ftdebug.h"
+#include FT_INTERNAL_STREAM_H
+#include FT_INTERNAL_DEBUG_H
 
 #include "cfferrs.h"
 #include "cffpic.h"
@@ -66,7 +66,6 @@
         goto Bad;
 
       val = (FT_Short)( ( (FT_UShort)p[0] << 8 ) | p[1] );
-      p  += 2;
     }
     else if ( v == 29 )
     {
@@ -77,7 +76,6 @@
                        ( (FT_ULong)p[1] << 16 ) |
                        ( (FT_ULong)p[2] <<  8 ) |
                          (FT_ULong)p[3]         );
-      p += 4;
     }
     else if ( v < 247 )
     {
@@ -89,7 +87,6 @@
         goto Bad;
 
       val = ( v - 247 ) * 256 + p[0] + 108;
-      p++;
     }
     else
     {
@@ -97,7 +94,6 @@
         goto Bad;
 
       val = -( v - 251 ) * 256 - p[0] - 108;
-      p++;
     }
 
   Exit: