summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2011-12-10 23:16:04 +0100
committerWerner Lemberg <wl@gnu.org>2011-12-10 23:16:04 +0100
commit5cb356405eb9f9cad624487a0b836ff6e6f51d6c (patch)
treec848cbd17f8c836c138a779bd7ab3fac9dde743c
parent2fb22d56491235ac44073b73be0bb6444aaf6d46 (diff)
downloadfreetype2-5cb356405eb9f9cad624487a0b836ff6e6f51d6c.tar.gz
Add some variable initializations.
Reported by Richard COOK <rscook@unicode.org>. * src/type1/t1driver.c (t1_ps_get_font_value): Initialize `val'. * src/smooth/ftgrays.c (gray_render_conic): Initialize `levels' earlier.
-rw-r--r--ChangeLog9
-rw-r--r--src/smooth/ftgrays.c3
-rw-r--r--src/type1/t1driver.c4
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 <wl@gnu.org>
+
+ Add some variable initializations.
+ Reported by Richard COOK <rscook@unicode.org>.
+
+ * 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 <wl@gnu.org>
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 );