From 9045f5bdf2ddb9628530392cc90528752e6f9567 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 3 Dec 2009 05:57:30 +0100 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ src/pfr/pfrsbit.c | 6 +++--- src/truetype/ttgload.c | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18d94eb87..68818c044 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-12-03 Werner Lemberg + + 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 Better handling of start of `eexec' section. diff --git a/src/pfr/pfrsbit.c b/src/pfr/pfrsbit.c index 8a38bec1d..d2f17dc9c 100644 --- a/src/pfr/pfrsbit.c +++ b/src/pfr/pfrsbit.c @@ -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; diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index 1a32ec30c..68f4b077d 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -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;