diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-01-26 13:53:40 +0100 |
|---|---|---|
| committer | Yaron Friedman <yfriedman@chromium.org> | 2012-11-13 13:50:47 -0800 |
| commit | 8583905b8952672a083f21fd8945f329b98aa35b (patch) | |
| tree | ce5dd97b012263057f2d67ec55698d46456205d6 /include | |
| parent | 41c2c4116acca09389cc5fe2ea393eaada546422 (diff) | |
| download | freetype-8583905b8952672a083f21fd8945f329b98aa35b.tar.gz | |
Upgrade to upstream 2.4.4
This is necessary to fix several security issues. See b/3344697
Change-Id: Ica5c6387fbd791008199f7994ed03978ed700a69
Diffstat (limited to 'include')
| -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 */ |