Commit 9045f5bdf2ddb9628530392cc90528752e6f9567
2009-12-03T05:57:30
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
diff --git a/ChangeLog b/ChangeLog
index 18d94eb..68818c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/src/pfr/pfrsbit.c b/src/pfr/pfrsbit.c
index 8a38bec..d2f17dc 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 1a32ec3..68f4b07 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;