diff options
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/font_load_ft.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index 1ddd15d268..d7f6e85f7b 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -836,36 +836,18 @@ static int prepare_charset_unicode(FT_Face face, FT_ULong *charset, FT_ULong *ch static font_desc_t* init_font_desc(void) { font_desc_t *desc; - int i; - desc = malloc(sizeof(font_desc_t)); + desc = calloc(1, sizeof(*desc)); if(!desc) return NULL; - memset(desc,0,sizeof(font_desc_t)); desc->dynamic = 1; /* setup sane defaults */ - desc->name = NULL; - desc->fpath = NULL; - - desc->face_cnt = 0; - desc->charspace = 0; - desc->spacewidth = 0; - desc->height = 0; - desc->max_width = 0; - desc->max_height = 0; desc->freetype = 1; - desc->tables.g = NULL; - desc->tables.gt2 = NULL; - desc->tables.om = NULL; - desc->tables.omt = NULL; - desc->tables.tmp = NULL; - - for(i = 0; i < 65536; i++) - desc->start[i] = desc->width[i] = desc->font[i] = -1; - for(i = 0; i < 16; i++) - desc->pic_a[i] = desc->pic_b[i] = NULL; + memset(desc->start, 0xff, sizeof(desc->start)); + memset(desc->width, 0xff, sizeof(desc->width)); + memset(desc->font, 0xff, sizeof(desc->font)); return desc; } |