Index: third_party/freetype/include/internal/sfnt.h |
diff --git a/core/include/thirdparties/freetype/freetype/internal/sfnt.h b/third_party/freetype/include/internal/sfnt.h |
similarity index 98% |
rename from core/include/thirdparties/freetype/freetype/internal/sfnt.h |
rename to third_party/freetype/include/internal/sfnt.h |
index 2759ba3a961a54923d1b65a4483f5c747eb59ac7..d558e869bda3a4c44b3129e71918fb3d414dc2dc 100644 |
--- a/core/include/thirdparties/freetype/freetype/internal/sfnt.h |
+++ b/third_party/freetype/include/internal/sfnt.h |
@@ -4,7 +4,7 @@ |
/* */ |
/* High-level `sfnt' driver interface (specification). */ |
/* */ |
-/* Copyright 1996-2006, 2009, 2012-2013 by */ |
+/* Copyright 1996-2006, 2009, 2012-2014 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -20,9 +20,9 @@ |
#define __SFNT_H__ |
-#include "../../ft2build.h" |
-#include "ftdriver.h" |
-#include "tttypes.h" |
+#include <ft2build.h> |
+#include FT_INTERNAL_DRIVER_H |
+#include FT_INTERNAL_TRUETYPE_TYPES_H |
FT_BEGIN_HEADER |
@@ -405,14 +405,18 @@ FT_BEGIN_HEADER |
/* <Input> */ |
/* face :: A handle to the target face object. */ |
/* */ |
- /* stream :: The input stream. */ |
- /* */ |
/* vertical :: A boolean flag. If set, load vertical metrics. */ |
/* */ |
- /* <Return> */ |
- /* FreeType error code. 0 means success. */ |
+ /* gindex :: The glyph index. */ |
/* */ |
- typedef FT_Error |
+ /* <Output> */ |
+ /* abearing :: The horizontal (or vertical) bearing. Set to zero in */ |
+ /* case of error. */ |
+ /* */ |
+ /* aadvance :: The horizontal (or vertical) advance. Set to zero in */ |
+ /* case of error. */ |
+ /* */ |
+ typedef void |
(*TT_Get_Metrics_Func)( TT_Face face, |
FT_Bool vertical, |
FT_UInt gindex, |