--- psiconv/trunk/lib/psiconv/data.c 1999/10/03 21:10:47 2 +++ psiconv/trunk/lib/psiconv/data.c 1999/10/11 16:15:14 12 @@ -32,6 +32,7 @@ static void psiconv_free_style_aux(void *style); static void psiconv_free_in_line_layout_aux(void * layout); static void psiconv_free_paragraph_aux(void * paragraph); +static void psiconv_free_paint_data_section_aux(void * section); psiconv_character_layout psiconv_basic_character_layout(void) { @@ -455,11 +456,62 @@ } } +void psiconv_free_texted_f(psiconv_texted_f file) +{ + if (file) { + psiconv_free_page_layout_section(file->page_sec); + psiconv_free_texted_section(file->texted_sec); + free(file); + } +} + +void psiconv_free_paint_data_section_aux(void * section) +{ + if (((psiconv_paint_data_section) section)->red) + free(((psiconv_paint_data_section)section) -> red); + if (((psiconv_paint_data_section) section)->green) + free(((psiconv_paint_data_section)section) -> green); + if (((psiconv_paint_data_section) section)->blue) + free(((psiconv_paint_data_section)section) -> blue); +} + +void psiconv_free_paint_data_section(psiconv_paint_data_section section) +{ + if (section) { + psiconv_free_paint_data_section_aux(section); + free(section); + } +} + +void psiconv_free_pictures(psiconv_pictures section) +{ + if (section) + psiconv_list_free_el(section,&psiconv_free_paint_data_section_aux); +} + +void psiconv_free_mbm_f(psiconv_mbm_f file) +{ + if (file) { + psiconv_free_pictures(file->sections); + free(file); + } +} + +void psiconv_free_mbm_jumptable_section (psiconv_mbm_jumptable_section section) +{ + if (section) + psiconv_list_free(section); +} + void psiconv_free_file(psiconv_file file) { if (file) { if (file->type == psiconv_word_file) psiconv_free_word_f((psiconv_word_f) file->file); + else if (file->type == psiconv_texted_file) + psiconv_free_texted_f((psiconv_texted_f) file->file); + else if (file->type == psiconv_mbm_file) + psiconv_free_mbm_f((psiconv_mbm_f) file->file); free(file); } }