diff options
| author | volzhs <volzhs@gmail.com> | 2020-10-20 02:15:54 +0900 |
|---|---|---|
| committer | volzhs <volzhs@gmail.com> | 2020-10-22 01:47:48 +0900 |
| commit | 42959d54ff7d67111086573491dd76259dc2d0aa (patch) | |
| tree | d9ba1955c981c022b992766dfc6d35567df8d427 /thirdparty/freetype/src/lzw | |
| parent | b9d48031e843395fd3117af5af1a40cdc5a884c0 (diff) | |
| download | redot-engine-42959d54ff7d67111086573491dd76259dc2d0aa.tar.gz | |
Update freetype to 2.10.4
Diffstat (limited to 'thirdparty/freetype/src/lzw')
| -rw-r--r-- | thirdparty/freetype/src/lzw/ftlzw.c | 13 | ||||
| -rw-r--r-- | thirdparty/freetype/src/lzw/ftzopen.c | 6 | ||||
| -rw-r--r-- | thirdparty/freetype/src/lzw/ftzopen.h | 6 |
3 files changed, 13 insertions, 12 deletions
diff --git a/thirdparty/freetype/src/lzw/ftlzw.c b/thirdparty/freetype/src/lzw/ftlzw.c index 7d3f3e3f55..ddb81e6e97 100644 --- a/thirdparty/freetype/src/lzw/ftlzw.c +++ b/thirdparty/freetype/src/lzw/ftlzw.c @@ -21,15 +21,14 @@ * */ -#include <ft2build.h> -#include FT_INTERNAL_MEMORY_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_DEBUG_H -#include FT_LZW_H +#include <freetype/internal/ftmemory.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftdebug.h> +#include <freetype/ftlzw.h> #include FT_CONFIG_STANDARD_LIBRARY_H -#include FT_MODULE_ERRORS_H +#include <freetype/ftmoderr.h> #undef FTERRORS_H_ @@ -37,7 +36,7 @@ #define FT_ERR_PREFIX LZW_Err_ #define FT_ERR_BASE FT_Mod_Err_LZW -#include FT_ERRORS_H +#include <freetype/fterrors.h> #ifdef FT_CONFIG_OPTION_USE_LZW diff --git a/thirdparty/freetype/src/lzw/ftzopen.c b/thirdparty/freetype/src/lzw/ftzopen.c index cdc7f4e683..884d2ec74e 100644 --- a/thirdparty/freetype/src/lzw/ftzopen.c +++ b/thirdparty/freetype/src/lzw/ftzopen.c @@ -20,9 +20,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/thirdparty/freetype/src/lzw/ftzopen.h b/thirdparty/freetype/src/lzw/ftzopen.h index 2866529bd4..d8768f7b47 100644 --- a/thirdparty/freetype/src/lzw/ftzopen.h +++ b/thirdparty/freetype/src/lzw/ftzopen.h @@ -22,9 +22,9 @@ #ifndef FTZOPEN_H_ #define FTZOPEN_H_ -#include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> +FT_BEGIN_HEADER /* * This is a complete re-implementation of the LZW file reader, @@ -166,6 +166,8 @@ /* */ +FT_END_HEADER + #endif /* FTZOPEN_H_ */ |