diff options
Diffstat (limited to 'freetype/src')
182 files changed, 391 insertions, 396 deletions
diff --git a/freetype/src/autofit/afcjk.c b/freetype/src/autofit/afcjk.c index 3a65fc561..7402b9b08 100644 --- a/freetype/src/autofit/afcjk.c +++ b/freetype/src/autofit/afcjk.c @@ -23,8 +23,8 @@ */ #include <ft2build.h> -#include FT_ADVANCES_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/ftadvanc.h> +#include <freetype/internal/ftdebug.h> #include "afglobal.h" #include "afpic.h" diff --git a/freetype/src/autofit/aferrors.h b/freetype/src/autofit/aferrors.h index 50e1a22dd..824d0b3a3 100644 --- a/freetype/src/autofit/aferrors.h +++ b/freetype/src/autofit/aferrors.h @@ -26,7 +26,7 @@ #ifndef __AFERRORS_H__ #define __AFERRORS_H__ -#include FT_MODULE_ERRORS_H +#include <freetype/ftmoderr.h> #undef __FTERRORS_H__ @@ -34,7 +34,7 @@ #define FT_ERR_PREFIX AF_Err_ #define FT_ERR_BASE FT_Mod_Err_Autofit -#include FT_ERRORS_H +#include <freetype/fterrors.h> #endif /* __AFERRORS_H__ */ diff --git a/freetype/src/autofit/afhints.c b/freetype/src/autofit/afhints.c index 270a06bca..c96c7ac3c 100644 --- a/freetype/src/autofit/afhints.c +++ b/freetype/src/autofit/afhints.c @@ -18,8 +18,8 @@ #include "afhints.h" #include "aferrors.h" -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftcalc.h> +#include <freetype/internal/ftdebug.h> /*************************************************************************/ diff --git a/freetype/src/autofit/aflatin.c b/freetype/src/autofit/aflatin.c index e3a7742f4..2938f79c7 100644 --- a/freetype/src/autofit/aflatin.c +++ b/freetype/src/autofit/aflatin.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_ADVANCES_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/ftadvanc.h> +#include <freetype/internal/ftdebug.h> #include "afglobal.h" #include "afpic.h" diff --git a/freetype/src/autofit/afmodule.c b/freetype/src/autofit/afmodule.c index 73bf832b1..55c8d596f 100644 --- a/freetype/src/autofit/afmodule.c +++ b/freetype/src/autofit/afmodule.c @@ -29,8 +29,8 @@ void* _af_debug_hints; #endif -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> #include FT_AUTOHINTER_H #include FT_SERVICE_PROPERTIES_H diff --git a/freetype/src/autofit/afmodule.h b/freetype/src/autofit/afmodule.h index 20b7b9f66..b347decc9 100644 --- a/freetype/src/autofit/afmodule.h +++ b/freetype/src/autofit/afmodule.h @@ -20,7 +20,7 @@ #define __AFMODULE_H__ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include FT_MODULE_H #include "afloader.h" diff --git a/freetype/src/autofit/afpic.c b/freetype/src/autofit/afpic.c index cb29fd79f..90f8beb52 100644 --- a/freetype/src/autofit/afpic.c +++ b/freetype/src/autofit/afpic.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "afpic.h" #include "afglobal.h" #include "aferrors.h" diff --git a/freetype/src/autofit/afpic.h b/freetype/src/autofit/afpic.h index 9a68b4a5a..e2b026751 100644 --- a/freetype/src/autofit/afpic.h +++ b/freetype/src/autofit/afpic.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/autofit/aftypes.h b/freetype/src/autofit/aftypes.h index 61badd1b8..9f2331eed 100644 --- a/freetype/src/autofit/aftypes.h +++ b/freetype/src/autofit/aftypes.h @@ -34,10 +34,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> #include "afblue.h" diff --git a/freetype/src/base/basepic.c b/freetype/src/base/basepic.c index aeb6fd577..fa7bf5142 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 8d3f383b4..e04cbdaaf 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 5606745be..3425c368f 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 6e655832f..a1e76e192 100644 --- 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 39ac6add0..95bde59bb 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 --- 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 c62b3db0c..66b01ef29 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 --- 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 6176273f0..c18877aed 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 9b49da814..6607b3d29 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 6f323362a..f01451ed5 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 --- 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 4a39dcd7c..ead7139b0 100644 --- 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 --- 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 9bd92f785..ce93f02ff 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 535297038..84032d723 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" #include "ftbase.h" 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 3098a60fa..fdb31982c 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 --- 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 diff --git a/freetype/src/bdf/bdf.h b/freetype/src/bdf/bdf.h index d11be6f14..7aacb6ed2 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 5a1c296fd..46b545f98 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_TRUETYPE_IDS_H diff --git a/freetype/src/bdf/bdfdrivr.h b/freetype/src/bdf/bdfdrivr.h index ca0dae50d..41047e707 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 2eda11cd9..2c0e17917 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 84d336d5d..880dba9da 100644 --- a/freetype/src/cache/ftcbasic.c +++ b/freetype/src/cache/ftcbasic.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/objects.h> +#include <freetype/internal/ftdebug.h> #include FT_CACHE_H #include "ftcglyph.h" #include "ftcimage.h" diff --git a/freetype/src/cache/ftccache.c b/freetype/src/cache/ftccache.c index f20dd4502..7fa211522 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 848349be2..903853522 100644 --- a/freetype/src/cache/ftccmap.c +++ b/freetype/src/cache/ftccmap.c @@ -20,9 +20,9 @@ #include FT_FREETYPE_H #include FT_CACHE_H #include "ftcmanag.h" -#include FT_INTERNAL_MEMORY_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftmemory.h> +#include <freetype/internal/objects.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 c242ece02..26984fa7c 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 4eb2c5bfd..1df1775f2 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 dc8b4cc39..57783a618 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 6fccf1178..4af7c4d2d 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 6df1c1993..86d1965ad 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 dde7d4488..39e3f7b2d 100644 --- a/freetype/src/cff/cffdrivr.c +++ b/freetype/src/cff/cffdrivr.c @@ -17,12 +17,12 @@ #include <ft2build.h> -#include FT_FREETYPE_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_SFNT_H -#include FT_SERVICE_CID_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/internal/services/svcid.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 50e813870..3fefafc04 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 c8e9f9124..3cc7d8ff9 100644 --- a/freetype/src/cff/cffgload.c +++ b/freetype/src/cff/cffgload.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_OUTLINE_H #include FT_CFF_DRIVER_H diff --git a/freetype/src/cff/cffgload.h b/freetype/src/cff/cffgload.h index 41df7db69..abeff9b92 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 d9bec5966..2e4da25d8 100644 --- a/freetype/src/cff/cffload.c +++ b/freetype/src/cff/cffload.c @@ -17,11 +17,11 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_STREAM_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/tttags.h> +#include <freetype/t1tables.h> #include "cffload.h" #include "cffparse.h" diff --git a/freetype/src/cff/cffobjs.c b/freetype/src/cff/cffobjs.c index cac4ac2bd..96b4e4f06 100644 --- a/freetype/src/cff/cffobjs.c +++ b/freetype/src/cff/cffobjs.c @@ -17,15 +17,14 @@ #include <ft2build.h> - -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_STREAM_H -#include FT_ERRORS_H -#include FT_TRUETYPE_IDS_H -#include FT_TRUETYPE_TAGS_H -#include FT_INTERNAL_SFNT_H -#include FT_CFF_DRIVER_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftcalc.h> +#include <freetype/internal/ftstream.h> +#include <freetype/fterrors.h> +#include <freetype/ttnameid.h> +#include <freetype/tttags.h> +#include <freetype/internal/sfnt.h> +#include <freetype/ftcffdrv.h> #include "cffobjs.h" #include "cffload.h" diff --git a/freetype/src/cff/cffobjs.h b/freetype/src/cff/cffobjs.h index dfbf9a96b..072c0d080 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 91bd5326c..d922f584b 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" #include "cffpic.h" diff --git a/freetype/src/cff/cffparse.h b/freetype/src/cff/cffparse.h index 61d91ed2e..80f27b726 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/cffpic.c b/freetype/src/cff/cffpic.c index f22e4f0d5..71c32747a 100644 --- a/freetype/src/cff/cffpic.c +++ b/freetype/src/cff/cffpic.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "cffcmap.h" #include "cffpic.h" #include "cfferrs.h" diff --git a/freetype/src/cff/cffpic.h b/freetype/src/cff/cffpic.h index 50bab4c17..b936e2ea5 100644 --- a/freetype/src/cff/cffpic.h +++ b/freetype/src/cff/cffpic.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/cff/cfftypes.h b/freetype/src/cff/cfftypes.h index 872744666..f53837abe 100644 --- a/freetype/src/cff/cfftypes.h +++ b/freetype/src/cff/cfftypes.h @@ -22,11 +22,11 @@ #include <ft2build.h> -#include FT_FREETYPE_H -#include FT_TYPE1_TABLES_H -#include FT_INTERNAL_SERVICE_H -#include FT_SERVICE_POSTSCRIPT_CMAPS_H -#include FT_INTERNAL_POSTSCRIPT_HINTS_H +#include <freetype/freetype.h> +#include <freetype/t1tables.h> +#include <freetype/internal/ftserv.h> +#include <freetype/internal/services/svpscmap.h> +#include <freetype/internal/pshints.h> FT_BEGIN_HEADER diff --git a/freetype/src/cid/cidgload.c b/freetype/src/cid/cidgload.c index 7febab81c..07d8fa915 100644 --- a/freetype/src/cid/cidgload.c +++ b/freetype/src/cid/cidgload.c @@ -19,10 +19,10 @@ #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 FT_INTERNAL_CALC_H +#include <freetype/internal/ftcalc.h> #include "ciderrs.h" diff --git a/freetype/src/cid/cidload.c b/freetype/src/cid/cidload.c index 1cda0eee7..b39d6c3a6 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 5932ffa97..41bd735f6 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 d8476cdae..c56e18b2d 100644 --- a/freetype/src/cid/cidparse.c +++ b/freetype/src/cid/cidparse.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 "cidparse.h" diff --git a/freetype/src/cid/cidparse.h b/freetype/src/cid/cidparse.h index f27be65a6..40b3991e9 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 6132a2776..7f912cd94 100644 --- a/freetype/src/cid/cidriver.c +++ b/freetype/src/cid/cidriver.c @@ -19,13 +19,13 @@ #include <ft2build.h> #include "cidriver.h" #include "cidgload.h" -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.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 3c45e0688..ebc200e0a 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 1ff87e442..f7d368822 100644 --- a/freetype/src/gxvalid/gxvcommn.h +++ b/freetype/src/gxvalid/gxvcommn.h @@ -45,7 +45,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 278d47688..7d5cbae48 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 2c60b6c57..88f9af2a8 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 82e6c0070..d0c28f65d 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 d7a64576b..15a70778e 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 f7d2936be..34b37fd6b 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 898887fc9..7c861edb5 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 37c6e869d..933e5f54a 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 af0ffc337..78549020b 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 748cbca8f..44fb3789c 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_BZIP2_H diff --git a/freetype/src/pcf/pcfdrivr.h b/freetype/src/pcf/pcfdrivr.h index 54614951b..064fddffc 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 d936c5805..e8ea4e4c5 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 "pcfread.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 4c43947bf..8e2959e76 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 75f86c5cd..dece491b0 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 88b4d66a1..7b067ea16 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 97c130aad..f91fb077b 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 194d2df2d..80e4b7e71 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 FT_TRUETYPE_IDS_H #include "pfrerror.h" diff --git a/freetype/src/pfr/pfrsbit.c b/freetype/src/pfr/pfrsbit.c index 2da150070..6761bad9f 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 918310814..49dc5c413 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 6a40e110d..0d63e39e5 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_DEBUG_H -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/psaux.h> #include "afmparse.h" #include "psconv.h" diff --git a/freetype/src/psaux/afmparse.h b/freetype/src/psaux/afmparse.h index 35d96046c..55e4f7c47 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 d0d8861c2..b73b724e8 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 "psauxerr.h" diff --git a/freetype/src/psaux/psconv.h b/freetype/src/psaux/psconv.h index d91c76221..913ff00f6 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 b4b7d45c3..5659220bb 100644 --- a/freetype/src/psaux/psobjs.c +++ b/freetype/src/psaux/psobjs.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include FT_INTERNAL_POSTSCRIPT_AUX_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_CALC_H +#include <freetype/internal/psaux.h> +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftcalc.h> #include "psobjs.h" #include "psconv.h" diff --git a/freetype/src/psaux/psobjs.h b/freetype/src/psaux/psobjs.h index e380c60da..ab270ed6b 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 9e5bd34ff..6d8f232a9 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 6ce370bfa..539258380 100644 --- a/freetype/src/psaux/t1decode.c +++ b/freetype/src/psaux/t1decode.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_POSTSCRIPT_HINTS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/pshints.h> +#include <freetype/internal/ftcalc.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 644c76d10..2a7497825 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 f75bae451..ac1e37baf 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 cdeaca18c..762d4aa16 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" #include "pshpic.h" diff --git a/freetype/src/pshinter/pshpic.c b/freetype/src/pshinter/pshpic.c index 568f4ac4b..765a5d3aa 100644 --- a/freetype/src/pshinter/pshpic.c +++ b/freetype/src/pshinter/pshpic.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "pshpic.h" #include "pshnterr.h" diff --git a/freetype/src/pshinter/pshpic.h b/freetype/src/pshinter/pshpic.h index b46f85311..bc7501581 100644 --- a/freetype/src/pshinter/pshpic.h +++ b/freetype/src/pshinter/pshpic.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/pshinter/pshrec.c b/freetype/src/pshinter/pshrec.c index cd66ea869..107837cf8 100644 --- a/freetype/src/pshinter/pshrec.c +++ b/freetype/src/pshinter/pshrec.c @@ -18,9 +18,9 @@ #include <ft2build.h> #include FT_FREETYPE_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 "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 0a5bcb7d2..c05398b87 100644 --- a/freetype/src/psnames/psmodule.c +++ b/freetype/src/psnames/psmodule.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_OBJECTS_H -#include FT_SERVICE_POSTSCRIPT_CMAPS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/services/svpscmap.h> #include "psmodule.h" #include "pstables.h" diff --git a/freetype/src/psnames/pspic.c b/freetype/src/psnames/pspic.c index 3820f65a7..2b3d381b0 100644 --- a/freetype/src/psnames/pspic.c +++ b/freetype/src/psnames/pspic.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "pspic.h" #include "psnamerr.h" diff --git a/freetype/src/psnames/pspic.h b/freetype/src/psnames/pspic.h index 6ff002c60..3cbc93db1 100644 --- a/freetype/src/psnames/pspic.h +++ b/freetype/src/psnames/pspic.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/raster/ftraster.c b/freetype/src/raster/ftraster.c index ddecc809c..908352a59 100644 --- a/freetype/src/raster/ftraster.c +++ b/freetype/src/raster/ftraster.c @@ -60,7 +60,7 @@ #include <ft2build.h> #include "ftraster.h" -#include FT_INTERNAL_CALC_H /* for FT_MulDiv and FT_MulDiv_No_Round */ +#include <freetype/internal/ftcalc.h> /* for FT_MulDiv and FT_MulDiv_No_Round */ #include "rastpic.h" @@ -230,8 +230,8 @@ #else /* !_STANDALONE_ */ -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H /* for FT_TRACE, FT_ERROR, and FT_THROW */ +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> /* for FT_TRACE, FT_ERROR, and FT_THROW */ #include "rasterrs.h" diff --git a/freetype/src/raster/ftrend1.c b/freetype/src/raster/ftrend1.c index aa7f6d566..4ce184348 100644 --- a/freetype/src/raster/ftrend1.c +++ b/freetype/src/raster/ftrend1.c @@ -17,8 +17,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_OUTLINE_H #include "ftrend1.h" #include "ftraster.h" diff --git a/freetype/src/raster/ftrend1.h b/freetype/src/raster/ftrend1.h index 4cf128622..f8c48f1f7 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/raster/rastpic.c b/freetype/src/raster/rastpic.c index 5e9f7cc9c..17a1e2741 100644 --- a/freetype/src/raster/rastpic.c +++ b/freetype/src/raster/rastpic.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "rastpic.h" #include "rasterrs.h" diff --git a/freetype/src/raster/rastpic.h b/freetype/src/raster/rastpic.h index e0ddba624..ff7df7367 100644 --- a/freetype/src/raster/rastpic.h +++ b/freetype/src/raster/rastpic.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/sfnt/sfdriver.c b/freetype/src/sfnt/sfdriver.c index e4fcda5ec..cea38be6b 100644 --- a/freetype/src/sfnt/sfdriver.c +++ b/freetype/src/sfnt/sfdriver.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_SFNT_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/sfnt.h> +#include <freetype/internal/ftobjs.h> #include "sfdriver.h" #include "ttload.h" diff --git a/freetype/src/sfnt/sfntpic.c b/freetype/src/sfnt/sfntpic.c index b3fb24b3f..80d9547f9 100644 --- a/freetype/src/sfnt/sfntpic.c +++ b/freetype/src/sfnt/sfntpic.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "sfntpic.h" #include "sferrors.h" diff --git a/freetype/src/sfnt/sfntpic.h b/freetype/src/sfnt/sfntpic.h index 35d0f449f..e107b924b 100644 --- a/freetype/src/sfnt/sfntpic.h +++ b/freetype/src/sfnt/sfntpic.h @@ -22,7 +22,7 @@ FT_BEGIN_HEADER -#include FT_INTERNAL_PIC_H +#include <freetype/internal/ftpic.h> #ifndef FT_CONFIG_OPTION_PIC @@ -50,8 +50,8 @@ FT_BEGIN_HEADER #include FT_SERVICE_BDF_H #endif -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> #include FT_INTERNAL_SFNT_H #include "ttcmap.h" diff --git a/freetype/src/sfnt/sfobjs.c b/freetype/src/sfnt/sfobjs.c index a31c77cbe..93e4321b6 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 9401dae5f..9851fb1af 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 c717f5ffc..1ef6d3ceb 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" #include "sfntpic.h" diff --git a/freetype/src/sfnt/ttcmap.h b/freetype/src/sfnt/ttcmap.h index 0fde1676b..87aadc31c 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 32c4008b2..ac870b424 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" 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 0a3cd29db..f6a11c12f 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 a8cc63a11..bc95bf861 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 47a85c0c9..73792aed4 100644 --- a/freetype/src/sfnt/ttpost.c +++ b/freetype/src/sfnt/ttpost.c @@ -26,9 +26,9 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_TRUETYPE_TAGS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> +#include <freetype/tttags.h> #include "ttpost.h" #include "sferrors.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 8ff7b9d6a..cd7592dff 100644 --- a/freetype/src/sfnt/ttsbit.c +++ b/freetype/src/sfnt/ttsbit.c @@ -20,10 +20,10 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_TRUETYPE_TAGS_H -#include FT_BITMAP_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> +#include <freetype/tttags.h> +#include <freetype/ftbitmap.h> #include "ttsbit.h" #include "sferrors.h" diff --git a/freetype/src/smooth/ftgrays.c b/freetype/src/smooth/ftgrays.c index 425911a96..1c4e06288 100644 --- a/freetype/src/smooth/ftgrays.c +++ b/freetype/src/smooth/ftgrays.c @@ -236,8 +236,8 @@ typedef ptrdiff_t FT_PtrDist; #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 89088cd09..a42b85fdc 100644 --- a/freetype/src/smooth/ftsmooth.c +++ b/freetype/src/smooth/ftsmooth.c @@ -17,8 +17,7 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_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 3708790df..0b182efc3 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/smooth/ftspic.c b/freetype/src/smooth/ftspic.c index 67a2b8310..c39bf72be 100644 --- a/freetype/src/smooth/ftspic.c +++ b/freetype/src/smooth/ftspic.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "ftspic.h" #include "ftsmerrs.h" diff --git a/freetype/src/smooth/ftspic.h b/freetype/src/smooth/ftspic.h index 334b51c3f..b31064751 100644 --- a/freetype/src/smooth/ftspic.h +++ b/freetype/src/smooth/ftspic.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/tools/test_afm.c b/freetype/src/tools/test_afm.c index 24cd0c4f0..ead5e90c4 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 36d23a282..ff15ea070 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_SERVICE_XFREE86_NAME_H #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT diff --git a/freetype/src/truetype/ttdriver.h b/freetype/src/truetype/ttdriver.h index aae00f261..59c100aa5 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 5f676a2ef..404ecf0df 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 #include FT_TRUETYPE_DRIVER_H diff --git a/freetype/src/truetype/ttgxvar.c b/freetype/src/truetype/ttgxvar.c index 7899d3671..b05b199c3 100644 --- a/freetype/src/truetype/ttgxvar.c +++ b/freetype/src/truetype/ttgxvar.c @@ -44,10 +44,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_TAGS_H #include FT_MULTIPLE_MASTERS_H diff --git a/freetype/src/truetype/ttinterp.c b/freetype/src/truetype/ttinterp.c index 56e8fa7e2..9b7ca9df5 100644 --- a/freetype/src/truetype/ttinterp.c +++ b/freetype/src/truetype/ttinterp.c @@ -21,8 +21,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 #include FT_TRUETYPE_DRIVER_H diff --git a/freetype/src/truetype/ttobjs.c b/freetype/src/truetype/ttobjs.c index 4adba58f7..af04873fa 100644 --- a/freetype/src/truetype/ttobjs.c +++ b/freetype/src/truetype/ttobjs.c @@ -17,10 +17,10 @@ #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 FT_INTERNAL_SFNT_H +#include <freetype/internal/sfnt.h> #include FT_TRUETYPE_DRIVER_H #include "ttgload.h" diff --git a/freetype/src/truetype/ttobjs.h b/freetype/src/truetype/ttobjs.h index a11dd3752..9dd4ddb8d 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/ttpic.c b/freetype/src/truetype/ttpic.c index edefae72c..55e5ba4e2 100644 --- a/freetype/src/truetype/ttpic.c +++ b/freetype/src/truetype/ttpic.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #include "ttpic.h" #include "tterrors.h" diff --git a/freetype/src/truetype/ttpload.c b/freetype/src/truetype/ttpload.c index 9723a515b..0c47253d8 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/truetype/ttsubpix.c b/freetype/src/truetype/ttsubpix.c index 28470ad65..b235eed6b 100644 --- a/freetype/src/truetype/ttsubpix.c +++ b/freetype/src/truetype/ttsubpix.c @@ -16,12 +16,12 @@ /***************************************************************************/ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_SFNT_H -#include FT_TRUETYPE_TAGS_H -#include FT_OUTLINE_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftcalc.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/sfnt.h> +#include <freetype/tttags.h> +#include <freetype/ftoutln.h> #include FT_TRUETYPE_DRIVER_H #include "ttsubpix.h" diff --git a/freetype/src/type1/t1afm.c b/freetype/src/type1/t1afm.c index de9c1997c..de0707184 100644 --- a/freetype/src/type1/t1afm.c +++ b/freetype/src/type1/t1afm.c @@ -19,8 +19,8 @@ #include <ft2build.h> #include "t1afm.h" #include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/ftstream.h> +#include <freetype/internal/psaux.h> #include "t1errors.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 697288d66..1f0e9ded4 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 639cd4a7a..e23a140c7 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 af102fd85..960a6d8cc 100644 --- a/freetype/src/type1/t1gload.c +++ b/freetype/src/type1/t1gload.c @@ -18,11 +18,11 @@ #include <ft2build.h> #include "t1gload.h" -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftcalc.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 fd06432b5..e5b4b06fa 100644 --- a/freetype/src/type1/t1load.c +++ b/freetype/src/type1/t1load.c @@ -61,11 +61,11 @@ #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 FT_INTERNAL_CALC_H +#include <freetype/internal/t1types.h> +#include <freetype/internal/ftcalc.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 e11770fee..8289f31b5 100644 --- a/freetype/src/type1/t1objs.c +++ b/freetype/src/type1/t1objs.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include FT_INTERNAL_CALC_H -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftcalc.h> #include FT_TRUETYPE_IDS_H #include "t1gload.h" @@ -32,7 +32,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 54ccbb996..abba30d58 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 ccf9f4cc5..9cb45eff8 100644 --- a/freetype/src/type1/t1parse.c +++ b/freetype/src/type1/t1parse.c @@ -34,9 +34,9 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/ftdebug.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 3ad1bde79..7782b1da0 100644 --- a/freetype/src/type42/t42drivr.c +++ b/freetype/src/type42/t42drivr.c @@ -39,12 +39,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 9a1e97e30..1defca7ff 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 798ebdbc5..85d10a36f 100644 --- a/freetype/src/type42/t42objs.c +++ b/freetype/src/type42/t42objs.c @@ -19,7 +19,7 @@ #include "t42objs.h" #include "t42parse.h" #include "t42error.h" -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> #include FT_LIST_H #include FT_TRUETYPE_IDS_H diff --git a/freetype/src/type42/t42objs.h b/freetype/src/type42/t42objs.h index 02d13259b..4db189948 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 9b668889b..5fdecb291 100644 --- a/freetype/src/type42/t42parse.c +++ b/freetype/src/type42/t42parse.c @@ -18,9 +18,9 @@ #include "t42parse.h" #include "t42error.h" -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.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 e9c1a9b5f..55ff04fba 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 FT_TRUETYPE_IDS_H #include "winfnt.h" diff --git a/freetype/src/winfonts/winfnt.h b/freetype/src/winfonts/winfnt.h index b7a80736d..c6fec3d50 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 |