freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 87f5225: Fix handling of `AF_CONFIG_OPTION_INDIC'.


From: Werner LEMBERG
Subject: [freetype2] master 87f5225: Fix handling of `AF_CONFIG_OPTION_INDIC'.
Date: Thu, 5 Sep 2019 06:14:21 -0400 (EDT)

branch: master
commit 87f5225256969e59dec7ea64c96067776d8a2f2d
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    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 8ca572d..5298252 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2019-09-05  Werner Lemberg  <address@hidden>
 
+       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  <address@hidden>
+
        CMakeLists.txt: Fix generation of DLL related stuff (#56852).
 
        Extract `version_info' variable from `builds/unix/configure.raw' and
diff --git a/devel/ftoption.h b/devel/ftoption.h
index ef8d5e5..1e2329d 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 c3fd181..721e2c9 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
 
 
   /**************************************************************************



reply via email to

[Prev in Thread] Current Thread [Next in Thread]