# HG changeset patch
# User henry
# Date 1043956723 0
# Node ID 237b7e51521a0c03bfedf4c6ea811d4a03b1362b
# Parent  e11fea5663b2f69f1498c57bb41a1f4e10095cfa
better fix of vo_aa font segfault

diff -r e11fea5663b2 -r 237b7e51521a libvo/font_load_ft.c
--- a/libvo/font_load_ft.c	Thu Jan 30 19:35:10 2003 +0000
+++ b/libvo/font_load_ft.c	Thu Jan 30 19:58:43 2003 +0000
@@ -867,7 +867,7 @@
     
     if (!desc) return;
 
-    if (!desc->dynamic) return; // some vo_aa crap, better leaking than crashing
+//    if (!desc->dynamic) return; // some vo_aa crap, better leaking than crashing
 
     if (desc->name) free(desc->name);
     if (desc->fpath) free(desc->fpath);
diff -r e11fea5663b2 -r 237b7e51521a libvo/vo_aa.c
--- a/libvo/vo_aa.c	Thu Jan 30 19:35:10 2003 +0000
+++ b/libvo/vo_aa.c	Thu Jan 30 19:58:43 2003 +0000
@@ -254,7 +254,9 @@
       vo_font=malloc(sizeof(font_desc_t));//if(!desc) return NULL;
       memset(vo_font,0,sizeof(font_desc_t));
       vo_font->pic_a[0]=malloc(sizeof(raw_file));
+      memset(vo_font->pic_a[0],0,sizeof(raw_file));
       vo_font->pic_b[0]=malloc(sizeof(raw_file));
+      memset(vo_font->pic_b[0],0,sizeof(raw_file));
 
 #ifdef HAVE_FREETYPE
       vo_font->dynamic = 0;
@@ -264,7 +266,9 @@
       vo_font->charspace=0;
       vo_font->height=1;
       vo_font->pic_a[0]->bmp=malloc(255);
+      vo_font->pic_a[0]->pal=NULL;
       vo_font->pic_b[0]->bmp=malloc(255);
+      vo_font->pic_b[0]->pal=NULL;
       vo_font->pic_a[0]->w=1;
       vo_font->pic_a[0]->h=1;
       for (i=0; i<255; i++){