| Index: third_party/freetype/include/ftbdf.h
|
| diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftbdf.h b/third_party/freetype/include/ftbdf.h
|
| similarity index 96%
|
| rename from core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftbdf.h
|
| rename to third_party/freetype/include/ftbdf.h
|
| index c4721bcd4e76b10627183f9eb582c4ecaa28763f..6d262e4141ae8b5169b8f9e4363a35292c789baa 100644
|
| --- a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftbdf.h
|
| +++ b/third_party/freetype/include/ftbdf.h
|
| @@ -4,7 +4,7 @@
|
| /* */
|
| /* FreeType API for accessing BDF-specific strings (specification). */
|
| /* */
|
| -/* Copyright 2002, 2003, 2004, 2006, 2009 by */
|
| +/* Copyright 2002-2004, 2006, 2009, 2014 by */
|
| /* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
| /* */
|
| /* This file is part of the FreeType project, and may only be used, */
|
| @@ -19,8 +19,8 @@
|
| #ifndef __FTBDF_H__
|
| #define __FTBDF_H__
|
|
|
| -#include "../ft2build.h"
|
| -#include "freetype.h"
|
| +#include <ft2build.h>
|
| +#include FT_FREETYPE_H
|
|
|
| #ifdef FREETYPE_H
|
| #error "freetype.h of FreeType 1 has been loaded!"
|
| @@ -53,7 +53,7 @@ FT_BEGIN_HEADER
|
| /**********************************************************************
|
| *
|
| * @enum:
|
| - * FT_PropertyType
|
| + * BDF_PropertyType
|
| *
|
| * @description:
|
| * A list of BDF property types.
|
| @@ -106,7 +106,8 @@ FT_BEGIN_HEADER
|
| * The property type.
|
| *
|
| * u.atom ::
|
| - * The atom string, if type is @BDF_PROPERTY_TYPE_ATOM.
|
| + * The atom string, if type is @BDF_PROPERTY_TYPE_ATOM. May be
|
| + * NULL, indicating an empty string.
|
| *
|
| * u.integer ::
|
| * A signed integer, if type is @BDF_PROPERTY_TYPE_INTEGER.
|
| @@ -199,7 +200,7 @@ FT_BEGIN_HEADER
|
| const char* prop_name,
|
| BDF_PropertyRec *aproperty );
|
|
|
| - /* */
|
| + /* */
|
|
|
| FT_END_HEADER
|
|
|
|
|