diff options
author | Nick Kralevich <nnk@google.com> | 2010-09-14 17:02:58 -0700 |
---|---|---|
committer | Nick Kralevich <nnk@google.com> | 2010-09-15 10:32:30 -0700 |
commit | aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c (patch) | |
tree | 2b4c5412391bf31f6a54b237ea83bfde05ec3802 /src/pshinter/pshalgo.c | |
parent | d4476115dee94297c020b3a2b067188117424e25 (diff) | |
download | android_external_freetype-aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c.tar.gz android_external_freetype-aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c.tar.bz2 android_external_freetype-aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c.zip |
upgrade freetype to 2.4.2.
Bug: 2969145
Change-Id: I8debbbe0bd478d9cf8c39cff5179981b5f3b371a
Diffstat (limited to 'src/pshinter/pshalgo.c')
-rw-r--r-- | src/pshinter/pshalgo.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/pshinter/pshalgo.c b/src/pshinter/pshalgo.c index 417dcee..4b08785 100644 --- a/src/pshinter/pshalgo.c +++ b/src/pshinter/pshalgo.c @@ -4,7 +4,8 @@ /* */ /* PostScript hinting algorithm (body). */ /* */ -/* Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by */ +/* Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 */ +/* by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used */ @@ -1690,7 +1691,10 @@ /* process secondary hints to `selected' points */ if ( num_masks > 1 && glyph->num_points > 0 ) { - first = mask->end_point; + /* the `endchar' op can reduce the number of points */ + first = mask->end_point > glyph->num_points + ? glyph->num_points + : mask->end_point; mask++; for ( ; num_masks > 1; num_masks--, mask++ ) { @@ -1698,7 +1702,9 @@ FT_Int count; - next = mask->end_point; + next = mask->end_point > glyph->num_points + ? glyph->num_points + : mask->end_point; count = next - first; if ( count > 0 ) { |