diff options
author | David 'Digit' Turner <digit@google.com> | 2010-03-03 14:24:57 -0800 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2010-03-03 15:33:53 -0800 |
commit | 295ffce55e0198e7a9f7d46b33f5c2b4147bf821 (patch) | |
tree | bda1a337e630483e46b2e4d4db803814437b765d /src/sfnt/ttkern.c | |
parent | 6fb02c1f75ab969890012dd1f01939d3444ddbc1 (diff) | |
download | android_external_freetype-295ffce55e0198e7a9f7d46b33f5c2b4147bf821.tar.gz android_external_freetype-295ffce55e0198e7a9f7d46b33f5c2b4147bf821.tar.bz2 android_external_freetype-295ffce55e0198e7a9f7d46b33f5c2b4147bf821.zip |
Update to FreeType 2.3.12
Diffstat (limited to 'src/sfnt/ttkern.c')
-rw-r--r-- | src/sfnt/ttkern.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/sfnt/ttkern.c b/src/sfnt/ttkern.c index 67d5115..c154080 100644 --- a/src/sfnt/ttkern.c +++ b/src/sfnt/ttkern.c @@ -22,7 +22,6 @@ #include FT_INTERNAL_STREAM_H #include FT_TRUETYPE_TAGS_H #include "ttkern.h" -#include "ttload.h" #include "sferrors.h" @@ -60,14 +59,16 @@ if ( table_size < 4 ) /* the case of a malformed table */ { - FT_ERROR(( "kerning table is too small - ignored\n" )); + FT_ERROR(( "tt_face_load_kern:" + " kerning table is too small - ignored\n" )); error = SFNT_Err_Table_Missing; goto Exit; } if ( FT_FRAME_EXTRACT( table_size, face->kern_table ) ) { - FT_ERROR(( "could not extract kerning table\n" )); + FT_ERROR(( "tt_face_load_kern:" + " could not extract kerning table\n" )); goto Exit; } @@ -86,7 +87,7 @@ { FT_UInt num_pairs, length, coverage; FT_Byte* p_next; - FT_UInt32 mask = 1UL << nn; + FT_UInt32 mask = (FT_UInt32)1UL << nn; if ( p + 6 > p_limit ) @@ -125,8 +126,8 @@ */ if ( num_pairs > 0 ) { - FT_UInt count; - FT_UInt old_pair; + FT_ULong count; + FT_ULong old_pair; old_pair = FT_NEXT_ULONG( p ); |