diff options
author | David 'Digit' Turner <digit@google.com> | 2011-01-26 13:53:40 +0100 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2011-01-26 13:53:40 +0100 |
commit | 7f08cbd7d6dcf19b8d8e4328e33032aee342e3b4 (patch) | |
tree | f9ed9e041d6830735eae3d4af62e9a602851faea /include/freetype/config | |
parent | cb487e4c5295d0d9bb96ddd3a27372ffad41ae5b (diff) | |
download | android_external_freetype-7f08cbd7d6dcf19b8d8e4328e33032aee342e3b4.tar.gz android_external_freetype-7f08cbd7d6dcf19b8d8e4328e33032aee342e3b4.tar.bz2 android_external_freetype-7f08cbd7d6dcf19b8d8e4328e33032aee342e3b4.zip |
Upgrade to upstream 2.4.4
This is necessary to fix several security issues. See b/3344697
Change-Id: Ica5c6387fbd791008199f7994ed03978ed700a69
Diffstat (limited to 'include/freetype/config')
-rw-r--r-- | include/freetype/config/ftoption.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 22056e1..c6d1974 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -503,13 +503,10 @@ FT_BEGIN_HEADER /* */ /* If you define TT_CONFIG_OPTION_UNPATENTED_HINTING, a special version */ /* of the TrueType bytecode interpreter is used that doesn't implement */ - /* any of the patented opcodes and algorithms. The patents related to */ - /* TrueType hinting have expired worldwide since May 2010; this option */ - /* is now deprecated. */ - /* */ - /* Note that the TT_CONFIG_OPTION_UNPATENTED_HINTING macro is *ignored* */ - /* if you define TT_CONFIG_OPTION_BYTECODE_INTERPRETER; in other words, */ - /* either define TT_CONFIG_OPTION_BYTECODE_INTERPRETER or */ + /* any of the patented opcodes and algorithms. Note that the */ + /* TT_CONFIG_OPTION_UNPATENTED_HINTING macro is *ignored* if you define */ + /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER; in other words, either define */ + /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER or */ /* TT_CONFIG_OPTION_UNPATENTED_HINTING but not both at the same time. */ /* */ /* This macro is only useful for a small number of font files (mostly */ |