diff options
author | Geremy Condra <gcondra@google.com> | 2011-11-17 14:08:04 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-17 14:08:04 -0800 |
commit | a56904260208e9306d661349cc2bddfad8f29019 (patch) | |
tree | 720489aa1d9176e568acf0f8cb441a3f8cb0663f /src/cff/cffload.c | |
parent | ec53de77a7ec24f862372a39333f8e91708a806d (diff) | |
parent | bff90fb5ec88ad7fdfb6d1d2f5a5719c20a2c5dc (diff) | |
download | android_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/cff/cffload.c')
-rw-r--r-- | src/cff/cffload.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/cff/cffload.c b/src/cff/cffload.c index 629d38e..8bbf474 100644 --- a/src/cff/cffload.c +++ b/src/cff/cffload.c @@ -4,8 +4,7 @@ /* */ /* OpenType and CFF data/program tables loader (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, */ -/* 2010 by */ +/* Copyright 1996-2011 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -1269,7 +1268,7 @@ if ( gid != 0 ) { encoding->codes[j] = (FT_UShort)gid; - encoding->count = j + 1; + encoding->count = j + 1; } else { @@ -1337,7 +1336,10 @@ error = cff_index_access_element( idx, font_index, &dict, &dict_len ); if ( !error ) + { + FT_TRACE4(( " top dictionary:\n" )); error = cff_parser_run( &parser, dict, dict + dict_len ); + } cff_index_forget_element( idx, &dict ); @@ -1366,6 +1368,7 @@ FT_FRAME_ENTER( font->font_dict.private_size ) ) goto Exit; + FT_TRACE4(( " private dictionary:\n" )); error = cff_parser_run( &parser, (FT_Byte*)stream->cursor, (FT_Byte*)stream->limit ); @@ -1494,6 +1497,7 @@ goto Exit; /* now, parse the top-level font dictionary */ + FT_TRACE4(( "parsing top-level\n" )); error = cff_subfont_load( &font->top_font, &font->font_dict_index, face_index, @@ -1546,6 +1550,7 @@ for ( idx = 0; idx < fd_index.count; idx++ ) { sub = font->subfonts[idx]; + FT_TRACE4(( "parsing subfont %u\n", idx )); error = cff_subfont_load( sub, &fd_index, idx, stream, base_offset, library ); if ( error ) |