Update freetype to 2.5.4.

third_party/freetype/include/internal/ftgloadr.h

Index: third_party/freetype/include/internal/ftgloadr.h
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/internal/ftgloadr.h b/third_party/freetype/include/internal/ftgloadr.h
similarity index 88%
rename from core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/internal/ftgloadr.h
rename to third_party/freetype/include/internal/ftgloadr.h
index 76e5a7ee58d8d5027bed54f781334c7fdc64462d..f70774f74eb9c0acc368eb81892edbf737953615 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/internal/ftgloadr.h
+++ b/third_party/freetype/include/internal/ftgloadr.h
@@ -20,8 +20,8 @@
 #define __FTGLOADR_H__
 
 
-#include "../../ft2build.h"
-#include "../freetype.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 
 FT_BEGIN_HEADER
@@ -121,20 +121,22 @@ FT_BEGIN_HEADER
                               FT_UInt         n_contours );
 
 
-#define FT_GLYPHLOADER_CHECK_P( _loader, _count )                         \
-   ( (_count) == 0 || ((_loader)->base.outline.n_points    +              \
-                       (_loader)->current.outline.n_points +              \
-                       (unsigned long)(_count)) <= (_loader)->max_points )
+#define FT_GLYPHLOADER_CHECK_P( _loader, _count )           \
+  ( (_count) == 0                                        || \
+    ( (_loader)->base.outline.n_points    +                 \
+      (_loader)->current.outline.n_points +                 \
+      (unsigned long)(_count) ) <= (_loader)->max_points )
 
-#define FT_GLYPHLOADER_CHECK_C( _loader, _count )                          \
-  ( (_count) == 0 || ((_loader)->base.outline.n_contours    +              \
-                      (_loader)->current.outline.n_contours +              \
-                      (unsigned long)(_count)) <= (_loader)->max_contours )
+#define FT_GLYPHLOADER_CHECK_C( _loader, _count )            \
+  ( (_count) == 0                                         || \
+    ( (_loader)->base.outline.n_contours    +                \
+      (_loader)->current.outline.n_contours +                \
+      (unsigned long)(_count)) <= (_loader)->max_contours )
 
-#define FT_GLYPHLOADER_CHECK_POINTS( _loader, _points,_contours )      \
-  ( ( FT_GLYPHLOADER_CHECK_P( _loader, _points )   &&                  \
-      FT_GLYPHLOADER_CHECK_C( _loader, _contours ) )                   \
-    ? 0                                                                \
+#define FT_GLYPHLOADER_CHECK_POINTS( _loader, _points, _contours )      \
+  ( ( FT_GLYPHLOADER_CHECK_P( _loader, _points )   &&                   \
+      FT_GLYPHLOADER_CHECK_C( _loader, _contours ) )                    \
+    ? 0                                                                 \
     : FT_GlyphLoader_CheckPoints( (_loader), (_points), (_contours) ) )