| Index: third_party/freetype/src/base/basepic.c
|
| diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/basepic.c b/third_party/freetype/src/base/basepic.c
|
| similarity index 91%
|
| rename from core/src/fxge/fx_freetype/fxft2.5.01/src/base/basepic.c
|
| rename to third_party/freetype/src/base/basepic.c
|
| index d6fc01cce8697804dd85eb21c4731c1a59c383f1..aeb6fd5777015f73dfc2b0069de8a972fac3924e 100644
|
| --- a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/basepic.c
|
| +++ b/third_party/freetype/src/base/basepic.c
|
| @@ -4,7 +4,7 @@
|
| /* */
|
| /* The FreeType position independent code services for base. */
|
| /* */
|
| -/* Copyright 2009, 2012 by */
|
| +/* Copyright 2009, 2012, 2013 by */
|
| /* Oran Agra and Mickey Gabel. */
|
| /* */
|
| /* This file is part of the FreeType project, and may only be used, */
|
| @@ -16,9 +16,9 @@
|
| /***************************************************************************/
|
|
|
|
|
| -#include "../../include/ft2build.h"
|
| -#include "../../include/freetype/freetype.h"
|
| -#include "../../include/freetype/internal/ftobjs.h"
|
| +#include <ft2build.h>
|
| +#include FT_FREETYPE_H
|
| +#include FT_INTERNAL_OBJECTS_H
|
| #include "basepic.h"
|
|
|
|
|
| @@ -35,7 +35,7 @@
|
| /* forward declaration of PIC init function from ftrfork.c */
|
| /* (not modularized) */
|
| void
|
| - FT_Init_Table_raccess_guess_table( ft_raccess_guess_rec* record );
|
| + FT_Init_Table_ft_raccess_guess_table( ft_raccess_guess_rec* record );
|
| #endif
|
|
|
| /* forward declaration of PIC init functions from ftinit.c */
|
| @@ -92,7 +92,7 @@
|
| FT_Init_Class_ft_bitmap_glyph_class(
|
| &container->ft_bitmap_glyph_class );
|
| #ifdef FT_CONFIG_OPTION_MAC_FONTS
|
| - FT_Init_Table_raccess_guess_table(
|
| + FT_Init_Table_ft_raccess_guess_table(
|
| (ft_raccess_guess_rec*)&container->ft_raccess_guess_table );
|
| #endif
|
|
|
|
|