Fix compiler warnings.

* src/truetype/ttgload.c (tt_get_metrics): Put `Exit' label into the
proper preprocessor conditional.
* src/pfr/pfrobjs.c (pfr_slot_load): Pacify gcc.
This commit is contained in:
Werner Lemberg 2009-12-03 05:57:30 +01:00
parent 087b7ea667
commit 9045f5bdf2
3 changed files with 13 additions and 4 deletions

View File

@ -1,3 +1,11 @@
2009-12-03 Werner Lemberg <wl@gnu.org>
Fix compiler warnings.
* src/truetype/ttgload.c (tt_get_metrics): Put `Exit' label into the
proper preprocessor conditional.
* src/pfr/pfrobjs.c (pfr_slot_load): Pacify gcc.
2009-11-25 John Tytgat <John.Tytgat@esko.com>
Better handling of start of `eexec' section.

View File

@ -4,7 +4,7 @@
/* */
/* FreeType PFR bitmap loader (body). */
/* */
/* Copyright 2002, 2003, 2006 by */
/* Copyright 2002, 2003, 2006, 2009 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -600,8 +600,8 @@
/* get the bitmap metrics */
{
FT_Long xpos, ypos, advance;
FT_UInt xsize, ysize, format;
FT_Long xpos = 0, ypos = 0, advance = 0;
FT_UInt xsize = 0, ysize = 0, format = 0;
FT_Byte* p;

View File

@ -204,9 +204,10 @@
}
Exit:
#endif /* FT_CONFIG_OPTION_INCREMENTAL */
Exit:
loader->left_bearing = left_bearing;
loader->advance = advance_width;
loader->top_bearing = top_bearing;