Commit 37d8b63a authored by Dominik Röttsches's avatar Dominik Röttsches Committed by Commit Bot

Roll src/third_party/freetype/src/ bec14f688..2c048a8a6 (25 commits)

https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/bec14f688925..2c048a8a622e

ftoption.h merged to include updated comments on cmake or ./configure
options having precedence.

"2017-12-08 wl Fix access to uninitalized memory (#52613)."
needed as fix for issue 791317.

$ git log bec14f688..2c048a8a6 --date=short --no-merges --format='%ad %ae %s'
2017-12-11 wl Fix compiler warning (#52640).
2017-12-09 azzuro * builds/windows/vc2010/freetype.vcxproj: Adjust output directory.
2017-12-09 wl Fix `make setup dos', second try (#52622).
2017-12-08 wl Documentation fixes for the last few commits.
2017-12-08 wl [docmaker] Fix code section parsing.
2017-12-08 wl New `ftdriver.h' file, covering all driver modules.
2017-12-08 wl Move `ftdriver.h' to `ftdrv.h'.
2017-12-08 wl Fix access to uninitalized memory (#52613).
2017-12-08 wl Fix `make setup dos' (#52622).
2017-12-07 wl .mailmap: Add Ewald.
2017-12-07 wl Use ASCII only in public header files (#50858).
2017-12-07 wl Fix C++ compilation.
2017-12-07 wl Fix `make multi'.
2017-12-07 wl * include/freetype/config/ftheader.h: Some clean-up.
2017-12-06 wl * builds/symbian/bld.inf: Updated.
2017-12-06 wl New header file `ftparams.h' that collects all parameter tags.
2017-12-05 wl Improve tracing messages by using singular and plural forms.
2017-12-04 wl Update or fix links to use the https protocol instead of http.
2017-12-04 wl [truetype] Allow shared points in `cvar' table (#52532).
2017-11-28 wl [truetype] Improving tracing of composite glyphs.
2017-11-27 wl Allow (again) encoding vectors with more than 256 elements (#52464).
2017-11-27 jan.steffens Fix last commit (#52522).
2017-11-24 wl [unix] Install a massaged `ftoption.h' file (#51780).
2017-11-23 wl Minor.
2017-11-23 tor.andersson Silence unused function warnings.

Created with:
  roll-dep src/third_party/freetype/src

PDFium issue: https://bugs.chromium.org/p/pdfium/issues/detail?id=961

R=bungeman@chromium.org,drott@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_chromium_msan_rel_ng

Change-Id: Idbaef8715b2cf55ea19e906700231917a23a9c8c
Reviewed-on: https://chromium-review.googlesource.com/817419
Commit-Queue: Dominik Röttsches <drott@chromium.org>
Reviewed-by: default avatarFlorin Malita <fmalita@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523423}
parent c7356ebe
...@@ -126,7 +126,7 @@ vars = { ...@@ -126,7 +126,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling freetype # the commit queue can handle CLs rolling freetype
# and whatever else without interference from each other. # and whatever else without interference from each other.
'freetype_revision': 'bec14f688925467be708f01378fbbf82e6b19b42', 'freetype_revision': '2c048a8a622e9f44f255aa3316026f124ac9ecbc',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult # the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
Name: FreeType Name: FreeType
URL: http://www.freetype.org/ URL: http://www.freetype.org/
Version: VER-2-8-1-120 Version: VER-2-8-1-120
Revision: bec14f688925467be708f01378fbbf82e6b19b42 Revision: 2c048a8a622e9f44f255aa3316026f124ac9ecbc
License: Custom license "inspired by the BSD, Artistic, and IJG (Independent License: Custom license "inspired by the BSD, Artistic, and IJG (Independent
JPEG Group) licenses" JPEG Group) licenses"
License File: src/docs/FTL.TXT License File: src/docs/FTL.TXT
......
...@@ -80,14 +80,12 @@ FT_BEGIN_HEADER ...@@ -80,14 +80,12 @@ FT_BEGIN_HEADER
/* If you enable this configuration option, FreeType recognizes an */ /* If you enable this configuration option, FreeType recognizes an */
/* environment variable called `FREETYPE_PROPERTIES', which can be used */ /* environment variable called `FREETYPE_PROPERTIES', which can be used */
/* to control the various font drivers and modules. The controllable */ /* to control the various font drivers and modules. The controllable */
/* properties are listed in the section `Controlling FreeType Modules' */ /* properties are listed in the section @properties. */
/* in the reference's table of contents; currently there are properties */
/* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), */
/* TrueType (file `ftttdrv.h'), and PCF (file `ftpcfdrv.h'). */
/* */ /* */
/* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */ /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */
/* multiple lines for better readability). */ /* multiple lines for better readability). */
/* */ /* */
/* { */
/* <optional whitespace> */ /* <optional whitespace> */
/* <module-name1> ':' */ /* <module-name1> ':' */
/* <property-name1> '=' <property-value1> */ /* <property-name1> '=' <property-value1> */
...@@ -95,6 +93,7 @@ FT_BEGIN_HEADER ...@@ -95,6 +93,7 @@ FT_BEGIN_HEADER
/* <module-name2> ':' */ /* <module-name2> ':' */
/* <property-name2> '=' <property-value2> */ /* <property-name2> '=' <property-value2> */
/* ... */ /* ... */
/* } */
/* */ /* */
/* Example: */ /* Example: */
/* */ /* */
...@@ -211,6 +210,10 @@ FT_BEGIN_HEADER ...@@ -211,6 +210,10 @@ FT_BEGIN_HEADER
/* Do not #undef this macro here since the build system might define */ /* Do not #undef this macro here since the build system might define */
/* it for certain configurations only. */ /* it for certain configurations only. */
/* */ /* */
/* If you use a build system like cmake or the `configure' script, */
/* options set by those programs have precendence, overwriting the */
/* value here with the configured one. */
/* */
/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */ /* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
...@@ -227,6 +230,10 @@ FT_BEGIN_HEADER ...@@ -227,6 +230,10 @@ FT_BEGIN_HEADER
/* */ /* */
/* Define this macro if you want to enable this `feature'. */ /* Define this macro if you want to enable this `feature'. */
/* */ /* */
/* If you use a build system like cmake or the `configure' script, */
/* options set by those programs have precendence, overwriting the */
/* value here with the configured one. */
/* */
/* #define FT_CONFIG_OPTION_USE_BZIP2 */ /* #define FT_CONFIG_OPTION_USE_BZIP2 */
...@@ -252,6 +259,10 @@ FT_BEGIN_HEADER ...@@ -252,6 +259,10 @@ FT_BEGIN_HEADER
/* */ /* */
/* Define this macro if you want to enable this `feature'. */ /* Define this macro if you want to enable this `feature'. */
/* */ /* */
/* If you use a build system like cmake or the `configure' script, */
/* options set by those programs have precendence, overwriting the */
/* value here with the configured one. */
/* */
#define FT_CONFIG_OPTION_USE_PNG #define FT_CONFIG_OPTION_USE_PNG
...@@ -265,6 +276,10 @@ FT_BEGIN_HEADER ...@@ -265,6 +276,10 @@ FT_BEGIN_HEADER
/* */ /* */
/* Define this macro if you want to enable this `feature'. */ /* Define this macro if you want to enable this `feature'. */
/* */ /* */
/* If you use a build system like cmake or the `configure' script, */
/* options set by those programs have precendence, overwriting the */
/* value here with the configured one. */
/* */
#if !defined(WITHOUT_HARFBUZZ) #if !defined(WITHOUT_HARFBUZZ)
#define FT_CONFIG_OPTION_USE_HARFBUZZ #define FT_CONFIG_OPTION_USE_HARFBUZZ
#endif #endif
...@@ -638,7 +653,7 @@ FT_BEGIN_HEADER ...@@ -638,7 +653,7 @@ FT_BEGIN_HEADER
/* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */
/* defined. */ /* defined. */
/* */ /* */
/* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ /* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
/* */ /* */
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
...@@ -658,7 +673,7 @@ FT_BEGIN_HEADER ...@@ -658,7 +673,7 @@ FT_BEGIN_HEADER
/* composite flags array which can be used to disambiguate, but old */ /* composite flags array which can be used to disambiguate, but old */
/* fonts will not have them. */ /* fonts will not have them. */
/* */ /* */
/* http://www.microsoft.com/typography/otspec/glyf.htm */ /* https://www.microsoft.com/typography/otspec/glyf.htm */
/* https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6glyf.html */ /* https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6glyf.html */
/* */ /* */
#undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED #undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
...@@ -780,8 +795,8 @@ FT_BEGIN_HEADER ...@@ -780,8 +795,8 @@ FT_BEGIN_HEADER
/* possible to set up the default values of the four control points that */ /* possible to set up the default values of the four control points that */
/* define the stem darkening behaviour of the (new) CFF engine. For */ /* define the stem darkening behaviour of the (new) CFF engine. For */
/* more details please read the documentation of the */ /* more details please read the documentation of the */
/* `darkening-parameters' property of the cff driver module (file */ /* `darkening-parameters' property (file `ftdriver.h'), which allows the */
/* `ftcffdrv.h'), which allows the control at run-time. */ /* control at run-time. */
/* */ /* */
/* Do *not* undefine these macros! */ /* Do *not* undefine these macros! */
/* */ /* */
...@@ -869,7 +884,7 @@ FT_BEGIN_HEADER ...@@ -869,7 +884,7 @@ FT_BEGIN_HEADER
/* */ /* */
/* This experimental option is active only if the rendering mode is */ /* This experimental option is active only if the rendering mode is */
/* FT_RENDER_MODE_LIGHT; you can switch warping on and off with the */ /* FT_RENDER_MODE_LIGHT; you can switch warping on and off with the */
/* `warping' property of the auto-hinter (see file `ftautoh.h' for more */ /* `warping' property of the auto-hinter (see file `ftdriver.h' for more */
/* information; by default it is switched off). */ /* information; by default it is switched off). */
/* */ /* */
/*#define AF_CONFIG_OPTION_USE_WARPER*/ /*#define AF_CONFIG_OPTION_USE_WARPER*/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment