diff options
Diffstat (limited to 'freetype/src/base')
37 files changed, 78 insertions, 81 deletions
diff --git a/freetype/src/base/basepic.c b/freetype/src/base/basepic.c index 5268e7c67..222772b41 100644 --- a/freetype/src/base/basepic.c +++ b/freetype/src/base/basepic.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "basepic.h" diff --git a/freetype/src/base/basepic.h b/freetype/src/base/basepic.h index 329d7c8fd..1910a60f9 100644 --- a/freetype/src/base/basepic.h +++ b/freetype/src/base/basepic.h @@ -22,7 +22,7 @@ FT_BEGIN_HEADER -#include FT_INTERNAL_PIC_H +#include <freetype/internal/ftpic.h> #ifndef FT_CONFIG_OPTION_PIC diff --git a/freetype/src/base/ftadvanc.c b/freetype/src/base/ftadvanc.c index 52078478d..10ba02389 100644 --- a/freetype/src/base/ftadvanc.c +++ b/freetype/src/base/ftadvanc.c @@ -20,7 +20,7 @@ #include FT_INTERNAL_DEBUG_H #include FT_ADVANCES_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> static FT_Error diff --git a/freetype/src/base/ftapi.c b/freetype/src/base/ftapi.c index 8914d1f4e..d7d0657e5 100644 --- a/freetype/src/base/ftapi.c +++ b/freetype/src/base/ftapi.c @@ -19,9 +19,9 @@ #include <ft2build.h> #include FT_LIST_H #include FT_OUTLINE_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_TRUETYPE_TABLES_H #include FT_OUTLINE_H diff --git a/freetype/src/base/ftbase.h b/freetype/src/base/ftbase.h index 51a1db18b..9dcae7823 100644 --- a/freetype/src/base/ftbase.h +++ b/freetype/src/base/ftbase.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> FT_BEGIN_HEADER diff --git a/freetype/src/base/ftbbox.c b/freetype/src/base/ftbbox.c index 6d1c44cb2..a01b68161 100644 --- a/freetype/src/base/ftbbox.c +++ b/freetype/src/base/ftbbox.c @@ -30,8 +30,8 @@ #include FT_BBOX_H #include FT_IMAGE_H #include FT_OUTLINE_H -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftcalc.h> +#include <freetype/internal/ftobjs.h> typedef struct TBBox_Rec_ diff --git a/freetype/src/base/ftbdf.c b/freetype/src/base/ftbdf.c index 5755f8558..48aaacb9e 100644 --- a/freetype/src/base/ftbdf.c +++ b/freetype/src/base/ftbdf.c @@ -17,7 +17,7 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_SERVICE_BDF_H diff --git a/freetype/src/base/ftbitmap.c b/freetype/src/base/ftbitmap.c index 975818e14..50ef269bf 100644 --- a/freetype/src/base/ftbitmap.c +++ b/freetype/src/base/ftbitmap.c @@ -21,7 +21,7 @@ #include FT_BITMAP_H #include FT_IMAGE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> static diff --git a/freetype/src/base/ftcalc.c b/freetype/src/base/ftcalc.c index 0ec0d7893..27448b30a 100644..100755 --- a/freetype/src/base/ftcalc.c +++ b/freetype/src/base/ftcalc.c @@ -34,10 +34,10 @@ #include <ft2build.h> #include FT_GLYPH_H -#include FT_TRIGONOMETRY_H -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/fttrigon.h> +#include <freetype/internal/ftcalc.h> +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftobjs.h> #ifdef FT_MULFIX_INLINED #undef FT_MulFix diff --git a/freetype/src/base/ftcid.c b/freetype/src/base/ftcid.c index 741879d92..95fbe7453 100644 --- a/freetype/src/base/ftcid.c +++ b/freetype/src/base/ftcid.c @@ -16,8 +16,8 @@ #include <ft2build.h> -#include FT_CID_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/cid.h> +#include <freetype/internal/ftobjs.h> #include FT_SERVICE_CID_H diff --git a/freetype/src/base/ftdbgmem.c b/freetype/src/base/ftdbgmem.c index 6fb86fe77..f4b98effc 100644 --- a/freetype/src/base/ftdbgmem.c +++ b/freetype/src/base/ftdbgmem.c @@ -18,8 +18,8 @@ #include <ft2build.h> #include FT_CONFIG_CONFIG_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_MEMORY_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftmemory.h> #include FT_SYSTEM_H #include FT_ERRORS_H #include FT_TYPES_H diff --git a/freetype/src/base/ftdebug.c b/freetype/src/base/ftdebug.c index b9156d15e..876fe1df7 100644 --- a/freetype/src/base/ftdebug.c +++ b/freetype/src/base/ftdebug.c @@ -42,8 +42,8 @@ #include <ft2build.h> -#include FT_FREETYPE_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/freetype.h> +#include <freetype/internal/ftdebug.h> #ifdef FT_DEBUG_LEVEL_ERROR diff --git a/freetype/src/base/ftgasp.c b/freetype/src/base/ftgasp.c index 8485d2925..68f0c5c0a 100644 --- a/freetype/src/base/ftgasp.c +++ b/freetype/src/base/ftgasp.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_GASP_H -#include FT_INTERNAL_TRUETYPE_TYPES_H +#include <freetype/internal/tttypes.h> FT_EXPORT_DEF( FT_Int ) diff --git a/freetype/src/base/ftgloadr.c b/freetype/src/base/ftgloadr.c index 3cc5c7a80..7defb29d8 100644..100755 --- a/freetype/src/base/ftgloadr.c +++ b/freetype/src/base/ftgloadr.c @@ -17,10 +17,10 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_GLYPH_LOADER_H -#include FT_INTERNAL_MEMORY_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftgloadr.h> +#include <freetype/internal/ftmemory.h> +#include <freetype/internal/ftobjs.h> #undef FT_COMPONENT #define FT_COMPONENT trace_gloader diff --git a/freetype/src/base/ftglyph.c b/freetype/src/base/ftglyph.c index 5dd28a8c5..4380aa2bf 100644 --- a/freetype/src/base/ftglyph.c +++ b/freetype/src/base/ftglyph.c @@ -34,7 +34,7 @@ #include FT_GLYPH_H #include FT_OUTLINE_H #include FT_BITMAP_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "basepic.h" diff --git a/freetype/src/base/ftgxval.c b/freetype/src/base/ftgxval.c index a8ec44ac0..e301917d0 100644..100755 --- a/freetype/src/base/ftgxval.c +++ b/freetype/src/base/ftgxval.c @@ -26,9 +26,8 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H - -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftobjs.h> #include FT_SERVICE_GX_VALIDATE_H diff --git a/freetype/src/base/ftinit.c b/freetype/src/base/ftinit.c index 85f321fd2..b9dd96881 100644 --- a/freetype/src/base/ftinit.c +++ b/freetype/src/base/ftinit.c @@ -39,8 +39,8 @@ #include <ft2build.h> #include FT_CONFIG_CONFIG_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> #include FT_MODULE_H #include "basepic.h" diff --git a/freetype/src/base/ftlcdfil.c b/freetype/src/base/ftlcdfil.c index 852fb3298..17ef9c9bd 100644 --- a/freetype/src/base/ftlcdfil.c +++ b/freetype/src/base/ftlcdfil.c @@ -21,7 +21,7 @@ #include FT_LCD_FILTER_H #include FT_IMAGE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING diff --git a/freetype/src/base/ftmac.c b/freetype/src/base/ftmac.c index 5b5aae61c..9d193b4fa 100644 --- a/freetype/src/base/ftmac.c +++ b/freetype/src/base/ftmac.c @@ -68,7 +68,7 @@ #include <ft2build.h> #include FT_FREETYPE_H #include FT_TRUETYPE_TAGS_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftstream.h> #include "ftbase.h" /* This is for Mac OS X. Without redefinition, OS_INLINE */ diff --git a/freetype/src/base/ftmm.c b/freetype/src/base/ftmm.c index 18ff879bf..14ed98e47 100644 --- a/freetype/src/base/ftmm.c +++ b/freetype/src/base/ftmm.c @@ -20,7 +20,7 @@ #include FT_INTERNAL_DEBUG_H #include FT_MULTIPLE_MASTERS_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_SERVICE_MULTIPLE_MASTERS_H diff --git a/freetype/src/base/ftobjs.c b/freetype/src/base/ftobjs.c index 157bf4563..07b3b2f58 100644 --- a/freetype/src/base/ftobjs.c +++ b/freetype/src/base/ftobjs.c @@ -19,12 +19,12 @@ #include <ft2build.h> #include FT_LIST_H #include FT_OUTLINE_H -#include FT_INTERNAL_VALIDATE_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_RFORK_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_SFNT_H /* for SFNT_Load_Table_Func */ +#include <freetype/internal/ftvalid.h> +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftrfork.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/sfnt.h> /* for SFNT_Load_Table_Func */ #include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TAGS_H #include FT_TRUETYPE_IDS_H diff --git a/freetype/src/base/ftotval.c b/freetype/src/base/ftotval.c index 5fc73d76a..01fb4ea76 100644..100755 --- a/freetype/src/base/ftotval.c +++ b/freetype/src/base/ftotval.c @@ -16,9 +16,8 @@ /***************************************************************************/ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H - -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftobjs.h> #include FT_SERVICE_OPENTYPE_VALIDATE_H #include FT_OPENTYPE_VALIDATE_H diff --git a/freetype/src/base/ftoutln.c b/freetype/src/base/ftoutln.c index 54ca5cdcf..b8f709d6b 100644..100755 --- a/freetype/src/base/ftoutln.c +++ b/freetype/src/base/ftoutln.c @@ -25,10 +25,10 @@ #include <ft2build.h> #include FT_OUTLINE_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_DEBUG_H -#include FT_TRIGONOMETRY_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftcalc.h> +#include <freetype/internal/ftdebug.h> +#include <freetype/fttrigon.h> /*************************************************************************/ diff --git a/freetype/src/base/ftpatent.c b/freetype/src/base/ftpatent.c index 82b42f034..feae6660d 100644 --- a/freetype/src/base/ftpatent.c +++ b/freetype/src/base/ftpatent.c @@ -18,8 +18,8 @@ #include <ft2build.h> #include FT_FREETYPE_H #include FT_TRUETYPE_TAGS_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftstream.h> #include FT_SERVICE_SFNT_H #include FT_SERVICE_TRUETYPE_GLYF_H diff --git a/freetype/src/base/ftpfr.c b/freetype/src/base/ftpfr.c index 0ba955f01..7387e08c6 100644..100755 --- a/freetype/src/base/ftpfr.c +++ b/freetype/src/base/ftpfr.c @@ -16,10 +16,9 @@ /***************************************************************************/ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H - -#include FT_INTERNAL_OBJECTS_H -#include FT_SERVICE_PFR_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/services/svpfr.h> /* check the format */ diff --git a/freetype/src/base/ftpic.c b/freetype/src/base/ftpic.c index b74e90dad..7780c8a92 100644 --- a/freetype/src/base/ftpic.c +++ b/freetype/src/base/ftpic.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "basepic.h" #ifdef FT_CONFIG_OPTION_PIC diff --git a/freetype/src/base/ftrfork.c b/freetype/src/base/ftrfork.c index 804911721..16f81e62a 100644 --- a/freetype/src/base/ftrfork.c +++ b/freetype/src/base/ftrfork.c @@ -25,9 +25,9 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_RFORK_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftrfork.h> #include "basepic.h" #undef FT_COMPONENT diff --git a/freetype/src/base/ftsnames.c b/freetype/src/base/ftsnames.c index 260e91c14..26fa35c5a 100644 --- a/freetype/src/base/ftsnames.c +++ b/freetype/src/base/ftsnames.c @@ -21,8 +21,8 @@ #include <ft2build.h> #include FT_SFNT_NAMES_H -#include FT_INTERNAL_TRUETYPE_TYPES_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/tttypes.h> +#include <freetype/internal/ftstream.h> #ifdef TT_CONFIG_OPTION_SFNT_NAMES diff --git a/freetype/src/base/ftstream.c b/freetype/src/base/ftstream.c index d965333da..39b5c1e7f 100644 --- a/freetype/src/base/ftstream.c +++ b/freetype/src/base/ftstream.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftdebug.h> /*************************************************************************/ diff --git a/freetype/src/base/ftstroke.c b/freetype/src/base/ftstroke.c index ee61ceca0..2f7db791a 100644 --- a/freetype/src/base/ftstroke.c +++ b/freetype/src/base/ftstroke.c @@ -20,9 +20,9 @@ #include FT_STROKER_H #include FT_TRIGONOMETRY_H #include FT_OUTLINE_H -#include FT_INTERNAL_MEMORY_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftmemory.h> +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftobjs.h> /* documentation is in ftstroke.h */ diff --git a/freetype/src/base/ftsynth.c b/freetype/src/base/ftsynth.c index 241d37f42..a25280d0c 100644 --- a/freetype/src/base/ftsynth.c +++ b/freetype/src/base/ftsynth.c @@ -17,11 +17,11 @@ #include <ft2build.h> -#include FT_SYNTHESIS_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_OBJECTS_H -#include FT_OUTLINE_H -#include FT_BITMAP_H +#include <freetype/ftsynth.h> +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> +#include <freetype/ftoutln.h> +#include <freetype/ftbitmap.h> /*************************************************************************/ diff --git a/freetype/src/base/ftsystem.c b/freetype/src/base/ftsystem.c index 2c6ddac10..6d6cb7b2e 100644 --- a/freetype/src/base/ftsystem.c +++ b/freetype/src/base/ftsystem.c @@ -27,8 +27,8 @@ #include <ft2build.h> #include FT_CONFIG_CONFIG_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_SYSTEM_H #include FT_ERRORS_H #include FT_TYPES_H diff --git a/freetype/src/base/fttrigon.c b/freetype/src/base/fttrigon.c index 4ffdcb77f..a5c7efc01 100644..100755 --- a/freetype/src/base/fttrigon.c +++ b/freetype/src/base/fttrigon.c @@ -30,7 +30,7 @@ /*************************************************************************/ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_INTERNAL_CALC_H #include FT_TRIGONOMETRY_H diff --git a/freetype/src/base/fttype1.c b/freetype/src/base/fttype1.c index c1f9931db..db48b135e 100644 --- a/freetype/src/base/fttype1.c +++ b/freetype/src/base/fttype1.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_SERVICE_H -#include FT_SERVICE_POSTSCRIPT_INFO_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftserv.h> +#include <freetype/internal/services/svpsinfo.h> /* documentation is in t1tables.h */ diff --git a/freetype/src/base/ftutil.c b/freetype/src/base/ftutil.c index 879d02752..042077f5a 100644 --- a/freetype/src/base/ftutil.c +++ b/freetype/src/base/ftutil.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_MEMORY_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftmemory.h> +#include <freetype/internal/ftobjs.h> #include FT_LIST_H diff --git a/freetype/src/base/ftwinfnt.c b/freetype/src/base/ftwinfnt.c index 463ae761d..c5ae97e1a 100644 --- a/freetype/src/base/ftwinfnt.c +++ b/freetype/src/base/ftwinfnt.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_WINFONTS_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_SERVICE_WINFNT_H diff --git a/freetype/src/base/ftxf86.c b/freetype/src/base/ftxf86.c index a4bf767df..680f57637 100644 --- a/freetype/src/base/ftxf86.c +++ b/freetype/src/base/ftxf86.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_XFREE86_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_SERVICE_XFREE86_NAME_H |