summaryrefslogtreecommitdiffstats
path: root/include/freetype/ftgxval.h
diff options
context:
space:
mode:
authorJungshik Shin <jungshik@google.com>2016-09-18 03:50:36 -0700
committerSean McCreary <mccreary@mcwest.org>2017-04-07 16:53:42 -0600
commit3ff870b9dbbd88173df82269d3c1cffb1eba2eda (patch)
tree0e443679e800bb442b2cbb2f7ae086b787ca65ff /include/freetype/ftgxval.h
parentf720f0dbcf012d6c984dbbefa0875ef9840458c6 (diff)
downloadandroid_external_freetype-replicant-6.0-0002.tar.gz
android_external_freetype-replicant-6.0-0002.tar.bz2
android_external_freetype-replicant-6.0-0002.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 'include/freetype/ftgxval.h')
-rw-r--r--include/freetype/ftgxval.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/freetype/ftgxval.h b/include/freetype/ftgxval.h
index 0e9ac1d..a58e86a 100644
--- a/include/freetype/ftgxval.h
+++ b/include/freetype/ftgxval.h
@@ -4,7 +4,7 @@
/* */
/* FreeType API for validating TrueTypeGX/AAT tables (specification). */
/* */
-/* Copyright 2004-2015 by */
+/* Copyright 2004-2016 by */
/* Masatake YAMATO, Redhat K.K, */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
@@ -25,8 +25,8 @@
/***************************************************************************/
-#ifndef __FTGXVAL_H__
-#define __FTGXVAL_H__
+#ifndef FTGXVAL_H_
+#define FTGXVAL_H_
#include <ft2build.h>
#include FT_FREETYPE_H
@@ -351,7 +351,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* __FTGXVAL_H__ */
+#endif /* FTGXVAL_H_ */
/* END */