Index: third_party/freetype/include/fttypes.h |
diff --git a/core/include/thirdparties/freetype/freetype/fttypes.h b/third_party/freetype/include/fttypes.h |
similarity index 98% |
rename from core/include/thirdparties/freetype/freetype/fttypes.h |
rename to third_party/freetype/include/fttypes.h |
index 4d11bed4694a4f8567e3beb92c39c7b9142a0e68..2c01e8737cad9ae4047815033cec2f4107d99ae2 100644 |
--- a/core/include/thirdparties/freetype/freetype/fttypes.h |
+++ b/third_party/freetype/include/fttypes.h |
@@ -4,7 +4,7 @@ |
/* */ |
/* FreeType simple types definitions (specification only). */ |
/* */ |
-/* Copyright 1996-2002, 2004, 2006-2009, 2012, 2013 by */ |
+/* Copyright 1996-2002, 2004, 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,10 +20,10 @@ |
#define __FTTYPES_H__ |
-#include "../ft2build.h" |
-#include "config/ftconfig.h" |
-#include "ftsystem.h" |
-#include "ftimage.h" |
+#include <ft2build.h> |
+#include FT_CONFIG_CONFIG_H |
+#include FT_SYSTEM_H |
+#include FT_IMAGE_H |
#include <stddef.h> |
@@ -57,6 +57,8 @@ FT_BEGIN_HEADER |
/* FT_UInt16 */ |
/* FT_Int32 */ |
/* FT_UInt32 */ |
+ /* FT_Int64 */ |
+ /* FT_UInt64 */ |
/* FT_Short */ |
/* FT_UShort */ |
/* FT_Long */ |
@@ -78,7 +80,9 @@ FT_BEGIN_HEADER |
/* FT_F2Dot14 */ |
/* FT_UnitVector */ |
/* FT_F26Dot6 */ |
+ /* FT_Data */ |
/* */ |
+ /* FT_MAKE_TAG */ |
/* */ |
/* FT_Generic */ |
/* FT_Generic_Finalizer */ |
@@ -418,7 +422,7 @@ FT_BEGIN_HEADER |
/* details of usage. */ |
/* */ |
/* <Input> */ |
- /* The address of the FreeType object which is under finalization. */ |
+ /* The address of the FreeType object that is under finalization. */ |
/* Its client data is accessed through its `generic' field. */ |
/* */ |
typedef void (*FT_Generic_Finalizer)(void* object); |
@@ -466,8 +470,8 @@ FT_BEGIN_HEADER |
/* FT_MAKE_TAG */ |
/* */ |
/* <Description> */ |
- /* This macro converts four-letter tags which are used to label */ |
- /* TrueType tables into an unsigned long to be used within FreeType. */ |
+ /* This macro converts four-letter tags that are used to label */ |
+ /* TrueType tables into an unsigned long, to be used within FreeType. */ |
/* */ |
/* <Note> */ |
/* The produced values *must* be 32-bit integers. Don't redefine */ |
@@ -567,9 +571,9 @@ FT_BEGIN_HEADER |
} FT_ListRec; |
- |
/* */ |
+ |
#define FT_IS_EMPTY( list ) ( (list).head == 0 ) |
#define FT_BOOL( x ) ( (FT_Bool)( x ) ) |