diff options
| author | Werner Lemberg <wl@gnu.org> | 2007-01-15 06:42:40 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2007-01-15 06:42:40 +0000 |
| commit | 8c4120d0a390f00beef69859f09da3de4f731feb (patch) | |
| tree | 12cfb628115ef9f209489e1109c3102355506082 /src/gxvalid | |
| parent | 6164a9d13b5127614bee9ca9228bae54eec2c065 (diff) | |
| download | freetype2-8c4120d0a390f00beef69859f09da3de4f731feb.tar.gz | |
Fix various compiler warnings.
* src/truetype/ttdriver.c (tt_size_select), src/cff/cffobjs.h,
src/cff/cffobjs.c (cff_size_request), src/type42/t42objs.h:
s/index/strike_index/.
* src/base/ftobjs.c (FT_Match_Size): s/index/size_index/.
* src/gxvalid/gxvmorx5.c
(gxv_morx_subtable_type5_InsertList_validate): s/index/table_index/.
* src/truetype/ttinterp.c (Compute_Point_Displacement),
src/pcf/pcfread.c (pcf_seek_to_table_type): Avoid possibly
uninitialized variables.
Diffstat (limited to 'src/gxvalid')
| -rw-r--r-- | src/gxvalid/gxvmorx5.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gxvalid/gxvmorx5.c b/src/gxvalid/gxvmorx5.c index 2920f5471..d9115618c 100644 --- a/src/gxvalid/gxvmorx5.c +++ b/src/gxvalid/gxvmorx5.c @@ -5,7 +5,7 @@ /* TrueTypeGX/AAT morx table validation */ /* body for type5 (Contextual Glyph Insertion) subtable. */ /* */ -/* Copyright 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ +/* Copyright 2005, 2007 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -109,16 +109,16 @@ static void - gxv_morx_subtable_type5_InsertList_validate( FT_UShort index, + gxv_morx_subtable_type5_InsertList_validate( FT_UShort table_index, FT_UShort count, FT_Bytes table, FT_Bytes limit, GXV_Validator valid ) { - FT_Bytes p = table + index * 2; + FT_Bytes p = table + table_index * 2; - while ( p < table + count * 2 + index * 2 ) + while ( p < table + count * 2 + table_index * 2 ) { FT_UShort insert_glyphID; |