summaryrefslogtreecommitdiffstats
path: root/src/psnames/pstables.h
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2009-06-08 15:18:21 +0200
committerDavid 'Digit' Turner <digit@google.com>2009-06-08 15:18:21 +0200
commit77f63d23f7d380b0ff02c18fd6a154ab9063128a (patch)
tree14b8437e23a816c57512fe472fdef4c7875c2eba /src/psnames/pstables.h
parentd04869994887b14ee43c9f8a9a8597193b5a7107 (diff)
downloadandroid_external_freetype-77f63d23f7d380b0ff02c18fd6a154ab9063128a.tar.gz
android_external_freetype-77f63d23f7d380b0ff02c18fd6a154ab9063128a.tar.bz2
android_external_freetype-77f63d23f7d380b0ff02c18fd6a154ab9063128a.zip
Integrate FreeType 2.3.9 into the donut tree.
This is done to get fixes for a few security-related issues. NOTE: the auto-hinter hasn't been changed to avoid modifying the rendering of characters. The 2.3.9 code contains minor fixes (not security-related) that could in theory do that (though extensive testing is needed to evaluate its real impact on Android).
Diffstat (limited to 'src/psnames/pstables.h')
-rw-r--r--src/psnames/pstables.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/psnames/pstables.h b/src/psnames/pstables.h
index cc40ef7..1521e9c 100644
--- a/src/psnames/pstables.h
+++ b/src/psnames/pstables.h
@@ -4,7 +4,7 @@
/* */
/* PostScript glyph names. */
/* */
-/* Copyright 2005 by */
+/* Copyright 2005, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -561,7 +561,10 @@
* The lookup function to get the Unicode value for a given string
* is defined below the table.
*/
- static const unsigned char ft_adobe_glyph_list[54791] =
+
+#ifdef FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
+
+ static const unsigned char ft_adobe_glyph_list[54791L] =
{
0, 52, 0,106, 2,167, 3, 63, 4,220, 6,125, 9,143, 10, 23,
11,137, 12,199, 14,246, 15, 87, 16,233, 17,219, 18,104, 19, 88,
@@ -4086,5 +4089,7 @@
return 0;
}
+#endif /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST */
+
/* END */