diff options
| author | Jungshik Shin <jungshik@google.com> | 2016-09-18 03:50:36 -0700 |
|---|---|---|
| committer | Sean McCreary <mccreary@mcwest.org> | 2017-04-07 16:53:42 -0600 |
| commit | 3ff870b9dbbd88173df82269d3c1cffb1eba2eda (patch) | |
| tree | 0e443679e800bb442b2cbb2f7ae086b787ca65ff /src/autofit/afshaper.h | |
| parent | f720f0dbcf012d6c984dbbefa0875ef9840458c6 (diff) | |
| download | android_external_freetype-239460b60910ab5261522702cda36b77c7e31fbe.tar.gz android_external_freetype-239460b60910ab5261522702cda36b77c7e31fbe.tar.bz2 android_external_freetype-239460b60910ab5261522702cda36b77c7e31fbe.zip | |
Update FreeType from 2.6.2 to c38be52bf8de (2.7 + a few post-2.7 CLs)HEADreplicant-6.0-0002replicant-6.0-0001cm-13.0
http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=c38be52b
Keep all the configuration options as before.
Likewise, exclude unused files (Jamfiles, various mk files, builds/,
docs/, ChangeLog*, directories under src/ for disabled modules, etc).
Update README.android to record the configurations.
Besides, disable a new option (TT_CONFIG_OPTION_SUBPIXEL_HINTING) for
branches. Note that a bulk of changes in this CL come from the code to
implement this option.
BUG: 31470908
AOSP-Change-Id: I1ca90aec171d9580415b8531e2b767e9dd31164c
CVE-2016-10244
Change-Id: I4485d2ea543c52f8145ab23372cf3e5c7345879b
(cherry picked from commit 055aee28cedc3631434b2636fc6093c0d4d818ab)
Diffstat (limited to 'src/autofit/afshaper.h')
| -rw-r--r-- | src/autofit/afshaper.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/autofit/afshaper.h b/src/autofit/afshaper.h index db1b4e0..0d41f78 100644 --- a/src/autofit/afshaper.h +++ b/src/autofit/afshaper.h @@ -4,7 +4,7 @@ /* */ /* HarfBuzz interface for accessing OpenType features (specification). */ /* */ -/* Copyright 2013-2015 by */ +/* Copyright 2013-2016 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -16,8 +16,8 @@ /***************************************************************************/ -#ifndef __AFSHAPER_H__ -#define __AFSHAPER_H__ +#ifndef AFSHAPER_H_ +#define AFSHAPER_H_ #include <ft2build.h> @@ -38,7 +38,8 @@ FT_BEGIN_HEADER FT_Error af_shaper_get_coverage( AF_FaceGlobals globals, AF_StyleClass style_class, - FT_UShort* gstyles ); + FT_UShort* gstyles, + FT_Bool default_script ); void* @@ -65,7 +66,7 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __AFSHAPER_H__ */ +#endif /* AFSHAPER_H_ */ /* END */ |