Index: third_party/freetype/include/ftmm.h |
diff --git a/core/include/thirdparties/freetype/freetype/ftmm.h b/third_party/freetype/include/ftmm.h |
similarity index 98% |
rename from core/include/thirdparties/freetype/freetype/ftmm.h |
rename to third_party/freetype/include/ftmm.h |
index 52aaf44375eb5af2554bbef4247e3396ebcfd12c..2dcfd678df14f710a0d24e8ba9c4d8079d4bdf26 100644 |
--- a/core/include/thirdparties/freetype/freetype/ftmm.h |
+++ b/third_party/freetype/include/ftmm.h |
@@ -4,7 +4,7 @@ |
/* */ |
/* FreeType Multiple Master font interface (specification). */ |
/* */ |
-/* Copyright 1996-2001, 2003, 2004, 2006, 2009 by */ |
+/* Copyright 1996-2001, 2003, 2004, 2006, 2009, 2013 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 __FTMM_H__ |
-#include "../ft2build.h" |
-#include "t1tables.h" |
+#include <ft2build.h> |
+#include FT_TYPE1_TABLES_H |
FT_BEGIN_HEADER |
@@ -196,7 +196,7 @@ FT_BEGIN_HEADER |
/* number of designs). */ |
/* */ |
/* num_namedstyles :: The number of named styles; only meaningful for */ |
- /* GX which allows certain design coordinates to */ |
+ /* GX that allows certain design coordinates to */ |
/* have a string ID (in the `name' table) */ |
/* associated with them. The font can tell the */ |
/* user that, for example, Weight=1.5 is `Bold'. */ |
@@ -218,9 +218,6 @@ FT_BEGIN_HEADER |
} FT_MM_Var; |
- /* */ |
- |
- |
/*************************************************************************/ |
/* */ |
/* <Function> */ |
@@ -258,8 +255,7 @@ FT_BEGIN_HEADER |
/* */ |
/* <Output> */ |
/* amaster :: The Multiple Masters/GX var descriptor. */ |
- /* Allocates a data structure, which the user must free */ |
- /* (a single call to FT_FREE will do it). */ |
+ /* Allocates a data structure, which the user must free. */ |
/* */ |
/* <Return> */ |
/* FreeType error code. 0~means success. */ |
@@ -366,7 +362,6 @@ FT_BEGIN_HEADER |
FT_UInt num_coords, |
FT_Fixed* coords ); |
- |
/* */ |