Update freetype to 2.5.4.

third_party/freetype/src/cid/cidobjs.c

Index: third_party/freetype/src/cid/cidobjs.c
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/cid/cidobjs.c b/third_party/freetype/src/cid/cidobjs.c
similarity index 96%
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/cid/cidobjs.c
rename to third_party/freetype/src/cid/cidobjs.c
index 7708600d1cae22b1746e6d6c4c62959f129bb0f2..5932ffa97300d075eb6b86fc0f93f10c2119193f 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/cid/cidobjs.c
+++ b/third_party/freetype/src/cid/cidobjs.c
@@ -16,16 +16,16 @@
 /***************************************************************************/
 
 
-#include "../../include/ft2build.h"
-#include "../../include/freetype/internal/ftdebug.h"
-#include "../../include/freetype/internal/ftstream.h"
+#include <ft2build.h>
+#include FT_INTERNAL_DEBUG_H
+#include FT_INTERNAL_STREAM_H
 
 #include "cidgload.h"
 #include "cidload.h"
 
-#include "../../include/freetype/internal/services/svpscmap.h"
-#include "../../include/freetype/internal/psaux.h"
-#include "../../include/freetype/internal/pshints.h"
+#include FT_SERVICE_POSTSCRIPT_CMAPS_H
+#include FT_INTERNAL_POSTSCRIPT_AUX_H
+#include FT_INTERNAL_POSTSCRIPT_HINTS_H
 
 #include "ciderrs.h"
 
@@ -355,9 +355,10 @@
       cidface->num_charmaps = 0;
 
       cidface->face_index = face_index;
-      cidface->face_flags = FT_FACE_FLAG_SCALABLE   | /* scalable outlines */
-                            FT_FACE_FLAG_HORIZONTAL | /* horizontal data   */
-                            FT_FACE_FLAG_HINTER;      /* has native hinter */
+
+      cidface->face_flags |= FT_FACE_FLAG_SCALABLE   | /* scalable outlines */
+                             FT_FACE_FLAG_HORIZONTAL | /* horizontal data   */
+                             FT_FACE_FLAG_HINTER;      /* has native hinter */
 
       if ( info->is_fixed_pitch )
         cidface->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;