From 297043def1894c57b836e8872098fb98168980ef Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sat, 22 May 2004 08:10:26 +0000 Subject: [PATCH] memset ogl font bitmap data since the copy function leaves some (unused) parts uninitialized, which aggravates valgrind (d1x r1.14) --- 2d/font.c | 3 ++- ChangeLog | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/2d/font.c b/2d/font.c index fec3763f..c9a74ab2 100644 --- a/2d/font.c +++ b/2d/font.c @@ -1,4 +1,4 @@ -/* $Id: font.c,v 1.27 2004-05-15 16:25:35 schaffner Exp $ */ +/* $Id: font.c,v 1.28 2004-05-22 08:10:26 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -1205,6 +1205,7 @@ void ogl_init_font(grs_font * font){ // char s[2]; ogl_font_choose_size(font,gap,&tw,&th); data=d_malloc(tw*th); + memset(data, 0, tw * th); gr_init_bitmap(&font->ft_parent_bitmap,BM_LINEAR,0,0,tw,th,tw,data); font->ft_parent_bitmap.gltexture=ogl_get_free_texture(); diff --git a/ChangeLog b/ChangeLog index 3a95e706..90e448fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-05-22 Matthew Mueller + * 2d/font.c: memset ogl font bitmap data since the copy function + leaves some (unused) parts uninitialized, which aggravates + valgrind (d1x r1.14) + * arch/win32/joyhh.c: fix phantom hat when used with a joystick without one, since the code ignored the JOYCAPS_HASPOV flag (d1x r1.5) -- 2.39.2