summaryrefslogtreecommitdiffstats
path: root/src/truetype/ttgxvar.c
diff options
context:
space:
mode:
authorGeremy Condra <gcondra@google.com>2011-11-17 14:08:04 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-17 14:08:04 -0800
commita56904260208e9306d661349cc2bddfad8f29019 (patch)
tree720489aa1d9176e568acf0f8cb441a3f8cb0663f /src/truetype/ttgxvar.c
parentec53de77a7ec24f862372a39333f8e91708a806d (diff)
parentbff90fb5ec88ad7fdfb6d1d2f5a5719c20a2c5dc (diff)
downloadandroid_external_freetype-a56904260208e9306d661349cc2bddfad8f29019.tar.gz
android_external_freetype-a56904260208e9306d661349cc2bddfad8f29019.tar.bz2
android_external_freetype-a56904260208e9306d661349cc2bddfad8f29019.zip
Merge "DO NOT MERGE Update FreeType library to 2.4.7"
Diffstat (limited to 'src/truetype/ttgxvar.c')
-rw-r--r--src/truetype/ttgxvar.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 37bbe6d..69b702f 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -4,7 +4,7 @@
/* */
/* TrueType GX Font Variation loader */
/* */
-/* Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010 by */
+/* Copyright 2004-2011 by */
/* David Turner, Robert Wilhelm, Werner Lemberg, and George Williams. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -1474,6 +1474,9 @@
{
for ( j = 0; j < point_count; ++j )
{
+ if ( localpoints[j] >= n_points )
+ continue;
+
delta_xy[localpoints[j]].x += FT_MulFix( deltas_x[j], apply );
delta_xy[localpoints[j]].y += FT_MulFix( deltas_y[j], apply );
}