/[public]/psiconv/trunk/lib/psiconv/data.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/data.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 24 Revision 41
32static psiconv_all_tabs clone_all_tabs(psiconv_all_tabs all_tabs); 32static psiconv_all_tabs clone_all_tabs(psiconv_all_tabs all_tabs);
33static void psiconv_free_style_aux(void *style); 33static void psiconv_free_style_aux(void *style);
34static void psiconv_free_in_line_layout_aux(void * layout); 34static void psiconv_free_in_line_layout_aux(void * layout);
35static void psiconv_free_paragraph_aux(void * paragraph); 35static void psiconv_free_paragraph_aux(void * paragraph);
36static void psiconv_free_paint_data_section_aux(void * section); 36static void psiconv_free_paint_data_section_aux(void * section);
37static void psiconv_free_clipart_section_aux(psiconv_clipart_section section);
37 38
38psiconv_character_layout psiconv_basic_character_layout(void) 39psiconv_character_layout psiconv_basic_character_layout(void)
39{ 40{
40 /* Make the structures static, to oblige IRIX */ 41 /* Make the structures static, to oblige IRIX */
41 static struct psiconv_color black = 42 static struct psiconv_color black =
511 psiconv_free_sketch_section(file->sketch_sec); 512 psiconv_free_sketch_section(file->sketch_sec);
512 free(file); 513 free(file);
513 } 514 }
514} 515}
515 516
517void psiconv_free_clipart_section_aux(psiconv_clipart_section section)
518{
519 if (section)
520 free(section->picture);
521}
522
523void psiconv_free_clipart_section(psiconv_clipart_section section)
524{
525 if (section) {
526 psiconv_free_clipart_section_aux(section);
527 free(section);
528 }
529}
530
531void psiconv_free_cliparts(psiconv_cliparts section)
532{
533 if (section)
534 psiconv_list_free_el(section,&psiconv_free_clipart_section_aux);
535}
536
537void psiconv_free_clipart_f(psiconv_clipart_f file)
538{
539 if (file) {
540 psiconv_free_cliparts(file->sections);
541 free(file);
542 }
543}
544
516void psiconv_free_file(psiconv_file file) 545void psiconv_free_file(psiconv_file file)
517{ 546{
518 if (file) { 547 if (file) {
519 if (file->type == psiconv_word_file) 548 if (file->type == psiconv_word_file)
520 psiconv_free_word_f((psiconv_word_f) file->file); 549 psiconv_free_word_f((psiconv_word_f) file->file);
522 psiconv_free_texted_f((psiconv_texted_f) file->file); 551 psiconv_free_texted_f((psiconv_texted_f) file->file);
523 else if (file->type == psiconv_mbm_file) 552 else if (file->type == psiconv_mbm_file)
524 psiconv_free_mbm_f((psiconv_mbm_f) file->file); 553 psiconv_free_mbm_f((psiconv_mbm_f) file->file);
525 else if (file->type == psiconv_sketch_file) 554 else if (file->type == psiconv_sketch_file)
526 psiconv_free_sketch_f((psiconv_sketch_f) file->file); 555 psiconv_free_sketch_f((psiconv_sketch_f) file->file);
556 else if (file->type == psiconv_clipart_file)
557 psiconv_free_sketch_f((psiconv_clipart_f) file->file);
527 free(file); 558 free(file);
528 } 559 }
529} 560}

Legend:
Removed from v.24  
changed lines
  Added in v.41

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26