diff options
Diffstat (limited to 'freetype/src')
181 files changed, 363 insertions, 364 deletions
diff --git a/freetype/src/autofit/afcjk.c b/freetype/src/autofit/afcjk.c index 0acef9c85..b5b4c6112 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 "aftypes.h" #include "aflatin.h" diff --git a/freetype/src/autofit/afhints.c b/freetype/src/autofit/afhints.c index f51066f02..25864c52f 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> /* Get new segment for given axis. */ diff --git a/freetype/src/autofit/aflatin.c b/freetype/src/autofit/aflatin.c index 54fcf7f0a..3ce89b517 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 "aflatin.h" #include "aferrors.h" diff --git a/freetype/src/autofit/afmodule.c b/freetype/src/autofit/afmodule.c index 20b621838..683106121 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/afmodule.h b/freetype/src/autofit/afmodule.h index d9792399b..6bda1463d 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 diff --git a/freetype/src/autofit/afpic.c b/freetype/src/autofit/afpic.c index 3aefbc51c..3fb8e51c4 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" #ifdef FT_CONFIG_OPTION_PIC diff --git a/freetype/src/autofit/afpic.h b/freetype/src/autofit/afpic.h index c1632e76e..e4cd7a05d 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 44997d1e2..a31bf5225 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/basepic.c b/freetype/src/base/basepic.c index c0bccb695..d9ae40356 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" #ifdef FT_CONFIG_OPTION_PIC diff --git a/freetype/src/base/basepic.h b/freetype/src/base/basepic.h index bb1774576..6d7ca3e61 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 #define FT_OUTLINE_GLYPH_CLASS_GET &ft_outline_glyph_class diff --git a/freetype/src/base/ftadvanc.c b/freetype/src/base/ftadvanc.c index 8ab7fcb92..b5b6e60b7 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 6375613b2..5ab258764 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 4b8e9112f..e31de297a 100644 --- a/freetype/src/base/ftbbox.c +++ b/freetype/src/base/ftbbox.c @@ -28,8 +28,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 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 22ec33752..b700b28f2 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 3892fabfe..9db3df436 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 12fed04bb..ea9f2a9b1 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 848345019..7d620ec19 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 b22050800..39c52bdd9 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> #include "basepic.h" diff --git a/freetype/src/base/ftgxval.c b/freetype/src/base/ftgxval.c index aeeb8ce4f..528b5eab7 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 305177a7e..d18072cee 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 0da4ba160..e38fb4bd8 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/ftobjs.c b/freetype/src/base/ftobjs.c index 5069afb2c..4c927129e 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 694fd2b87..ec39466a0 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 356b15611..e48086932 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 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 3a0f92d07..3b2ee3642 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/ftpic.c b/freetype/src/base/ftpic.c index d5271a972..fc5646733 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 4e7d510a5..c94cdd86d 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/ftsnames.c b/freetype/src/base/ftsnames.c index 3447888ca..fc6d9c1b1 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 fc2868e8d..c04af6724 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 3f24f9ee8..f72c7fc4d 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 d4ec0da57..4bba5bc43 100644 --- a/freetype/src/base/ftsynth.c +++ b/freetype/src/base/ftsynth.c @@ -18,8 +18,7 @@ #include <ft2build.h> #include FT_SYNTHESIS_H -#include FT_INTERNAL_DEBUG_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 7e203bef8..7dfd52c32 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 fdf433ab8..efee35f11 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 561b4158a..11aa9337c 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 47d0eae89..1fb99eebb 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 db7093bb4..ec2ff90a0 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 61bae36b3..8c50822ea 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 09d793ecf..3749cd753 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 f01c403f8..3af33a2e3 100644 --- a/freetype/src/cache/ftccache.c +++ b/freetype/src/cache/ftccache.c @@ -19,8 +19,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 b7bd2919d..61c33c23f 100644 --- a/freetype/src/cache/ftccmap.c +++ b/freetype/src/cache/ftccmap.c @@ -21,9 +21,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 548ebe951..e5721f55c 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 8c3797fb0..d4cd04745 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 8bf8d607e..1c14de453 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 4fd3436cc..cf098c396 100644 --- a/freetype/src/cff/cffdrivr.c +++ b/freetype/src/cff/cffdrivr.c @@ -18,12 +18,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 cb06bdf10..1478dee54 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 "cffobjs.h" diff --git a/freetype/src/cff/cffgload.h b/freetype/src/cff/cffgload.h index 38937be5c..ab8d6b222 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 98d8e1c8d..447813027 100644 --- a/freetype/src/cff/cffload.c +++ b/freetype/src/cff/cffload.c @@ -18,11 +18,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 cd386762d..d8bcb98dc 100644 --- a/freetype/src/cff/cffobjs.c +++ b/freetype/src/cff/cffobjs.c @@ -17,13 +17,14 @@ #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 <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 4f71e858a..b7c725827 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 7e2c00a04..0ee7f0f58 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 5d01bd45e..478aac4ed 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 "cffpic.h" #ifdef FT_CONFIG_OPTION_PIC diff --git a/freetype/src/cff/cffpic.h b/freetype/src/cff/cffpic.h index e29d06813..338bc5993 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 #define FT_CFF_SERVICE_PS_INFO_GET cff_service_ps_info diff --git a/freetype/src/cff/cfftypes.h b/freetype/src/cff/cfftypes.h index 665ab6f68..eba1b10ec 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 81742d167..8dd7ed3fc 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 3bb359446..405125566 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 eb8216888..1fa69e04e 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 efed618f5..139d74aad 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 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 3a2d22532..b17406064 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 c7f424bb3..6cade3a9c 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 35c043dbd..4d2bb44b4 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 52966ece7..14a852a8b 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 7f254999a..6522c3454 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 8bc65c8f5..905eabb08 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 620e45233..1364f43fd 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 af2a2d986..30acc7fb1 100644 --- a/freetype/src/pcf/pcfdrivr.c +++ b/freetype/src/pcf/pcfdrivr.c @@ -28,9 +28,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 a81d7309e..37968cc2c 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 f8c2a239b..e08da6e72 100644 --- a/freetype/src/pcf/pcfread.c +++ b/freetype/src/pcf/pcfread.c @@ -28,9 +28,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 0053050a2..24d89a328 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 da0a1aa63..aeb4bc546 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 6f65b01f5..96219a9a9 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 325322e98..2f5b4cb58 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 3e5e86e21..036d26beb 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 52bc2c8c3..cecdad81e 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 d7de3736f..fbd460d93 100644 --- a/freetype/src/psaux/afmparse.c +++ b/freetype/src/psaux/afmparse.c @@ -17,7 +17,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_POSTSCRIPT_AUX_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 1531d8f0f..3f74c1cbe 100644 --- a/freetype/src/psaux/psconv.c +++ b/freetype/src/psaux/psconv.c @@ -17,7 +17,7 @@ #include <ft2build.h> -#include FT_INTERNAL_POSTSCRIPT_AUX_H +#include <freetype/internal/psaux.h> #include "psconv.h" #include "psauxerr.h" diff --git a/freetype/src/psaux/psconv.h b/freetype/src/psaux/psconv.h index 84854ba0d..295ad692b 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 a28b5fc24..892d9821b 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 f933e4da8..8b57ebbd8 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 90874f022..a8abc8731 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 d79897891..15ecc2b90 100644 --- a/freetype/src/pshinter/pshalgo.c +++ b/freetype/src/pshinter/pshalgo.c @@ -18,9 +18,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 31231ad00..a34b2e508 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 91da5d7e6..911c495ab 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 5efb42294..dc2f1d4e4 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" #ifdef FT_CONFIG_OPTION_PIC diff --git a/freetype/src/pshinter/pshpic.h b/freetype/src/pshinter/pshpic.h index 3555d8e85..9e8ddc7d6 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 0910cc5e6..401592ae7 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 752869693..26f3c973c 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/psnames/pspic.c b/freetype/src/psnames/pspic.c index b9075d5a5..fa14f79d6 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" #ifdef FT_CONFIG_OPTION_PIC diff --git a/freetype/src/psnames/pspic.h b/freetype/src/psnames/pspic.h index 75a14fdcb..2c77f2eaf 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 #define FT_PSCMAPS_SERVICES_GET pscmaps_services diff --git a/freetype/src/raster/ftraster.c b/freetype/src/raster/ftraster.c index 55e2d0d75..daae074c8 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 only */ +#include <freetype/internal/ftcalc.h> /* for FT_MulDiv only */ #include "rastpic.h" @@ -223,8 +223,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 d8a89f28a..2279533fd 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 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 e31c54976..404aa0e8c 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" #ifdef FT_CONFIG_OPTION_PIC diff --git a/freetype/src/raster/rastpic.h b/freetype/src/raster/rastpic.h index dcd82b8ca..2ff055e51 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 #define FT_STANDARD_RASTER_GET ft_standard_raster diff --git a/freetype/src/sfnt/sfdriver.c b/freetype/src/sfnt/sfdriver.c index 247aa6799..9d008efd9 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 53aca17b5..f535cf0a8 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" #ifdef FT_CONFIG_OPTION_PIC diff --git a/freetype/src/sfnt/sfntpic.h b/freetype/src/sfnt/sfntpic.h index 6943b4250..1945335e2 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 #define FT_SFNT_SERVICES_GET sfnt_services @@ -46,8 +46,8 @@ FT_BEGIN_HEADER #include "ttbdf.h" #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 44471f6b6..55531a0ec 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 18845c39c..8f2539635 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 544750ab1..42da38074 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 15a4a21e5..400ceb584 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 46888988e..3952163c3 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 5fb9aea4e..b0cb9fa77 100644 --- a/freetype/src/sfnt/ttload.c +++ b/freetype/src/sfnt/ttload.c @@ -19,8 +19,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 73ac8b2d5..caa778c89 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 6f4bb1d0d..e5e1429a0 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 283ba7ef7..c138e0b2d 100644 --- a/freetype/src/sfnt/ttsbit.c +++ b/freetype/src/sfnt/ttsbit.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 /* @@ -32,8 +32,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 38bcf210e..06551df6b 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 40de26910..7b54d12f6 100644 --- a/freetype/src/smooth/ftgrays.c +++ b/freetype/src/smooth/ftgrays.c @@ -207,8 +207,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 1350a5661..ecdbce522 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 7adaab17d..41f9a43e3 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" #ifdef FT_CONFIG_OPTION_PIC diff --git a/freetype/src/smooth/ftspic.h b/freetype/src/smooth/ftspic.h index c7e0ce9d8..51f1b3d22 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 #define FT_GRAYS_RASTER_GET ft_grays_raster diff --git a/freetype/src/tools/test_afm.c b/freetype/src/tools/test_afm.c index f5f99363c..00c46e97e 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 e70a61123..5866e872e 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 f35521e17..cdbe61a8d 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 37bbe6d2e..4eb125e5e 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 d568926bf..b0ff5c622 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 d77c3c421..0172cf1bc 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 "ttgload.h" #include "ttpload.h" diff --git a/freetype/src/truetype/ttobjs.h b/freetype/src/truetype/ttobjs.h index 087b3c2e1..c7b543cc5 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 5d725742c..7f4d4f192 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" #ifdef FT_CONFIG_OPTION_PIC diff --git a/freetype/src/truetype/ttpload.c b/freetype/src/truetype/ttpload.c index 818b29d26..00f3ad5fb 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 780ab33bf..43b7118c5 100644 --- a/freetype/src/type1/t1afm.c +++ b/freetype/src/type1/t1afm.c @@ -20,8 +20,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 9fecbeb0f..7b2d49539 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 f3fad4f5d..f680ad4c4 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 38c74b277..3fe1edd80 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 58632109c..328e326fe 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 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 2a762279f..75d1419a1 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 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 4717e4613..a7d88b3ea 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 a5e0ee5e8..1454c46cd 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 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 577426917..c06dc911e 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 ee17d1665..9be08e8be 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 70a90861a..57710164a 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 |