diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-12 18:20:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-12 18:20:04 +0000 |
| commit | da8fe31a7ba4acf109097d5696ad0145b991cdfd (patch) | |
| tree | 1c74d6f075702a73e557872f2a6f020ea4eb5432 /freetype/src | |
| parent | 6590f805a12779909cb8504c230fa367148fe38c (diff) | |
| parent | 529dcfd0858d75cb3c87c73cb0f81dd20bbb9230 (diff) | |
| download | vcxsrv-da8fe31a7ba4acf109097d5696ad0145b991cdfd.tar.gz vcxsrv-da8fe31a7ba4acf109097d5696ad0145b991cdfd.tar.bz2 vcxsrv-da8fe31a7ba4acf109097d5696ad0145b991cdfd.zip | |
Changes for VC compilation
Diffstat (limited to 'freetype/src')
163 files changed, 338 insertions, 338 deletions
diff --git a/freetype/src/autofit/afhints.c b/freetype/src/autofit/afhints.c index 8ab176148..6384cb79a 100644 --- a/freetype/src/autofit/afhints.c +++ b/freetype/src/autofit/afhints.c @@ -18,7 +18,7 @@ #include "afhints.h" #include "aferrors.h" -#include FT_INTERNAL_CALC_H +#include <freetype/internal/ftcalc.h> FT_LOCAL_DEF( FT_Error ) diff --git a/freetype/src/autofit/afmodule.c b/freetype/src/autofit/afmodule.c index cd5e1cc21..e86193eee 100644 --- a/freetype/src/autofit/afmodule.c +++ b/freetype/src/autofit/afmodule.c @@ -27,7 +27,7 @@ void* _af_debug_hints; #endif -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> typedef struct FT_AutofitterRec_ diff --git a/freetype/src/autofit/aftypes.h b/freetype/src/autofit/aftypes.h index 626a38865..e7515fef8 100644 --- a/freetype/src/autofit/aftypes.h +++ b/freetype/src/autofit/aftypes.h @@ -37,10 +37,10 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #include FT_OUTLINE_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> FT_BEGIN_HEADER diff --git a/freetype/src/base/ftadvanc.c b/freetype/src/base/ftadvanc.c index 504f9d230..86b1b8542 100644 --- a/freetype/src/base/ftadvanc.c +++ b/freetype/src/base/ftadvanc.c @@ -18,7 +18,7 @@ #include <ft2build.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 9cae85da9..d72cba209 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 532ab1357..fee4a8420 100644 --- a/freetype/src/base/ftbbox.c +++ b/freetype/src/base/ftbbox.c @@ -28,7 +28,7 @@ #include FT_BBOX_H #include FT_IMAGE_H #include FT_OUTLINE_H -#include FT_INTERNAL_CALC_H +#include <freetype/internal/ftcalc.h> typedef struct TBBox_Rec_ diff --git a/freetype/src/base/ftbdf.c b/freetype/src/base/ftbdf.c index d29adf09d..f216d0ae1 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 8810cfadf..d8854a48e 100644 --- a/freetype/src/base/ftbitmap.c +++ b/freetype/src/base/ftbitmap.c @@ -19,7 +19,7 @@ #include <ft2build.h> #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 04295a693..2d1a04925 100644 --- a/freetype/src/base/ftcalc.c +++ b/freetype/src/base/ftcalc.c @@ -34,9 +34,9 @@ #include <ft2build.h> #include FT_GLYPH_H -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_OBJECTS_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 733aae147..680561c71 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 8b2a3304f..49ee33d48 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 2adbeabeb..5a8b3978b 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 ab52621ea..e1a19af2b 100644 --- a/freetype/src/base/ftgloadr.c +++ b/freetype/src/base/ftgloadr.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include FT_INTERNAL_GLYPH_LOADER_H -#include FT_INTERNAL_MEMORY_H -#include FT_INTERNAL_OBJECTS_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 4130cb110..06cfbc38f 100644 --- a/freetype/src/base/ftglyph.c +++ b/freetype/src/base/ftglyph.c @@ -32,7 +32,7 @@ #include FT_GLYPH_H #include FT_OUTLINE_H #include FT_BITMAP_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> /*************************************************************************/ diff --git a/freetype/src/base/ftgxval.c b/freetype/src/base/ftgxval.c index 32662bed8..d0dcbc11f 100644 --- a/freetype/src/base/ftgxval.c +++ b/freetype/src/base/ftgxval.c @@ -26,7 +26,7 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_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 dac30b0d8..fe06aaeaf 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 diff --git a/freetype/src/base/ftlcdfil.c b/freetype/src/base/ftlcdfil.c index 80640111c..3ed6d8191 100644 --- a/freetype/src/base/ftlcdfil.c +++ b/freetype/src/base/ftlcdfil.c @@ -19,7 +19,7 @@ #include <ft2build.h> #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 63f927d57..1ed1f9236 100644 --- a/freetype/src/base/ftmac.c +++ b/freetype/src/base/ftmac.c @@ -69,7 +69,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 030772981..d94174ac2 100644 --- a/freetype/src/base/ftmm.c +++ b/freetype/src/base/ftmm.c @@ -18,7 +18,7 @@ #include <ft2build.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/ftnames.c b/freetype/src/base/ftnames.c index 7fde5c40b..296e77d12 100644 --- a/freetype/src/base/ftnames.c +++ b/freetype/src/base/ftnames.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/ftobjs.c b/freetype/src/base/ftobjs.c index 72dea335b..d4e3c0e9c 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 20ed686ee..6bf8e04c6 100644 --- a/freetype/src/base/ftotval.c +++ b/freetype/src/base/ftotval.c @@ -16,7 +16,7 @@ /***************************************************************************/ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_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 49ef82e27..f42dd6f17 100644 --- a/freetype/src/base/ftoutln.c +++ b/freetype/src/base/ftoutln.c @@ -25,8 +25,8 @@ #include <ft2build.h> #include FT_OUTLINE_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> #include FT_TRIGONOMETRY_H diff --git a/freetype/src/base/ftpatent.c b/freetype/src/base/ftpatent.c index 9f129d8f0..5e54e7383 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 f9592bb1b..1f2e488b3 100644 --- a/freetype/src/base/ftpfr.c +++ b/freetype/src/base/ftpfr.c @@ -16,7 +16,7 @@ /***************************************************************************/ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_SERVICE_PFR_H diff --git a/freetype/src/base/ftrfork.c b/freetype/src/base/ftrfork.c index d59a07611..fe9f82321 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> #undef FT_COMPONENT diff --git a/freetype/src/base/ftstream.c b/freetype/src/base/ftstream.c index cff67e0e9..73e292d32 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 3f5421fa5..bfe9e22e7 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 443d27260..4f2396e9f 100644 --- a/freetype/src/base/ftsynth.c +++ b/freetype/src/base/ftsynth.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_SYNTHESIS_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_OUTLINE_H #include FT_BITMAP_H diff --git a/freetype/src/base/ftsystem.c b/freetype/src/base/ftsystem.c index f64908fd2..2bf96a923 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 9f513946b..19c6aa5e9 100644 --- a/freetype/src/base/fttrigon.c +++ b/freetype/src/base/fttrigon.c @@ -17,7 +17,7 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_TRIGONOMETRY_H diff --git a/freetype/src/base/fttype1.c b/freetype/src/base/fttype1.c index 3975584db..d271c0af6 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 5f77be557..904899088 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 bc2e90e1f..665ea9233 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 diff --git a/freetype/src/bdf/bdf.h b/freetype/src/bdf/bdf.h index 1b64426aa..2cef8a075 100644 --- a/freetype/src/bdf/bdf.h +++ b/freetype/src/bdf/bdf.h @@ -31,8 +31,8 @@ */ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftstream.h> FT_BEGIN_HEADER diff --git a/freetype/src/bdf/bdfdrivr.c b/freetype/src/bdf/bdfdrivr.c index 0b736b5ce..0efe23438 100644 --- a/freetype/src/bdf/bdfdrivr.c +++ b/freetype/src/bdf/bdfdrivr.c @@ -26,9 +26,9 @@ THE SOFTWARE. #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftobjs.h> #include FT_BDF_H #include FT_SERVICE_BDF_H diff --git a/freetype/src/bdf/bdfdrivr.h b/freetype/src/bdf/bdfdrivr.h index 86f40ee4a..29212be4a 100644 --- a/freetype/src/bdf/bdfdrivr.h +++ b/freetype/src/bdf/bdfdrivr.h @@ -29,7 +29,7 @@ THE SOFTWARE. #define __BDFDRIVR_H__ #include <ft2build.h> -#include FT_INTERNAL_DRIVER_H +#include <freetype/internal/ftdriver.h> #include "bdf.h" diff --git a/freetype/src/bdf/bdflib.c b/freetype/src/bdf/bdflib.c index 5435b20e6..151f3116a 100644 --- a/freetype/src/bdf/bdflib.c +++ b/freetype/src/bdf/bdflib.c @@ -34,9 +34,9 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftobjs.h> #include "bdf.h" #include "bdferror.h" diff --git a/freetype/src/cache/ftcbasic.c b/freetype/src/cache/ftcbasic.c index a568b975b..790dcb761 100644 --- a/freetype/src/cache/ftcbasic.c +++ b/freetype/src/cache/ftcbasic.c @@ -21,7 +21,7 @@ #include "ftcglyph.h" #include "ftcimage.h" #include "ftcsbits.h" -#include FT_INTERNAL_MEMORY_H +#include <freetype/internal/ftmemory.h> #include "ftccback.h" #include "ftcerror.h" diff --git a/freetype/src/cache/ftccache.c b/freetype/src/cache/ftccache.c index f3e699c38..c86149800 100644 --- a/freetype/src/cache/ftccache.c +++ b/freetype/src/cache/ftccache.c @@ -18,8 +18,8 @@ #include <ft2build.h> #include "ftcmanag.h" -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> #include "ftccback.h" #include "ftcerror.h" diff --git a/freetype/src/cache/ftccmap.c b/freetype/src/cache/ftccmap.c index 4c6a7fd96..1c80fac83 100644 --- a/freetype/src/cache/ftccmap.c +++ b/freetype/src/cache/ftccmap.c @@ -20,8 +20,8 @@ #include FT_FREETYPE_H #include FT_CACHE_H #include "ftcmanag.h" -#include FT_INTERNAL_MEMORY_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftmemory.h> +#include <freetype/internal/ftdebug.h> #include FT_TRUETYPE_IDS_H #include "ftccback.h" diff --git a/freetype/src/cache/ftcglyph.c b/freetype/src/cache/ftcglyph.c index 5c03abe05..c6d2a2bdb 100644 --- a/freetype/src/cache/ftcglyph.c +++ b/freetype/src/cache/ftcglyph.c @@ -20,8 +20,8 @@ #include FT_CACHE_H #include "ftcglyph.h" #include FT_ERRORS_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> #include "ftccback.h" #include "ftcerror.h" diff --git a/freetype/src/cache/ftcimage.c b/freetype/src/cache/ftcimage.c index 15d4e80c8..18e1dbc1e 100644 --- a/freetype/src/cache/ftcimage.c +++ b/freetype/src/cache/ftcimage.c @@ -19,7 +19,7 @@ #include <ft2build.h> #include FT_CACHE_H #include "ftcimage.h" -#include FT_INTERNAL_MEMORY_H +#include <freetype/internal/ftmemory.h> #include "ftccback.h" #include "ftcerror.h" diff --git a/freetype/src/cache/ftcmanag.c b/freetype/src/cache/ftcmanag.c index 4d44094ce..f8a4218db 100644 --- a/freetype/src/cache/ftcmanag.c +++ b/freetype/src/cache/ftcmanag.c @@ -19,8 +19,8 @@ #include <ft2build.h> #include FT_CACHE_H #include "ftcmanag.h" -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> #include FT_SIZES_H #include "ftccback.h" diff --git a/freetype/src/cache/ftcmru.c b/freetype/src/cache/ftcmru.c index 3a6c625af..107418e7c 100644 --- a/freetype/src/cache/ftcmru.c +++ b/freetype/src/cache/ftcmru.c @@ -19,8 +19,8 @@ #include <ft2build.h> #include FT_CACHE_H #include "ftcmru.h" -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> #include "ftcerror.h" diff --git a/freetype/src/cache/ftcmru.h b/freetype/src/cache/ftcmru.h index c8f0c6ef6..d590a06d5 100644 --- a/freetype/src/cache/ftcmru.h +++ b/freetype/src/cache/ftcmru.h @@ -45,7 +45,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/src/cache/ftcsbits.c b/freetype/src/cache/ftcsbits.c index 72f139d56..be83e5065 100644 --- a/freetype/src/cache/ftcsbits.c +++ b/freetype/src/cache/ftcsbits.c @@ -19,8 +19,8 @@ #include <ft2build.h> #include FT_CACHE_H #include "ftcsbits.h" -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> #include FT_ERRORS_H #include "ftccback.h" diff --git a/freetype/src/cff/cffdrivr.c b/freetype/src/cff/cffdrivr.c index 3dd86f2aa..29a863678 100644 --- a/freetype/src/cff/cffdrivr.c +++ b/freetype/src/cff/cffdrivr.c @@ -17,14 +17,14 @@ #include <ft2build.h> -#include FT_FREETYPE_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_SFNT_H -#include FT_TRUETYPE_IDS_H -#include FT_SERVICE_CID_H -#include FT_SERVICE_POSTSCRIPT_CMAPS_H -#include FT_SERVICE_POSTSCRIPT_INFO_H +#include <freetype/freetype.h> +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/sfnt.h> +#include <freetype/ttnameid.h> +#include <freetype/internal/services/svcid.h> +#include <freetype/internal/services/svpscmap.h> +#include <freetype/internal/services/svpsinfo.h> #include FT_SERVICE_POSTSCRIPT_NAME_H #include FT_SERVICE_TT_CMAP_H diff --git a/freetype/src/cff/cffdrivr.h b/freetype/src/cff/cffdrivr.h index 553848c0a..ee441253b 100644 --- a/freetype/src/cff/cffdrivr.h +++ b/freetype/src/cff/cffdrivr.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_INTERNAL_DRIVER_H +#include <freetype/internal/ftdriver.h> FT_BEGIN_HEADER diff --git a/freetype/src/cff/cffgload.c b/freetype/src/cff/cffgload.c index 2718a277b..a66928bb5 100644 --- a/freetype/src/cff/cffgload.c +++ b/freetype/src/cff/cffgload.c @@ -17,13 +17,13 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_SFNT_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftcalc.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/sfnt.h> #include FT_OUTLINE_H #include FT_TRUETYPE_TAGS_H -#include FT_INTERNAL_POSTSCRIPT_HINTS_H +#include <freetype/internal/pshints.h> #include "cffobjs.h" #include "cffload.h" diff --git a/freetype/src/cff/cffgload.h b/freetype/src/cff/cffgload.h index 667134e3b..85de77f46 100644 --- a/freetype/src/cff/cffgload.h +++ b/freetype/src/cff/cffgload.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #include "cffobjs.h" diff --git a/freetype/src/cff/cffload.c b/freetype/src/cff/cffload.c index 22163fb75..c0f43fd20 100644 --- a/freetype/src/cff/cffload.c +++ b/freetype/src/cff/cffload.c @@ -17,12 +17,12 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_STREAM_H -#include FT_SERVICE_POSTSCRIPT_CMAPS_H -#include FT_TRUETYPE_TAGS_H -#include FT_TYPE1_TABLES_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/services/svpscmap.h> +#include <freetype/tttags.h> +#include <freetype/t1tables.h> #include "cffload.h" #include "cffparse.h" diff --git a/freetype/src/cff/cffload.h b/freetype/src/cff/cffload.h index 02498bd5e..13697e599 100644 --- a/freetype/src/cff/cffload.h +++ b/freetype/src/cff/cffload.h @@ -22,7 +22,7 @@ #include <ft2build.h> #include "cfftypes.h" -#include FT_SERVICE_POSTSCRIPT_CMAPS_H +#include <freetype/internal/services/svpscmap.h> FT_BEGIN_HEADER diff --git a/freetype/src/cff/cffobjs.c b/freetype/src/cff/cffobjs.c index 3525ea3b7..85ef89d97 100644 --- a/freetype/src/cff/cffobjs.c +++ b/freetype/src/cff/cffobjs.c @@ -17,15 +17,15 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftcalc.h> +#include <freetype/internal/ftstream.h> #include FT_ERRORS_H #include FT_TRUETYPE_IDS_H #include FT_TRUETYPE_TAGS_H -#include FT_INTERNAL_SFNT_H +#include <freetype/internal/sfnt.h> #include FT_SERVICE_POSTSCRIPT_CMAPS_H -#include FT_INTERNAL_POSTSCRIPT_HINTS_H +#include <freetype/internal/pshints.h> #include "cffobjs.h" #include "cffload.h" #include "cffcmap.h" diff --git a/freetype/src/cff/cffobjs.h b/freetype/src/cff/cffobjs.h index 3c81cee00..6873df8c1 100644 --- a/freetype/src/cff/cffobjs.h +++ b/freetype/src/cff/cffobjs.h @@ -21,11 +21,11 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "cfftypes.h" -#include FT_INTERNAL_TRUETYPE_TYPES_H -#include FT_SERVICE_POSTSCRIPT_CMAPS_H -#include FT_INTERNAL_POSTSCRIPT_HINTS_H +#include <freetype/internal/tttypes.h> +#include <freetype/internal/services/svpscmap.h> +#include <freetype/internal/pshints.h> FT_BEGIN_HEADER diff --git a/freetype/src/cff/cffparse.c b/freetype/src/cff/cffparse.c index 290595f9e..8af93b8e8 100644 --- a/freetype/src/cff/cffparse.c +++ b/freetype/src/cff/cffparse.c @@ -18,8 +18,8 @@ #include <ft2build.h> #include "cffparse.h" -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftdebug.h> #include "cfferrs.h" diff --git a/freetype/src/cff/cffparse.h b/freetype/src/cff/cffparse.h index 8f3fa5885..f3ec9adb4 100644 --- a/freetype/src/cff/cffparse.h +++ b/freetype/src/cff/cffparse.h @@ -22,7 +22,7 @@ #include <ft2build.h> #include "cfftypes.h" -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> FT_BEGIN_HEADER diff --git a/freetype/src/cff/cfftypes.h b/freetype/src/cff/cfftypes.h index 546ea3b99..f23e54c09 100644 --- a/freetype/src/cff/cfftypes.h +++ b/freetype/src/cff/cfftypes.h @@ -22,8 +22,8 @@ #include <ft2build.h> -#include FT_FREETYPE_H -#include FT_TYPE1_TABLES_H +#include <freetype/freetype.h> +#include <freetype/t1tables.h> FT_BEGIN_HEADER diff --git a/freetype/src/cid/cidgload.c b/freetype/src/cid/cidgload.c index 64994b441..39a2ba495 100644 --- a/freetype/src/cid/cidgload.c +++ b/freetype/src/cid/cidgload.c @@ -19,8 +19,8 @@ #include <ft2build.h> #include "cidload.h" #include "cidgload.h" -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_OUTLINE_H #include "ciderrs.h" diff --git a/freetype/src/cid/cidload.c b/freetype/src/cid/cidload.c index a43a00e01..14a49aa52 100644 --- a/freetype/src/cid/cidload.c +++ b/freetype/src/cid/cidload.c @@ -17,10 +17,10 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> #include FT_CONFIG_CONFIG_H #include FT_MULTIPLE_MASTERS_H -#include FT_INTERNAL_TYPE1_TYPES_H +#include <freetype/internal/t1types.h> #include "cidload.h" diff --git a/freetype/src/cid/cidload.h b/freetype/src/cid/cidload.h index 8c172ffee..8bada7f8c 100644 --- a/freetype/src/cid/cidload.h +++ b/freetype/src/cid/cidload.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftstream.h> #include "cidparse.h" diff --git a/freetype/src/cid/cidobjs.c b/freetype/src/cid/cidobjs.c index 9647d8701..dc18431f5 100644 --- a/freetype/src/cid/cidobjs.c +++ b/freetype/src/cid/cidobjs.c @@ -17,15 +17,15 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include "cidgload.h" #include "cidload.h" #include FT_SERVICE_POSTSCRIPT_CMAPS_H -#include FT_INTERNAL_POSTSCRIPT_AUX_H -#include FT_INTERNAL_POSTSCRIPT_HINTS_H +#include <freetype/internal/psaux.h> +#include <freetype/internal/pshints.h> #include "ciderrs.h" diff --git a/freetype/src/cid/cidobjs.h b/freetype/src/cid/cidobjs.h index aee346d1c..b297d6fb4 100644 --- a/freetype/src/cid/cidobjs.h +++ b/freetype/src/cid/cidobjs.h @@ -21,9 +21,9 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_CONFIG_CONFIG_H -#include FT_INTERNAL_TYPE1_TYPES_H +#include <freetype/internal/t1types.h> FT_BEGIN_HEADER diff --git a/freetype/src/cid/cidparse.c b/freetype/src/cid/cidparse.c index bb87afc58..6fd73b74c 100644 --- a/freetype/src/cid/cidparse.c +++ b/freetype/src/cid/cidparse.c @@ -17,10 +17,10 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftcalc.h> +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftstream.h> #include "cidparse.h" diff --git a/freetype/src/cid/cidparse.h b/freetype/src/cid/cidparse.h index ca37deab9..f25e652bc 100644 --- a/freetype/src/cid/cidparse.h +++ b/freetype/src/cid/cidparse.h @@ -21,9 +21,9 @@ #include <ft2build.h> -#include FT_INTERNAL_TYPE1_TYPES_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/t1types.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/psaux.h> FT_BEGIN_HEADER diff --git a/freetype/src/cid/cidriver.c b/freetype/src/cid/cidriver.c index b41d5d6f0..044a3aaf2 100644 --- a/freetype/src/cid/cidriver.c +++ b/freetype/src/cid/cidriver.c @@ -19,14 +19,14 @@ #include <ft2build.h> #include "cidriver.h" #include "cidgload.h" -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include "ciderrs.h" #include FT_SERVICE_POSTSCRIPT_NAME_H #include FT_SERVICE_XFREE86_NAME_H -#include FT_SERVICE_POSTSCRIPT_INFO_H +#include <freetype/internal/services/svpsinfo.h> #include FT_SERVICE_CID_H diff --git a/freetype/src/cid/cidriver.h b/freetype/src/cid/cidriver.h index d5a80f6f9..eff3b6a42 100644 --- a/freetype/src/cid/cidriver.h +++ b/freetype/src/cid/cidriver.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_INTERNAL_DRIVER_H +#include <freetype/internal/ftdriver.h> FT_BEGIN_HEADER diff --git a/freetype/src/gxvalid/gxvalid.h b/freetype/src/gxvalid/gxvalid.h index 27be9ecca..fb7d10e9d 100644 --- a/freetype/src/gxvalid/gxvalid.h +++ b/freetype/src/gxvalid/gxvalid.h @@ -28,12 +28,12 @@ #define __GXVALID_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> -#include "gxverror.h" /* must come before FT_INTERNAL_VALIDATE_H */ +#include "gxverror.h" /* must come before <freetype/internal/ftvalid.h> */ -#include FT_INTERNAL_VALIDATE_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftvalid.h> +#include <freetype/internal/ftstream.h> FT_BEGIN_HEADER diff --git a/freetype/src/gxvalid/gxvcommn.h b/freetype/src/gxvalid/gxvcommn.h index 198d8e4fc..48da3a5b3 100644 --- a/freetype/src/gxvalid/gxvcommn.h +++ b/freetype/src/gxvalid/gxvcommn.h @@ -44,7 +44,7 @@ #include <ft2build.h> #include "gxvalid.h" -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> #include FT_SFNT_NAMES_H diff --git a/freetype/src/gxvalid/gxvmod.c b/freetype/src/gxvalid/gxvmod.c index b2b16b1ff..77dd87c59 100644 --- a/freetype/src/gxvalid/gxvmod.c +++ b/freetype/src/gxvalid/gxvmod.c @@ -29,7 +29,7 @@ #include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TAGS_H #include FT_GX_VALIDATE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_SERVICE_GX_VALIDATE_H #include "gxvmod.h" diff --git a/freetype/src/gzip/ftgzip.c b/freetype/src/gzip/ftgzip.c index 0d6bd3495..93b0a3702 100644 --- a/freetype/src/gzip/ftgzip.c +++ b/freetype/src/gzip/ftgzip.c @@ -21,9 +21,9 @@ #include <ft2build.h> -#include FT_INTERNAL_MEMORY_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftmemory.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftdebug.h> #include FT_GZIP_H #include FT_CONFIG_STANDARD_LIBRARY_H diff --git a/freetype/src/lzw/ftlzw.c b/freetype/src/lzw/ftlzw.c index a00bd5012..72be84ebf 100644 --- a/freetype/src/lzw/ftlzw.c +++ b/freetype/src/lzw/ftlzw.c @@ -23,9 +23,9 @@ /***************************************************************************/ #include <ft2build.h> -#include FT_INTERNAL_MEMORY_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftmemory.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftdebug.h> #include FT_LZW_H #include FT_CONFIG_STANDARD_LIBRARY_H diff --git a/freetype/src/lzw/ftzopen.c b/freetype/src/lzw/ftzopen.c index fc7831510..4e36e8e16 100644 --- a/freetype/src/lzw/ftzopen.c +++ b/freetype/src/lzw/ftzopen.c @@ -19,9 +19,9 @@ /***************************************************************************/ #include "ftzopen.h" -#include FT_INTERNAL_MEMORY_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftmemory.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftdebug.h> static int diff --git a/freetype/src/lzw/ftzopen.h b/freetype/src/lzw/ftzopen.h index dd602402a..edc03b02e 100644 --- a/freetype/src/lzw/ftzopen.h +++ b/freetype/src/lzw/ftzopen.h @@ -22,7 +22,7 @@ #define __FT_ZOPEN_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> /* diff --git a/freetype/src/otvalid/otvalid.h b/freetype/src/otvalid/otvalid.h index eb99b9cc4..c560034bf 100644 --- a/freetype/src/otvalid/otvalid.h +++ b/freetype/src/otvalid/otvalid.h @@ -21,12 +21,12 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> -#include "otverror.h" /* must come before FT_INTERNAL_VALIDATE_H */ +#include "otverror.h" /* must come before <freetype/internal/ftvalid.h> */ -#include FT_INTERNAL_VALIDATE_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftvalid.h> +#include <freetype/internal/ftstream.h> FT_BEGIN_HEADER diff --git a/freetype/src/otvalid/otvcommn.h b/freetype/src/otvalid/otvcommn.h index 71726d5b2..dbee1ab23 100644 --- a/freetype/src/otvalid/otvcommn.h +++ b/freetype/src/otvalid/otvcommn.h @@ -22,7 +22,7 @@ #include <ft2build.h> #include "otvalid.h" -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> FT_BEGIN_HEADER diff --git a/freetype/src/otvalid/otvmod.c b/freetype/src/otvalid/otvmod.c index 63c25f690..e18e71a96 100644 --- a/freetype/src/otvalid/otvmod.c +++ b/freetype/src/otvalid/otvmod.c @@ -20,7 +20,7 @@ #include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TAGS_H #include FT_OPENTYPE_VALIDATE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_SERVICE_OPENTYPE_VALIDATE_H #include "otvmod.h" diff --git a/freetype/src/pcf/pcf.h b/freetype/src/pcf/pcf.h index 9d2d8e0e4..0a08d783b 100644 --- a/freetype/src/pcf/pcf.h +++ b/freetype/src/pcf/pcf.h @@ -30,8 +30,8 @@ THE SOFTWARE. #include <ft2build.h> -#include FT_INTERNAL_DRIVER_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdriver.h> +#include <freetype/internal/ftstream.h> FT_BEGIN_HEADER diff --git a/freetype/src/pcf/pcfdrivr.c b/freetype/src/pcf/pcfdrivr.c index e2d4d3d87..9ef4bdd54 100644 --- a/freetype/src/pcf/pcfdrivr.c +++ b/freetype/src/pcf/pcfdrivr.c @@ -27,9 +27,9 @@ THE SOFTWARE. #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftobjs.h> #include FT_GZIP_H #include FT_LZW_H #include FT_ERRORS_H diff --git a/freetype/src/pcf/pcfdrivr.h b/freetype/src/pcf/pcfdrivr.h index 7ddf697e1..6da91e1a4 100644 --- a/freetype/src/pcf/pcfdrivr.h +++ b/freetype/src/pcf/pcfdrivr.h @@ -29,7 +29,7 @@ THE SOFTWARE. #define __PCFDRIVR_H__ #include <ft2build.h> -#include FT_INTERNAL_DRIVER_H +#include <freetype/internal/ftdriver.h> FT_BEGIN_HEADER diff --git a/freetype/src/pcf/pcfread.c b/freetype/src/pcf/pcfread.c index 8e04c57b3..f477cd407 100644 --- a/freetype/src/pcf/pcfread.c +++ b/freetype/src/pcf/pcfread.c @@ -27,9 +27,9 @@ THE SOFTWARE. #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftobjs.h> #include "pcf.h" #include "pcfdrivr.h" diff --git a/freetype/src/pfr/pfrcmap.c b/freetype/src/pfr/pfrcmap.c index d4656d1b5..f259809e4 100644 --- a/freetype/src/pfr/pfrcmap.c +++ b/freetype/src/pfr/pfrcmap.c @@ -18,7 +18,7 @@ #include "pfrcmap.h" #include "pfrobjs.h" -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> #include "pfrerror.h" diff --git a/freetype/src/pfr/pfrcmap.h b/freetype/src/pfr/pfrcmap.h index a62695305..ee357d9f7 100644 --- a/freetype/src/pfr/pfrcmap.h +++ b/freetype/src/pfr/pfrcmap.h @@ -20,7 +20,7 @@ #define __PFRCMAP_H__ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "pfrtypes.h" diff --git a/freetype/src/pfr/pfrdrivr.c b/freetype/src/pfr/pfrdrivr.c index 15cca9854..82aa519f0 100644 --- a/freetype/src/pfr/pfrdrivr.c +++ b/freetype/src/pfr/pfrdrivr.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_SERVICE_PFR_H #include FT_SERVICE_XFREE86_NAME_H #include "pfrdrivr.h" diff --git a/freetype/src/pfr/pfrdrivr.h b/freetype/src/pfr/pfrdrivr.h index 36f1205b7..6182445f3 100644 --- a/freetype/src/pfr/pfrdrivr.h +++ b/freetype/src/pfr/pfrdrivr.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_INTERNAL_DRIVER_H +#include <freetype/internal/ftdriver.h> FT_BEGIN_HEADER diff --git a/freetype/src/pfr/pfrgload.c b/freetype/src/pfr/pfrgload.c index 6fe6e4225..31f08e0ae 100644 --- a/freetype/src/pfr/pfrgload.c +++ b/freetype/src/pfr/pfrgload.c @@ -19,7 +19,7 @@ #include "pfrgload.h" #include "pfrsbit.h" #include "pfrload.h" /* for macro definitions */ -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> #include "pfrerror.h" diff --git a/freetype/src/pfr/pfrload.c b/freetype/src/pfr/pfrload.c index 1ee2c1f8c..e9a6aaad2 100644 --- a/freetype/src/pfr/pfrload.c +++ b/freetype/src/pfr/pfrload.c @@ -17,8 +17,8 @@ #include "pfrload.h" -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include "pfrerror.h" diff --git a/freetype/src/pfr/pfrload.h b/freetype/src/pfr/pfrload.h index ed010715d..ee1ae5b32 100644 --- a/freetype/src/pfr/pfrload.h +++ b/freetype/src/pfr/pfrload.h @@ -20,7 +20,7 @@ #define __PFRLOAD_H__ #include "pfrobjs.h" -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftstream.h> FT_BEGIN_HEADER diff --git a/freetype/src/pfr/pfrobjs.c b/freetype/src/pfr/pfrobjs.c index 56d617d88..e225cffb0 100644 --- a/freetype/src/pfr/pfrobjs.c +++ b/freetype/src/pfr/pfrobjs.c @@ -22,7 +22,7 @@ #include "pfrcmap.h" #include "pfrsbit.h" #include FT_OUTLINE_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> #include "pfrerror.h" diff --git a/freetype/src/pfr/pfrsbit.c b/freetype/src/pfr/pfrsbit.c index 45ff6663b..139522198 100644 --- a/freetype/src/pfr/pfrsbit.c +++ b/freetype/src/pfr/pfrsbit.c @@ -18,8 +18,8 @@ #include "pfrsbit.h" #include "pfrload.h" -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include "pfrerror.h" diff --git a/freetype/src/pfr/pfrtypes.h b/freetype/src/pfr/pfrtypes.h index c0ae04253..2de7579fe 100644 --- a/freetype/src/pfr/pfrtypes.h +++ b/freetype/src/pfr/pfrtypes.h @@ -20,7 +20,7 @@ #define __PFRTYPES_H__ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> FT_BEGIN_HEADER diff --git a/freetype/src/psaux/afmparse.c b/freetype/src/psaux/afmparse.c index 63a786e88..6ca52b52e 100644 --- a/freetype/src/psaux/afmparse.c +++ b/freetype/src/psaux/afmparse.c @@ -17,8 +17,8 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_POSTSCRIPT_AUX_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/psaux.h> +#include <freetype/internal/ftdebug.h> #include "afmparse.h" #include "psconv.h" diff --git a/freetype/src/psaux/afmparse.h b/freetype/src/psaux/afmparse.h index c2fce75c8..1e0125aa7 100644 --- a/freetype/src/psaux/afmparse.h +++ b/freetype/src/psaux/afmparse.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/psaux.h> FT_BEGIN_HEADER diff --git a/freetype/src/psaux/psconv.c b/freetype/src/psaux/psconv.c index d824b5913..c4ac6e93b 100644 --- a/freetype/src/psaux/psconv.c +++ b/freetype/src/psaux/psconv.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_INTERNAL_POSTSCRIPT_AUX_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/psaux.h> +#include <freetype/internal/ftdebug.h> #include "psconv.h" #include "psobjs.h" diff --git a/freetype/src/psaux/psconv.h b/freetype/src/psaux/psconv.h index e51124185..eb3b7f867 100644 --- a/freetype/src/psaux/psconv.h +++ b/freetype/src/psaux/psconv.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/psaux.h> FT_BEGIN_HEADER diff --git a/freetype/src/psaux/psobjs.c b/freetype/src/psaux/psobjs.c index 52e30a413..b47c3433d 100644 --- a/freetype/src/psaux/psobjs.c +++ b/freetype/src/psaux/psobjs.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_INTERNAL_POSTSCRIPT_AUX_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/psaux.h> +#include <freetype/internal/ftdebug.h> #include "psobjs.h" #include "psconv.h" diff --git a/freetype/src/psaux/psobjs.h b/freetype/src/psaux/psobjs.h index c2cbf2c79..2478d7f8e 100644 --- a/freetype/src/psaux/psobjs.h +++ b/freetype/src/psaux/psobjs.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/psaux.h> FT_BEGIN_HEADER diff --git a/freetype/src/psaux/t1cmap.c b/freetype/src/psaux/t1cmap.c index 67a23db56..1ecd4616f 100644 --- a/freetype/src/psaux/t1cmap.c +++ b/freetype/src/psaux/t1cmap.c @@ -18,7 +18,7 @@ #include "t1cmap.h" -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> #include "psauxerr.h" diff --git a/freetype/src/psaux/t1cmap.h b/freetype/src/psaux/t1cmap.h index 7ae65d2fa..9f495f8b5 100644 --- a/freetype/src/psaux/t1cmap.h +++ b/freetype/src/psaux/t1cmap.h @@ -20,8 +20,8 @@ #define __T1CMAP_H__ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_TYPE1_TYPES_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/t1types.h> FT_BEGIN_HEADER diff --git a/freetype/src/psaux/t1decode.c b/freetype/src/psaux/t1decode.c index bda2324d7..cc52f0267 100644 --- a/freetype/src/psaux/t1decode.c +++ b/freetype/src/psaux/t1decode.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_POSTSCRIPT_HINTS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/pshints.h> #include FT_OUTLINE_H #include "t1decode.h" diff --git a/freetype/src/psaux/t1decode.h b/freetype/src/psaux/t1decode.h index 00728db50..64241136f 100644 --- a/freetype/src/psaux/t1decode.h +++ b/freetype/src/psaux/t1decode.h @@ -21,8 +21,8 @@ #include <ft2build.h> -#include FT_INTERNAL_POSTSCRIPT_AUX_H -#include FT_INTERNAL_TYPE1_TYPES_H +#include <freetype/internal/psaux.h> +#include <freetype/internal/t1types.h> FT_BEGIN_HEADER diff --git a/freetype/src/pshinter/pshalgo.c b/freetype/src/pshinter/pshalgo.c index f9ab3dae5..bcb315e04 100644 --- a/freetype/src/pshinter/pshalgo.c +++ b/freetype/src/pshinter/pshalgo.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_CALC_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftcalc.h> #include "pshalgo.h" #include "pshnterr.h" diff --git a/freetype/src/pshinter/pshglob.c b/freetype/src/pshinter/pshglob.c index 8a69aa1e8..3ea469f9e 100644 --- a/freetype/src/pshinter/pshglob.c +++ b/freetype/src/pshinter/pshglob.c @@ -19,7 +19,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "pshglob.h" #ifdef DEBUG_HINTER diff --git a/freetype/src/pshinter/pshglob.h b/freetype/src/pshinter/pshglob.h index c51162615..34592049e 100644 --- a/freetype/src/pshinter/pshglob.h +++ b/freetype/src/pshinter/pshglob.h @@ -20,8 +20,8 @@ #define __PSHGLOB_H__ -#include FT_FREETYPE_H -#include FT_INTERNAL_POSTSCRIPT_HINTS_H +#include <freetype/freetype.h> +#include <freetype/internal/pshints.h> FT_BEGIN_HEADER diff --git a/freetype/src/pshinter/pshmod.c b/freetype/src/pshinter/pshmod.c index 4eb3d9127..dfd2fa3f1 100644 --- a/freetype/src/pshinter/pshmod.c +++ b/freetype/src/pshinter/pshmod.c @@ -17,7 +17,7 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "pshrec.h" #include "pshalgo.h" diff --git a/freetype/src/pshinter/pshrec.c b/freetype/src/pshinter/pshrec.c index 2a885ef27..1370a7eab 100644 --- a/freetype/src/pshinter/pshrec.c +++ b/freetype/src/pshinter/pshrec.c @@ -18,8 +18,8 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> #include "pshrec.h" #include "pshalgo.h" diff --git a/freetype/src/pshinter/pshrec.h b/freetype/src/pshinter/pshrec.h index dcb3197f9..ed464eba0 100644 --- a/freetype/src/pshinter/pshrec.h +++ b/freetype/src/pshinter/pshrec.h @@ -33,7 +33,7 @@ #include <ft2build.h> -#include FT_INTERNAL_POSTSCRIPT_HINTS_H +#include <freetype/internal/pshints.h> #include "pshglob.h" diff --git a/freetype/src/psnames/psmodule.c b/freetype/src/psnames/psmodule.c index 41942a9b4..cded75bc0 100644 --- a/freetype/src/psnames/psmodule.c +++ b/freetype/src/psnames/psmodule.c @@ -17,7 +17,7 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_SERVICE_POSTSCRIPT_CMAPS_H #include "psmodule.h" diff --git a/freetype/src/raster/ftraster.c b/freetype/src/raster/ftraster.c index eb9c4a45f..32447dd2d 100644 --- a/freetype/src/raster/ftraster.c +++ b/freetype/src/raster/ftraster.c @@ -56,7 +56,7 @@ #include <ft2build.h> #include "ftraster.h" -#include FT_INTERNAL_CALC_H /* for FT_MulDiv only */ +#include <freetype/internal/ftcalc.h> /* for FT_MulDiv only */ #endif /* !_STANDALONE_ */ @@ -202,8 +202,8 @@ #else /* _STANDALONE_ */ -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H /* for FT_TRACE() and FT_ERROR() */ +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> /* for FT_TRACE() and FT_ERROR() */ #include "rasterrs.h" diff --git a/freetype/src/raster/ftrend1.c b/freetype/src/raster/ftrend1.c index 3cc8d0741..5645a2b4d 100644 --- a/freetype/src/raster/ftrend1.c +++ b/freetype/src/raster/ftrend1.c @@ -17,7 +17,7 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_OUTLINE_H #include "ftrend1.h" #include "ftraster.h" diff --git a/freetype/src/raster/ftrend1.h b/freetype/src/raster/ftrend1.h index 76e9a5f58..a65e90c6d 100644 --- a/freetype/src/raster/ftrend1.h +++ b/freetype/src/raster/ftrend1.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_RENDER_H +#include <freetype/ftrender.h> FT_BEGIN_HEADER diff --git a/freetype/src/sfnt/sfdriver.c b/freetype/src/sfnt/sfdriver.c index 142ef767d..55fd6c3be 100644 --- a/freetype/src/sfnt/sfdriver.c +++ b/freetype/src/sfnt/sfdriver.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_INTERNAL_SFNT_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/sfnt.h> +#include <freetype/internal/ftobjs.h> #include "sfdriver.h" #include "ttload.h" diff --git a/freetype/src/sfnt/sfobjs.c b/freetype/src/sfnt/sfobjs.c index c826b92aa..03bebb220 100644 --- a/freetype/src/sfnt/sfobjs.c +++ b/freetype/src/sfnt/sfobjs.c @@ -21,8 +21,8 @@ #include "ttload.h" #include "ttcmap.h" #include "ttkern.h" -#include FT_INTERNAL_SFNT_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/sfnt.h> +#include <freetype/internal/ftdebug.h> #include FT_TRUETYPE_IDS_H #include FT_TRUETYPE_TAGS_H #include FT_SERVICE_POSTSCRIPT_CMAPS_H diff --git a/freetype/src/sfnt/sfobjs.h b/freetype/src/sfnt/sfobjs.h index 6241c93b3..97bd8efdb 100644 --- a/freetype/src/sfnt/sfobjs.h +++ b/freetype/src/sfnt/sfobjs.h @@ -21,8 +21,8 @@ #include <ft2build.h> -#include FT_INTERNAL_SFNT_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/sfnt.h> +#include <freetype/internal/ftobjs.h> FT_BEGIN_HEADER diff --git a/freetype/src/sfnt/ttbdf.c b/freetype/src/sfnt/ttbdf.c index 6c95387ad..08a80c7c0 100644 --- a/freetype/src/sfnt/ttbdf.c +++ b/freetype/src/sfnt/ttbdf.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_TRUETYPE_TAGS_H #include "ttbdf.h" diff --git a/freetype/src/sfnt/ttcmap.c b/freetype/src/sfnt/ttcmap.c index 683039153..972659142 100644 --- a/freetype/src/sfnt/ttcmap.c +++ b/freetype/src/sfnt/ttcmap.c @@ -17,12 +17,12 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> -#include "sferrors.h" /* must come before FT_INTERNAL_VALIDATE_H */ +#include "sferrors.h" /* must come before <freetype/internal/ftvalid.h> */ -#include FT_INTERNAL_VALIDATE_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftvalid.h> +#include <freetype/internal/ftstream.h> #include "ttload.h" #include "ttcmap.h" diff --git a/freetype/src/sfnt/ttcmap.h b/freetype/src/sfnt/ttcmap.h index a10a3e250..749eef1aa 100644 --- a/freetype/src/sfnt/ttcmap.h +++ b/freetype/src/sfnt/ttcmap.h @@ -21,8 +21,8 @@ #include <ft2build.h> -#include FT_INTERNAL_TRUETYPE_TYPES_H -#include FT_INTERNAL_VALIDATE_H +#include <freetype/internal/tttypes.h> +#include <freetype/internal/ftvalid.h> #include FT_SERVICE_TT_CMAP_H FT_BEGIN_HEADER diff --git a/freetype/src/sfnt/ttkern.c b/freetype/src/sfnt/ttkern.c index 67d5115e8..26dda729d 100644 --- a/freetype/src/sfnt/ttkern.c +++ b/freetype/src/sfnt/ttkern.c @@ -18,8 +18,8 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_TRUETYPE_TAGS_H #include "ttkern.h" #include "ttload.h" diff --git a/freetype/src/sfnt/ttkern.h b/freetype/src/sfnt/ttkern.h index df1da9b27..39b51fc35 100644 --- a/freetype/src/sfnt/ttkern.h +++ b/freetype/src/sfnt/ttkern.h @@ -22,8 +22,8 @@ #include <ft2build.h> -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_TRUETYPE_TYPES_H +#include <freetype/internal/ftstream.h> +#include <freetype/internal/tttypes.h> FT_BEGIN_HEADER diff --git a/freetype/src/sfnt/ttload.c b/freetype/src/sfnt/ttload.c index c45a1ed55..f8d6795a0 100644 --- a/freetype/src/sfnt/ttload.c +++ b/freetype/src/sfnt/ttload.c @@ -18,8 +18,8 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_TRUETYPE_TAGS_H #include "ttload.h" diff --git a/freetype/src/sfnt/ttload.h b/freetype/src/sfnt/ttload.h index 49a1aee16..186e9ec90 100644 --- a/freetype/src/sfnt/ttload.h +++ b/freetype/src/sfnt/ttload.h @@ -22,8 +22,8 @@ #include <ft2build.h> -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_TRUETYPE_TYPES_H +#include <freetype/internal/ftstream.h> +#include <freetype/internal/tttypes.h> FT_BEGIN_HEADER diff --git a/freetype/src/sfnt/ttmtx.c b/freetype/src/sfnt/ttmtx.c index 2a7d22c07..9d08e7182 100644 --- a/freetype/src/sfnt/ttmtx.c +++ b/freetype/src/sfnt/ttmtx.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_TRUETYPE_TAGS_H #include "ttmtx.h" diff --git a/freetype/src/sfnt/ttmtx.h b/freetype/src/sfnt/ttmtx.h index 8b91a113d..b045458ee 100644 --- a/freetype/src/sfnt/ttmtx.h +++ b/freetype/src/sfnt/ttmtx.h @@ -21,8 +21,8 @@ #include <ft2build.h> -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_TRUETYPE_TYPES_H +#include <freetype/internal/ftstream.h> +#include <freetype/internal/tttypes.h> FT_BEGIN_HEADER diff --git a/freetype/src/sfnt/ttpost.c b/freetype/src/sfnt/ttpost.c index ce628e210..7a380cf18 100644 --- a/freetype/src/sfnt/ttpost.c +++ b/freetype/src/sfnt/ttpost.c @@ -26,7 +26,7 @@ #include <ft2build.h> -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftstream.h> #include FT_TRUETYPE_TAGS_H #include "ttpost.h" #include "ttload.h" diff --git a/freetype/src/sfnt/ttpost.h b/freetype/src/sfnt/ttpost.h index 6f06d75a7..965928cce 100644 --- a/freetype/src/sfnt/ttpost.h +++ b/freetype/src/sfnt/ttpost.h @@ -23,7 +23,7 @@ #include <ft2build.h> #include FT_CONFIG_CONFIG_H -#include FT_INTERNAL_TRUETYPE_TYPES_H +#include <freetype/internal/tttypes.h> FT_BEGIN_HEADER diff --git a/freetype/src/sfnt/ttsbit.c b/freetype/src/sfnt/ttsbit.c index eadaade71..35b200e91 100644 --- a/freetype/src/sfnt/ttsbit.c +++ b/freetype/src/sfnt/ttsbit.c @@ -16,8 +16,8 @@ /***************************************************************************/ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_TRUETYPE_TAGS_H /* @@ -31,8 +31,8 @@ #else /* FT_CONFIG_OPTION_OLD_INTERNALS */ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_TRUETYPE_TAGS_H #include "ttsbit.h" diff --git a/freetype/src/sfnt/ttsbit0.c b/freetype/src/sfnt/ttsbit0.c index 3ebcbbd74..94b30f0f6 100644 --- a/freetype/src/sfnt/ttsbit0.c +++ b/freetype/src/sfnt/ttsbit0.c @@ -21,8 +21,8 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_TRUETYPE_TAGS_H #include "ttsbit.h" diff --git a/freetype/src/smooth/ftgrays.c b/freetype/src/smooth/ftgrays.c index 10fa2ae72..247561737 100644 --- a/freetype/src/smooth/ftgrays.c +++ b/freetype/src/smooth/ftgrays.c @@ -175,8 +175,8 @@ #include <ft2build.h> #include "ftgrays.h" -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> #include FT_OUTLINE_H #include "ftsmerrs.h" diff --git a/freetype/src/smooth/ftsmooth.c b/freetype/src/smooth/ftsmooth.c index a6db5048d..ef51b6382 100644 --- a/freetype/src/smooth/ftsmooth.c +++ b/freetype/src/smooth/ftsmooth.c @@ -17,7 +17,7 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_OUTLINE_H #include "ftsmooth.h" #include "ftgrays.h" diff --git a/freetype/src/smooth/ftsmooth.h b/freetype/src/smooth/ftsmooth.h index 62cced448..c9f140641 100644 --- a/freetype/src/smooth/ftsmooth.h +++ b/freetype/src/smooth/ftsmooth.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_RENDER_H +#include <freetype/ftrender.h> FT_BEGIN_HEADER diff --git a/freetype/src/tools/test_afm.c b/freetype/src/tools/test_afm.c index d53cb3325..cad968f57 100644 --- a/freetype/src/tools/test_afm.c +++ b/freetype/src/tools/test_afm.c @@ -4,8 +4,8 @@ */ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/ftstream.h> +#include <freetype/internal/psaux.h> void dump_fontinfo( AFM_FontInfo fi ) { diff --git a/freetype/src/truetype/ttdriver.c b/freetype/src/truetype/ttdriver.c index 42feb05ed..76efadb0d 100644 --- a/freetype/src/truetype/ttdriver.c +++ b/freetype/src/truetype/ttdriver.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_SFNT_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/sfnt.h> #include FT_TRUETYPE_IDS_H #include FT_SERVICE_XFREE86_NAME_H diff --git a/freetype/src/truetype/ttdriver.h b/freetype/src/truetype/ttdriver.h index f6f26e4b5..980626f36 100644 --- a/freetype/src/truetype/ttdriver.h +++ b/freetype/src/truetype/ttdriver.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_INTERNAL_DRIVER_H +#include <freetype/internal/ftdriver.h> FT_BEGIN_HEADER diff --git a/freetype/src/truetype/ttgload.c b/freetype/src/truetype/ttgload.c index 06e9ccd1d..728fbc932 100644 --- a/freetype/src/truetype/ttgload.c +++ b/freetype/src/truetype/ttgload.c @@ -17,10 +17,10 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_SFNT_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftcalc.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/sfnt.h> #include FT_TRUETYPE_TAGS_H #include FT_OUTLINE_H diff --git a/freetype/src/truetype/ttgxvar.c b/freetype/src/truetype/ttgxvar.c index 515e734b8..2126e000c 100644 --- a/freetype/src/truetype/ttgxvar.c +++ b/freetype/src/truetype/ttgxvar.c @@ -43,10 +43,10 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> #include FT_CONFIG_CONFIG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_SFNT_H +#include <freetype/internal/ftstream.h> +#include <freetype/internal/sfnt.h> #include FT_TRUETYPE_IDS_H #include FT_TRUETYPE_TAGS_H #include FT_MULTIPLE_MASTERS_H diff --git a/freetype/src/truetype/ttinterp.c b/freetype/src/truetype/ttinterp.c index 2279a62cb..d27e31836 100644 --- a/freetype/src/truetype/ttinterp.c +++ b/freetype/src/truetype/ttinterp.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_CALC_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftcalc.h> #include FT_TRIGONOMETRY_H #include FT_SYSTEM_H diff --git a/freetype/src/truetype/ttobjs.c b/freetype/src/truetype/ttobjs.c index 2649a670d..035dc4550 100644 --- a/freetype/src/truetype/ttobjs.c +++ b/freetype/src/truetype/ttobjs.c @@ -17,12 +17,12 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftcalc.h> +#include <freetype/internal/ftstream.h> #include FT_TRUETYPE_IDS_H #include FT_TRUETYPE_TAGS_H -#include FT_INTERNAL_SFNT_H +#include <freetype/internal/sfnt.h> #include "ttgload.h" #include "ttpload.h" diff --git a/freetype/src/truetype/ttobjs.h b/freetype/src/truetype/ttobjs.h index d4b82285e..62ae024a2 100644 --- a/freetype/src/truetype/ttobjs.h +++ b/freetype/src/truetype/ttobjs.h @@ -21,8 +21,8 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_TRUETYPE_TYPES_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/tttypes.h> FT_BEGIN_HEADER diff --git a/freetype/src/truetype/ttpload.c b/freetype/src/truetype/ttpload.c index dc538fb08..296f30d0d 100644 --- a/freetype/src/truetype/ttpload.c +++ b/freetype/src/truetype/ttpload.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftstream.h> #include FT_TRUETYPE_TAGS_H #include "ttpload.h" diff --git a/freetype/src/truetype/ttpload.h b/freetype/src/truetype/ttpload.h index f61ac079c..9be60eec3 100644 --- a/freetype/src/truetype/ttpload.h +++ b/freetype/src/truetype/ttpload.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_INTERNAL_TRUETYPE_TYPES_H +#include <freetype/internal/tttypes.h> FT_BEGIN_HEADER diff --git a/freetype/src/type1/t1afm.c b/freetype/src/type1/t1afm.c index 5aea58820..816f2f12f 100644 --- a/freetype/src/type1/t1afm.c +++ b/freetype/src/type1/t1afm.c @@ -19,8 +19,8 @@ #include <ft2build.h> #include "t1afm.h" #include "t1errors.h" -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/ftstream.h> +#include <freetype/internal/psaux.h> /*************************************************************************/ diff --git a/freetype/src/type1/t1afm.h b/freetype/src/type1/t1afm.h index 8eb1764de..befb3b10e 100644 --- a/freetype/src/type1/t1afm.h +++ b/freetype/src/type1/t1afm.h @@ -21,7 +21,7 @@ #include <ft2build.h> #include "t1objs.h" -#include FT_INTERNAL_TYPE1_TYPES_H +#include <freetype/internal/t1types.h> FT_BEGIN_HEADER diff --git a/freetype/src/type1/t1driver.c b/freetype/src/type1/t1driver.c index 8c398eee2..c81f0317f 100644 --- a/freetype/src/type1/t1driver.c +++ b/freetype/src/type1/t1driver.c @@ -27,15 +27,15 @@ #include "t1afm.h" #endif -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.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 <freetype/internal/services/svpsinfo.h> #include FT_SERVICE_KERNING_H diff --git a/freetype/src/type1/t1driver.h b/freetype/src/type1/t1driver.h index ad429440d..8c8217cfd 100644 --- a/freetype/src/type1/t1driver.h +++ b/freetype/src/type1/t1driver.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_INTERNAL_DRIVER_H +#include <freetype/internal/ftdriver.h> FT_BEGIN_HEADER diff --git a/freetype/src/type1/t1gload.c b/freetype/src/type1/t1gload.c index c3ac13f59..6237c96b5 100644 --- a/freetype/src/type1/t1gload.c +++ b/freetype/src/type1/t1gload.c @@ -18,10 +18,10 @@ #include <ft2build.h> #include "t1gload.h" -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_OUTLINE_H -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/psaux.h> #include "t1errors.h" diff --git a/freetype/src/type1/t1load.c b/freetype/src/type1/t1load.c index 06e72cca6..9ea6a59ce 100644 --- a/freetype/src/type1/t1load.c +++ b/freetype/src/type1/t1load.c @@ -61,10 +61,10 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> #include FT_CONFIG_CONFIG_H #include FT_MULTIPLE_MASTERS_H -#include FT_INTERNAL_TYPE1_TYPES_H +#include <freetype/internal/t1types.h> #include "t1load.h" #include "t1errors.h" diff --git a/freetype/src/type1/t1load.h b/freetype/src/type1/t1load.h index 546fc3353..ed0cf3894 100644 --- a/freetype/src/type1/t1load.h +++ b/freetype/src/type1/t1load.h @@ -21,8 +21,8 @@ #include <ft2build.h> -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/ftstream.h> +#include <freetype/internal/psaux.h> #include FT_MULTIPLE_MASTERS_H #include "t1parse.h" diff --git a/freetype/src/type1/t1objs.c b/freetype/src/type1/t1objs.c index 2f90dd62f..8f9b79605 100644 --- a/freetype/src/type1/t1objs.c +++ b/freetype/src/type1/t1objs.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_TRUETYPE_IDS_H #include "t1gload.h" @@ -31,7 +31,7 @@ #endif #include FT_SERVICE_POSTSCRIPT_CMAPS_H -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/psaux.h> /*************************************************************************/ diff --git a/freetype/src/type1/t1objs.h b/freetype/src/type1/t1objs.h index e5e90293d..9c9bb526c 100644 --- a/freetype/src/type1/t1objs.h +++ b/freetype/src/type1/t1objs.h @@ -21,9 +21,9 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_CONFIG_CONFIG_H -#include FT_INTERNAL_TYPE1_TYPES_H +#include <freetype/internal/t1types.h> FT_BEGIN_HEADER diff --git a/freetype/src/type1/t1parse.c b/freetype/src/type1/t1parse.c index 36f5c82c8..b89024bce 100644 --- a/freetype/src/type1/t1parse.c +++ b/freetype/src/type1/t1parse.c @@ -34,10 +34,10 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftcalc.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/psaux.h> #include "t1parse.h" diff --git a/freetype/src/type1/t1parse.h b/freetype/src/type1/t1parse.h index fb1c8a883..151f3953f 100644 --- a/freetype/src/type1/t1parse.h +++ b/freetype/src/type1/t1parse.h @@ -21,8 +21,8 @@ #include <ft2build.h> -#include FT_INTERNAL_TYPE1_TYPES_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/t1types.h> +#include <freetype/internal/ftstream.h> FT_BEGIN_HEADER diff --git a/freetype/src/type42/t42drivr.c b/freetype/src/type42/t42drivr.c index 820c67961..b5c6ad9f4 100644 --- a/freetype/src/type42/t42drivr.c +++ b/freetype/src/type42/t42drivr.c @@ -38,12 +38,12 @@ #include "t42drivr.h" #include "t42objs.h" #include "t42error.h" -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> #include FT_SERVICE_XFREE86_NAME_H #include FT_SERVICE_GLYPH_DICT_H #include FT_SERVICE_POSTSCRIPT_NAME_H -#include FT_SERVICE_POSTSCRIPT_INFO_H +#include <freetype/internal/services/svpsinfo.h> #undef FT_COMPONENT #define FT_COMPONENT trace_t42 diff --git a/freetype/src/type42/t42drivr.h b/freetype/src/type42/t42drivr.h index 98b7410b6..2aa6c59ab 100644 --- a/freetype/src/type42/t42drivr.h +++ b/freetype/src/type42/t42drivr.h @@ -20,7 +20,7 @@ #include <ft2build.h> -#include FT_INTERNAL_DRIVER_H +#include <freetype/internal/ftdriver.h> FT_BEGIN_HEADER diff --git a/freetype/src/type42/t42objs.c b/freetype/src/type42/t42objs.c index 16e9809ce..c137b818d 100644 --- a/freetype/src/type42/t42objs.c +++ b/freetype/src/type42/t42objs.c @@ -18,8 +18,8 @@ #include "t42objs.h" #include "t42parse.h" #include "t42error.h" -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_LIST_H diff --git a/freetype/src/type42/t42objs.h b/freetype/src/type42/t42objs.h index 289dedcc6..c424c2707 100644 --- a/freetype/src/type42/t42objs.h +++ b/freetype/src/type42/t42objs.h @@ -19,14 +19,14 @@ #define __T42OBJS_H__ #include <ft2build.h> -#include FT_FREETYPE_H -#include FT_TYPE1_TABLES_H -#include FT_INTERNAL_TYPE1_TYPES_H +#include <freetype/freetype.h> +#include <freetype/t1tables.h> +#include <freetype/internal/t1types.h> #include "t42types.h" -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DRIVER_H -#include FT_SERVICE_POSTSCRIPT_CMAPS_H -#include FT_INTERNAL_POSTSCRIPT_HINTS_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdriver.h> +#include <freetype/internal/services/svpscmap.h> +#include <freetype/internal/pshints.h> FT_BEGIN_HEADER diff --git a/freetype/src/type42/t42parse.c b/freetype/src/type42/t42parse.c index b9e408c45..dd959da41 100644 --- a/freetype/src/type42/t42parse.c +++ b/freetype/src/type42/t42parse.c @@ -18,10 +18,10 @@ #include "t42parse.h" #include "t42error.h" -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_LIST_H -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/psaux.h> /*************************************************************************/ diff --git a/freetype/src/type42/t42parse.h b/freetype/src/type42/t42parse.h index f77ec4af4..28c22d0c3 100644 --- a/freetype/src/type42/t42parse.h +++ b/freetype/src/type42/t42parse.h @@ -20,7 +20,7 @@ #include "t42objs.h" -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/psaux.h> FT_BEGIN_HEADER diff --git a/freetype/src/type42/t42types.h b/freetype/src/type42/t42types.h index c7c2db490..2d930d0b3 100644 --- a/freetype/src/type42/t42types.h +++ b/freetype/src/type42/t42types.h @@ -20,10 +20,10 @@ #include <ft2build.h> -#include FT_FREETYPE_H -#include FT_TYPE1_TABLES_H -#include FT_INTERNAL_TYPE1_TYPES_H -#include FT_INTERNAL_POSTSCRIPT_HINTS_H +#include <freetype/freetype.h> +#include <freetype/t1tables.h> +#include <freetype/internal/t1types.h> +#include <freetype/internal/pshints.h> FT_BEGIN_HEADER diff --git a/freetype/src/winfonts/winfnt.c b/freetype/src/winfonts/winfnt.c index f6e9859b4..75733bc9d 100644 --- a/freetype/src/winfonts/winfnt.c +++ b/freetype/src/winfonts/winfnt.c @@ -20,9 +20,9 @@ #include <ft2build.h> #include FT_WINFONTS_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftobjs.h> #include "winfnt.h" #include "fnterrs.h" diff --git a/freetype/src/winfonts/winfnt.h b/freetype/src/winfonts/winfnt.h index ca75c9501..0411850d7 100644 --- a/freetype/src/winfonts/winfnt.h +++ b/freetype/src/winfonts/winfnt.h @@ -22,8 +22,8 @@ #include <ft2build.h> -#include FT_WINFONTS_H -#include FT_INTERNAL_DRIVER_H +#include <freetype/ftwinfnt.h> +#include <freetype/internal/ftdriver.h> FT_BEGIN_HEADER |