| Index: third_party/freetype/src/type1/t1driver.c
|
| diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/type1/t1driver.c b/third_party/freetype/src/type1/t1driver.c
|
| similarity index 97%
|
| rename from core/src/fxge/fx_freetype/fxft2.5.01/src/type1/t1driver.c
|
| rename to third_party/freetype/src/type1/t1driver.c
|
| index 888586271688636afb0f7adbff741547227a74e0..2602bdb6ffca4f22e9ca6b5f3e60c59414ebed98 100644
|
| --- a/core/src/fxge/fx_freetype/fxft2.5.01/src/type1/t1driver.c
|
| +++ b/third_party/freetype/src/type1/t1driver.c
|
| @@ -4,7 +4,7 @@
|
| /* */
|
| /* Type 1 driver interface (body). */
|
| /* */
|
| -/* Copyright 1996-2004, 2006, 2007, 2009, 2011, 2013 by */
|
| +/* Copyright 1996-2004, 2006, 2007, 2009, 2011, 2013, 2014 by */
|
| /* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
| /* */
|
| /* This file is part of the FreeType project, and may only be used, */
|
| @@ -16,7 +16,7 @@
|
| /***************************************************************************/
|
|
|
|
|
| -#include "../../include/ft2build.h"
|
| +#include <ft2build.h>
|
| #include "t1driver.h"
|
| #include "t1gload.h"
|
| #include "t1load.h"
|
| @@ -27,16 +27,16 @@
|
| #include "t1afm.h"
|
| #endif
|
|
|
| -#include "../../include/freetype/internal/ftdebug.h"
|
| -#include "../../include/freetype/internal/ftstream.h"
|
| +#include FT_INTERNAL_DEBUG_H
|
| +#include FT_INTERNAL_STREAM_H
|
|
|
| -#include "../../include/freetype/internal/services/svmm.h"
|
| -#include "../../include/freetype/internal/services/svgldict.h"
|
| -#include "../../include/freetype/internal/services/svxf86nm.h"
|
| -#include "../../include/freetype/internal/services/svpostnm.h"
|
| -#include "../../include/freetype/internal/services/svpscmap.h"
|
| -#include "../../include/freetype/internal/services/svpsinfo.h"
|
| -#include "../../include/freetype/internal/services/svkern.h"
|
| +#include FT_SERVICE_MULTIPLE_MASTERS_H
|
| +#include FT_SERVICE_GLYPH_DICT_H
|
| +#include FT_SERVICE_XFREE86_NAME_H
|
| +#include FT_SERVICE_POSTSCRIPT_NAME_H
|
| +#include FT_SERVICE_POSTSCRIPT_CMAPS_H
|
| +#include FT_SERVICE_POSTSCRIPT_INFO_H
|
| +#include FT_SERVICE_KERNING_H
|
|
|
|
|
| /*************************************************************************/
|
| @@ -557,9 +557,6 @@
|
| if ( value && value_len >= retval )
|
| *((FT_Long *)value) = type1->font_info.italic_angle;
|
| break;
|
| -
|
| - default:
|
| - break;
|
| }
|
|
|
| return retval;
|
|
|