From f720f0dbcf012d6c984dbbefa0875ef9840458c6 Mon Sep 17 00:00:00 2001 From: Jungshik Shin Date: Fri, 15 Jan 2016 16:18:25 -0800 Subject: [DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0 1. Update to a512b0fe7a (several patches past 2.6.2). Major changes include - stem-darkening is OFF for CFF fonts by default - general code tightening - header file location is back to include/freetype (used be include/) 2. A bit more details are added to README.android for the reference. This CL requires a pdfium change (the way it includes FT header files : https://googleplex-android-review.git.corp.google.com/#/c/846889 An AOSP master CL (https://android-review.googlesource.com/#/c/196504/) is ported to mnc-dev. Bug: 24296662 Change-Id: Iec6784838d89098f332e6d1ed79663efd91a8441 Signed-off-by: Jungshik Shin --- src/psaux/t1decode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/psaux/t1decode.c') diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c index 2e19928..5811fcb 100644 --- a/src/psaux/t1decode.c +++ b/src/psaux/t1decode.c @@ -512,7 +512,7 @@ break; case 12: - if ( ip > limit ) + if ( ip >= limit ) { FT_ERROR(( "t1_decoder_parse_charstrings:" " invalid escape (12+EOF)\n" )); @@ -669,7 +669,7 @@ if ( large_int ) FT_TRACE4(( " %ld", value )); else - FT_TRACE4(( " %ld", Fix2Int( value ) )); + FT_TRACE4(( " %ld", value / 65536 )); #endif *top++ = value; -- cgit v1.2.3