| Index: third_party/freetype/src/pshinter/pshrec.c
|
| diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/pshinter/pshrec.c b/third_party/freetype/src/pshinter/pshrec.c
|
| similarity index 98%
|
| rename from core/src/fxge/fx_freetype/fxft2.5.01/src/pshinter/pshrec.c
|
| rename to third_party/freetype/src/pshinter/pshrec.c
|
| index 8fc9a302d7487e3b1ac39ed6e8feaa4d6cc52c28..73a18ffd64045c5d74aaeabe7a7a93dc418c4459 100644
|
| --- a/core/src/fxge/fx_freetype/fxft2.5.01/src/pshinter/pshrec.c
|
| +++ b/third_party/freetype/src/pshinter/pshrec.c
|
| @@ -4,7 +4,7 @@
|
| /* */
|
| /* FreeType PostScript hints recorder (body). */
|
| /* */
|
| -/* Copyright 2001-2004, 2007, 2009, 2013 by */
|
| +/* Copyright 2001-2004, 2007, 2009, 2013, 2014 by */
|
| /* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
| /* */
|
| /* This file is part of the FreeType project, and may only be used, */
|
| @@ -16,11 +16,11 @@
|
| /***************************************************************************/
|
|
|
|
|
| -#include "../../include/ft2build.h"
|
| -#include "../../include/freetype/freetype.h"
|
| -#include "../../include/freetype/internal/ftobjs.h"
|
| -#include "../../include/freetype/internal/ftdebug.h"
|
| -#include "../../include/freetype/internal/ftcalc.h"
|
| +#include <ft2build.h>
|
| +#include FT_FREETYPE_H
|
| +#include FT_INTERNAL_OBJECTS_H
|
| +#include FT_INTERNAL_DEBUG_H
|
| +#include FT_INTERNAL_CALC_H
|
|
|
| #include "pshrec.h"
|
| #include "pshalgo.h"
|
| @@ -797,13 +797,12 @@
|
| }
|
|
|
|
|
| - FT_LOCAL( FT_Error )
|
| + FT_LOCAL( void )
|
| ps_hints_init( PS_Hints hints,
|
| FT_Memory memory )
|
| {
|
| FT_MEM_ZERO( hints, sizeof ( *hints ) );
|
| hints->memory = memory;
|
| - return FT_Err_Ok;
|
| }
|
|
|
|
|
|
|