diff options
Diffstat (limited to 'freetype/src/cff')
-rw-r--r-- | freetype/src/cff/cffdrivr.c | 12 | ||||
-rw-r--r-- | freetype/src/cff/cffdrivr.h | 2 | ||||
-rw-r--r-- | freetype/src/cff/cffgload.c | 6 | ||||
-rw-r--r-- | freetype/src/cff/cffgload.h | 2 | ||||
-rw-r--r-- | freetype/src/cff/cffload.c | 10 | ||||
-rw-r--r-- | freetype/src/cff/cffobjs.c | 17 | ||||
-rw-r--r-- | freetype/src/cff/cffobjs.h | 8 | ||||
-rw-r--r-- | freetype/src/cff/cffparse.c | 4 | ||||
-rw-r--r-- | freetype/src/cff/cffparse.h | 2 | ||||
-rw-r--r-- | freetype/src/cff/cffpic.c | 2 | ||||
-rw-r--r-- | freetype/src/cff/cffpic.h | 2 | ||||
-rw-r--r-- | freetype/src/cff/cfftypes.h | 10 |
12 files changed, 38 insertions, 39 deletions
diff --git a/freetype/src/cff/cffdrivr.c b/freetype/src/cff/cffdrivr.c index dde7d4488..7f37e491b 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.h> +#include <internal/ftdebug.h> +#include <internal/ftstream.h> +#include <internal/sfnt.h> +#include <internal/services/svcid.h> +#include <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..03e2e8b66 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 <internal/ftdriver.h> FT_BEGIN_HEADER diff --git a/freetype/src/cff/cffgload.c b/freetype/src/cff/cffgload.c index c8e9f9124..620d09486 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 <internal/ftdebug.h> +#include <internal/ftstream.h> +#include <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..83e4618e9 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.h> #include "cffobjs.h" diff --git a/freetype/src/cff/cffload.c b/freetype/src/cff/cffload.c index d9bec5966..0017f2efb 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 <internal/ftdebug.h> +#include <internal/ftobjs.h> +#include <internal/ftstream.h> +#include <tttags.h> +#include <t1tables.h> #include "cffload.h" #include "cffparse.h" diff --git a/freetype/src/cff/cffobjs.c b/freetype/src/cff/cffobjs.c index cac4ac2bd..4c5141f5a 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 <internal/ftdebug.h> +#include <internal/ftcalc.h> +#include <internal/ftstream.h> +#include <fterrors.h> +#include <ttnameid.h> +#include <tttags.h> +#include <internal/sfnt.h> +#include <ftcffdrv.h> #include "cffobjs.h" #include "cffload.h" diff --git a/freetype/src/cff/cffobjs.h b/freetype/src/cff/cffobjs.h index dfbf9a96b..12d94a063 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 <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 <internal/tttypes.h> +#include <internal/services/svpscmap.h> +#include <internal/pshints.h> FT_BEGIN_HEADER diff --git a/freetype/src/cff/cffparse.c b/freetype/src/cff/cffparse.c index 91bd5326c..1f9768373 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 <internal/ftstream.h> +#include <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..7d727510f 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 <internal/ftobjs.h> FT_BEGIN_HEADER diff --git a/freetype/src/cff/cffpic.c b/freetype/src/cff/cffpic.c index f22e4f0d5..dacd22241 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 <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..f64a21c43 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 <internal/ftpic.h> #ifndef FT_CONFIG_OPTION_PIC diff --git a/freetype/src/cff/cfftypes.h b/freetype/src/cff/cfftypes.h index 872744666..af33ba5e5 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.h> +#include <t1tables.h> +#include <internal/ftserv.h> +#include <internal/services/svpscmap.h> +#include <internal/pshints.h> FT_BEGIN_HEADER |