diff options
| author | Eric Vannier <evannier@google.com> | 2012-03-22 16:08:33 -0700 |
|---|---|---|
| committer | Geremy Condra <gcondra@google.com> | 2012-04-20 14:53:55 -0700 |
| commit | 41371e1e39c8528eb0c4bc40683c736e6683e60c (patch) | |
| tree | ba563af45d79cd0832305fe3833919bb2475f186 /src/truetype/ttpload.c | |
| parent | 27811904d8de0ce5591417812ca31163bf5aad60 (diff) | |
| download | android_external_freetype-41371e1e39c8528eb0c4bc40683c736e6683e60c.tar.gz android_external_freetype-41371e1e39c8528eb0c4bc40683c736e6683e60c.tar.bz2 android_external_freetype-41371e1e39c8528eb0c4bc40683c736e6683e60c.zip | |
Update to freetype 2.4.9
This was done by applying the entire 2.4.9 except for the following exceptions:
- files that were new, or were not present originally in the version of
freetype we were using (meaning that they are present in 2.4.8, and in
2.4.9, but were never integrated into the Android tree because they are
not used in the Android tree).
- ftmodule.h: given that we support fewer modules than in upstream 2.4.9
(same as Android), the file was left unchanged (and there were no changes
from the official 2.4.8 to 2.4.9
- ftoption.h: same reasons as ftmodule.h
Change-Id: Id251f2cc5ca1c864f9a4cc0c67b94025ee3ccc4a
Diffstat (limited to 'src/truetype/ttpload.c')
| -rw-r--r-- | src/truetype/ttpload.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c index 818b29d..bb6005d 100644 --- a/src/truetype/ttpload.c +++ b/src/truetype/ttpload.c @@ -4,7 +4,7 @@ /* */ /* TrueType-specific tables loader (body). */ /* */ -/* Copyright 1996-2002, 2004-2011 by */ +/* Copyright 1996-2002, 2004-2012 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -211,22 +211,22 @@ } /* Check broken location data */ - if ( pos1 >= face->glyf_len ) + if ( pos1 > face->glyf_len ) { FT_TRACE1(( "tt_face_get_location:" - " too large offset=0x%08lx found for gid=0x%04lx," - " exceeding the end of glyf table (0x%08lx)\n", - pos1, gindex, face->glyf_len )); + " too large offset=0x%08lx found for gid=0x%04lx," + " exceeding the end of glyf table (0x%08lx)\n", + pos1, gindex, face->glyf_len )); *asize = 0; return 0; } - if ( pos2 >= face->glyf_len ) + if ( pos2 > face->glyf_len ) { FT_TRACE1(( "tt_face_get_location:" - " too large offset=0x%08lx found for gid=0x%04lx," - " truncate at the end of glyf table (0x%08lx)\n", - pos2, gindex + 1, face->glyf_len )); + " too large offset=0x%08lx found for gid=0x%04lx," + " truncate at the end of glyf table (0x%08lx)\n", + pos2, gindex + 1, face->glyf_len )); pos2 = face->glyf_len; } |