/[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 142 Revision 163
442{ 442{
443 if (styles) { 443 if (styles) {
444 psiconv_free_word_style(styles->normal); 444 psiconv_free_word_style(styles->normal);
445 if (styles->styles) 445 if (styles->styles)
446 psiconv_list_free_el(styles->styles,psiconv_free_style_aux); 446 psiconv_list_free_el(styles->styles,psiconv_free_style_aux);
447 free(styles);
447 } 448 }
448} 449}
449 450
450void psiconv_free_header_section(psiconv_header_section header) 451void psiconv_free_header_section(psiconv_header_section header)
451{ 452{
472 free(section->name); 473 free(section->name);
473 free(section); 474 free(section);
474 } 475 }
475} 476}
476 477
478void psiconv_free_object_icon_section(psiconv_object_icon_section section)
479{
480 if (section) {
481 if (section->icon_name)
482 free(section->icon_name);
483 free(section);
484 }
485}
486
487void psiconv_free_object_display_section(psiconv_object_display_section section)
488{
489 if (section)
490 free(section);
491}
492
493void psiconv_free_object(psiconv_object object)
494{
495 if (object) {
496 psiconv_free_object_icon_section(object->icon);
497 psiconv_free_object_display_section(object->display);
498 psiconv_free_file(object->object);
499 free(object);
500 }
501}
502
477void psiconv_free_in_line_layout_aux(void * layout) 503void psiconv_free_in_line_layout_aux(void * layout)
478{ 504{
479 psiconv_free_character_layout(((psiconv_in_line_layout) layout)->layout); 505 psiconv_free_character_layout(((psiconv_in_line_layout) layout)->layout);
506 psiconv_free_object(((psiconv_in_line_layout) layout)->object);
480} 507}
481 508
482void psiconv_free_in_line_layout(psiconv_in_line_layout layout) 509void psiconv_free_in_line_layout(psiconv_in_line_layout layout)
483{ 510{
484 if (layout) { 511 if (layout) {
1314psiconv_sketch_section psiconv_empty_sketch_section(void) 1341psiconv_sketch_section psiconv_empty_sketch_section(void)
1315{ 1342{
1316 psiconv_sketch_section result; 1343 psiconv_sketch_section result;
1317 if (!(result = malloc(sizeof(*result)))) 1344 if (!(result = malloc(sizeof(*result))))
1318 goto ERROR1; 1345 goto ERROR1;
1319 result->form_xsize = 320; 1346 result->displayed_xsize = 320;
1320 result->form_ysize = 200; 1347 result->displayed_ysize = 200;
1321 result->picture_x_offset = result->picture_y_offset = result->picture_xsize = 1348 result->picture_data_x_offset = result->picture_data_y_offset =
1322 result->picture_ysize = 0; 1349 result->form_xsize = result->form_ysize =
1350 result->displayed_size_x_offset = result->displayed_size_y_offset = 0;
1323 result->magnification_x = result->magnification_y = 1.0; 1351 result->magnification_x = result->magnification_y = 1.0;
1324 result->cut_left = result->cut_right = result->cut_top = 1352 result->cut_left = result->cut_right = result->cut_top =
1325 result->cut_bottom = 0.0; 1353 result->cut_bottom = 0.0;
1326 if (!(result->picture = psiconv_empty_paint_data_section())) 1354 if (!(result->picture = psiconv_empty_paint_data_section()))
1327 goto ERROR2; 1355 goto ERROR2;

Legend:
Removed from v.142  
changed lines
  Added in v.163

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