Index: third_party/freetype/src/cid/cidparse.h |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/cid/cidparse.h b/third_party/freetype/src/cid/cidparse.h |
similarity index 87% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/cid/cidparse.h |
rename to third_party/freetype/src/cid/cidparse.h |
index 46284d2380f8f613425413d9e3da4ba6ff448ee5..f27be65a600795d31d8ea434be0c77915d10d09d 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/cid/cidparse.h |
+++ b/third_party/freetype/src/cid/cidparse.h |
@@ -4,7 +4,7 @@ |
/* */ |
/* CID-keyed Type1 parser (specification). */ |
/* */ |
-/* Copyright 1996-2001, 2002, 2003, 2004 by */ |
+/* Copyright 1996-2004, 2014 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -20,10 +20,10 @@ |
#define __CIDPARSE_H__ |
-#include "../../include/ft2build.h" |
-#include "../../include/freetype/internal/t1types.h" |
-#include "../../include/freetype/internal/ftstream.h" |
-#include "../../include/freetype/internal/psaux.h" |
+#include <ft2build.h> |
+#include FT_INTERNAL_TYPE1_TYPES_H |
+#include FT_INTERNAL_STREAM_H |
+#include FT_INTERNAL_POSTSCRIPT_AUX_H |
FT_BEGIN_HEADER |
@@ -92,26 +92,26 @@ FT_BEGIN_HEADER |
/* */ |
/*************************************************************************/ |
-#define cid_parser_skip_spaces( p ) \ |
+#define cid_parser_skip_spaces( p ) \ |
(p)->root.funcs.skip_spaces( &(p)->root ) |
-#define cid_parser_skip_PS_token( p ) \ |
+#define cid_parser_skip_PS_token( p ) \ |
(p)->root.funcs.skip_PS_token( &(p)->root ) |
-#define cid_parser_to_int( p ) (p)->root.funcs.to_int( &(p)->root ) |
-#define cid_parser_to_fixed( p, t ) (p)->root.funcs.to_fixed( &(p)->root, t ) |
+#define cid_parser_to_int( p ) (p)->root.funcs.to_int( &(p)->root ) |
+#define cid_parser_to_fixed( p, t ) (p)->root.funcs.to_fixed( &(p)->root, t ) |
-#define cid_parser_to_coord_array( p, m, c ) \ |
+#define cid_parser_to_coord_array( p, m, c ) \ |
(p)->root.funcs.to_coord_array( &(p)->root, m, c ) |
-#define cid_parser_to_fixed_array( p, m, f, t ) \ |
+#define cid_parser_to_fixed_array( p, m, f, t ) \ |
(p)->root.funcs.to_fixed_array( &(p)->root, m, f, t ) |
-#define cid_parser_to_token( p, t ) \ |
+#define cid_parser_to_token( p, t ) \ |
(p)->root.funcs.to_token( &(p)->root, t ) |
-#define cid_parser_to_token_array( p, t, m, c ) \ |
+#define cid_parser_to_token_array( p, t, m, c ) \ |
(p)->root.funcs.to_token_array( &(p)->root, t, m, c ) |
-#define cid_parser_load_field( p, f, o ) \ |
+#define cid_parser_load_field( p, f, o ) \ |
(p)->root.funcs.load_field( &(p)->root, f, o, 0, 0 ) |
-#define cid_parser_load_field_table( p, f, o ) \ |
+#define cid_parser_load_field_table( p, f, o ) \ |
(p)->root.funcs.load_field_table( &(p)->root, f, o, 0, 0 ) |