From 5cb356405eb9f9cad624487a0b836ff6e6f51d6c Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 10 Dec 2011 23:16:04 +0100 Subject: [PATCH] Add some variable initializations. Reported by Richard COOK . * src/type1/t1driver.c (t1_ps_get_font_value): Initialize `val'. * src/smooth/ftgrays.c (gray_render_conic): Initialize `levels' earlier. --- ChangeLog | 9 +++++++++ src/smooth/ftgrays.c | 3 ++- src/type1/t1driver.c | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index becfa0037..1dc61e0f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-12-10 Werner Lemberg + + Add some variable initializations. + Reported by Richard COOK . + + * src/type1/t1driver.c (t1_ps_get_font_value): Initialize `val'. + * src/smooth/ftgrays.c (gray_render_conic): Initialize `levels' + earlier. + 2011-12-08 Werner Lemberg Fix serious scaling bug in `FT_Get_Advances'. diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index f7d4d0cb8..a7a18f23d 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -878,6 +878,8 @@ typedef ptrdiff_t FT_PtrDist; FT_Vector* arc; + levels = ras.lev_stack; + arc = ras.bez_stack; arc[0].x = UPSCALE( to->x ); arc[0].y = UPSCALE( to->y ); @@ -916,7 +918,6 @@ typedef ptrdiff_t FT_PtrDist; level++; } while ( dx > ONE_PIXEL / 4 ); - levels = ras.lev_stack; levels[0] = level; do diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c index 9391a391b..e35d7b11d 100644 --- a/src/type1/t1driver.c +++ b/src/type1/t1driver.c @@ -195,7 +195,7 @@ if ( idx < sizeof ( type1->font_matrix ) / sizeof ( type1->font_matrix.xx ) ) { - FT_Fixed val; + FT_Fixed val = 0; retval = sizeof ( val ); @@ -225,7 +225,7 @@ if ( idx < sizeof ( type1->font_bbox ) / sizeof ( type1->font_bbox.xMin ) ) { - FT_Fixed val; + FT_Fixed val = 0; retval = sizeof ( val );