diff options
author | Werner Lemberg <wl@gnu.org> | 2002-03-07 21:59:59 +0000 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2002-03-07 21:59:59 +0000 |
commit | 769430fc03ffc31ddfdbb00f6f101c2b9f4d3800 (patch) | |
tree | b702edb508f038bcffafc4a354209740e5090cab /src/sfnt | |
parent | 004b8906743a70abcaabad3bb3af3da9c76609fe (diff) | |
download | freetype2-769430fc03ffc31ddfdbb00f6f101c2b9f4d3800.tar.gz |
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
Diffstat (limited to 'src/sfnt')
-rw-r--r-- | src/sfnt/ttpost.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c index fa2baeec4..628ec63fd 100644 --- a/src/sfnt/ttpost.c +++ b/src/sfnt/ttpost.c @@ -204,15 +204,15 @@ for ( n = 0; n < num_glyphs; n++ ) { - FT_Int index; + FT_Int idx; - index = glyph_indices[n]; - if ( index >= 258 ) + idx = glyph_indices[n]; + if ( idx >= 258 ) { - index -= 257; - if ( index > num_names ) - num_names = (FT_UShort)index; + idx -= 257; + if ( idx > num_names ) + num_names = (FT_UShort)idx; } } } @@ -303,10 +303,10 @@ for ( n = 0; n < num_glyphs; n++ ) { - FT_Long index = (FT_Long)n + offset_table[n]; + FT_Long idx = (FT_Long)n + offset_table[n]; - if ( index < 0 || index > num_glyphs ) + if ( idx < 0 || idx > num_glyphs ) { error = SFNT_Err_Invalid_File_Format; goto Fail; @@ -431,7 +431,7 @@ /* <Input> */ /* face :: A handle to the parent face. */ /* */ - /* index :: The glyph index. */ + /* idx :: The glyph index. */ /* */ /* PSname :: The address of a string pointer. Will be NULL in case */ /* of error, otherwise it is a pointer to the glyph name. */ @@ -443,7 +443,7 @@ /* */ FT_LOCAL_DEF( FT_Error ) TT_Get_PS_Name( TT_Face face, - FT_UInt index, + FT_UInt idx, FT_String** PSname ) { FT_Error error; @@ -457,7 +457,7 @@ if ( !face ) return SFNT_Err_Invalid_Face_Handle; - if ( index >= (FT_UInt)face->root.num_glyphs ) + if ( idx >= (FT_UInt)face->root.num_glyphs ) return SFNT_Err_Invalid_Glyph_Index; #ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES @@ -474,8 +474,8 @@ switch ( face->postscript.FormatType ) { case 0x00010000L: - if ( index < 258 ) /* paranoid checking */ - *PSname = MAC_NAME( index ); + if ( idx < 258 ) /* paranoid checking */ + *PSname = MAC_NAME( idx ); break; case 0x00020000L: @@ -490,9 +490,9 @@ break; } - if ( index < (FT_UInt)table->num_glyphs ) + if ( idx < (FT_UInt)table->num_glyphs ) { - FT_UShort name_index = table->glyph_indices[index]; + FT_UShort name_index = table->glyph_indices[idx]; if ( name_index < 258 ) @@ -515,10 +515,10 @@ break; } - if ( index < (FT_UInt)table->num_glyphs ) /* paranoid checking */ + if ( idx < (FT_UInt)table->num_glyphs ) /* paranoid checking */ { - index += table->offsets[index]; - *PSname = MAC_NAME( index ); + idx += table->offsets[idx]; + *PSname = MAC_NAME( idx ); } } break; |