From 87f5225256969e59dec7ea64c96067776d8a2f2d Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 5 Sep 2019 12:14:03 +0200 Subject: Fix handling of `AF_CONFIG_OPTION_INDIC'. * devel/ftoption.h, include/freetype/config/ftoption.h: `AF_CONFIG_OPTION_INDIC' needs `AF_CONFIG_OPTION_CJK'. --- ChangeLog | 7 +++++++ devel/ftoption.h | 4 +++- include/freetype/config/ftoption.h | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ca572db4..52982525f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2019-09-05 Werner Lemberg + + Fix handling of `AF_CONFIG_OPTION_INDIC'. + + * devel/ftoption.h, include/freetype/config/ftoption.h: + `AF_CONFIG_OPTION_INDIC' needs `AF_CONFIG_OPTION_CJK'. + 2019-09-05 Werner Lemberg CMakeLists.txt: Fix generation of DLL related stuff (#56852). diff --git a/devel/ftoption.h b/devel/ftoption.h index ef8d5e56f..1e2329d71 100644 --- a/devel/ftoption.h +++ b/devel/ftoption.h @@ -887,9 +887,11 @@ FT_BEGIN_HEADER * * Compile 'autofit' module with fallback Indic script support, covering * some scripts that the 'latin' submodule of the 'autofit' module doesn't - * (yet) handle. + * (yet) handle. Currently, this needs option `AF_CONFIG_OPTION_CJK`. */ +#ifdef AF_CONFIG_OPTION_CJK #define AF_CONFIG_OPTION_INDIC +#endif /************************************************************************** diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index c3fd181ff..721e2c9b1 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -887,9 +887,11 @@ FT_BEGIN_HEADER * * Compile 'autofit' module with fallback Indic script support, covering * some scripts that the 'latin' submodule of the 'autofit' module doesn't - * (yet) handle. + * (yet) handle. Currently, this needs option `AF_CONFIG_OPTION_CJK`. */ +#ifdef AF_CONFIG_OPTION_CJK #define AF_CONFIG_OPTION_INDIC +#endif /************************************************************************** -- cgit v1.2.1