Index: third_party/freetype/src/pshinter/pshglob.h |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/pshinter/pshglob.h b/third_party/freetype/src/pshinter/pshglob.h |
similarity index 97% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/pshinter/pshglob.h |
rename to third_party/freetype/src/pshinter/pshglob.h |
index cfc2001d2d2f0a4f6ed631b55f0db21bcb2b5520..94d972a940a89370565ab983ba57a1d5a2dea143 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/pshinter/pshglob.h |
+++ b/third_party/freetype/src/pshinter/pshglob.h |
@@ -4,7 +4,7 @@ |
/* */ |
/* PostScript hinter global hinting management. */ |
/* */ |
-/* Copyright 2001, 2002, 2003 by */ |
+/* Copyright 2001, 2002, 2003, 2014 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -20,8 +20,8 @@ |
#define __PSHGLOB_H__ |
-#include "../../include/freetype/freetype.h" |
-#include "../../include/freetype/internal/pshints.h" |
+#include FT_FREETYPE_H |
+#include FT_INTERNAL_POSTSCRIPT_HINTS_H |
FT_BEGIN_HEADER |
@@ -167,7 +167,7 @@ FT_BEGIN_HEADER |
FT_Int org_width ); |
#endif |
- FT_LOCAL( FT_Error ) |
+ FT_LOCAL( void ) |
psh_globals_set_scale( PSH_Globals globals, |
FT_Fixed x_scale, |
FT_Fixed y_scale, |