summaryrefslogtreecommitdiffstats
path: root/include/freetype/ftstroke.h
diff options
context:
space:
mode:
authorJungshik Shin <jungshik@google.com>2016-09-18 03:50:36 -0700
committerAndreas Blaesius <skate4life@gmx.de>2017-05-01 01:10:57 +0200
commitc158e6ad29b5df89aa04417832cdfd750ce294b2 (patch)
tree546b0f704cc42b92feb2938a947560ef6ed57ce1 /include/freetype/ftstroke.h
parent0e222f91031c74e3e12b7df18d39a50dbe0c640a (diff)
downloadandroid_external_freetype-cm-11.0.tar.gz
android_external_freetype-cm-11.0.tar.bz2
android_external_freetype-cm-11.0.zip
Update FreeType from 2.6.2 to c38be52bf8de (2.7 + a few post-2.7 CLs)cm-11.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/ftstroke.h')
-rw-r--r--include/freetype/ftstroke.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/freetype/ftstroke.h b/include/freetype/ftstroke.h
index 7ebb1e7..b3b9922 100644
--- a/include/freetype/ftstroke.h
+++ b/include/freetype/ftstroke.h
@@ -4,7 +4,7 @@
/* */
/* FreeType path stroker (specification). */
/* */
-/* Copyright 2002-2015 by */
+/* Copyright 2002-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 __FT_STROKE_H__
-#define __FT_STROKE_H__
+#ifndef FTSTROKE_H_
+#define FTSTROKE_H_
#include <ft2build.h>
#include FT_OUTLINE_H
@@ -774,7 +774,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* __FT_STROKE_H__ */
+#endif /* FTSTROKE_H_ */
/* END */