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/cff | |
| 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/cff')
| -rw-r--r-- | src/cff/cffobjs.c | 8 | ||||
| -rw-r--r-- | src/cff/cffobjs.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index 2d1204e38..eb6159f74 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -4,7 +4,7 @@ /* */ /* OpenType objects manager (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -207,13 +207,13 @@ { CFF_Face cffface = (CFF_Face)size->face; SFNT_Service sfnt = (SFNT_Service)cffface->sfnt; - FT_ULong index; + FT_ULong strike_index; - if ( sfnt->set_sbit_strike( cffface, req, &index ) ) + if ( sfnt->set_sbit_strike( cffface, req, &strike_index ) ) cffsize->strike_index = 0xFFFFFFFFUL; else - return cff_size_select( size, index ); + return cff_size_select( size, strike_index ); } #endif /* TT_CONFIG_OPTION_EMBEDDED_BITMAPS */ diff --git a/src/cff/cffobjs.h b/src/cff/cffobjs.h index cc4ab644c..f18b5d932 100644 --- a/src/cff/cffobjs.h +++ b/src/cff/cffobjs.h @@ -4,7 +4,7 @@ /* */ /* OpenType objects manager (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2006 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -120,7 +120,7 @@ FT_BEGIN_HEADER FT_LOCAL( FT_Error ) cff_size_select( FT_Size size, - FT_ULong index ); + FT_ULong strike_index ); #endif |