1 | /* |
1 | /* |
2 | data.c - Part of psiconv, a PSION 5 file formats converter |
2 | data.c - Part of psiconv, a PSION 5 file formats converter |
3 | Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl> |
3 | Copyright (c) 1999-2005 Frodo Looijaard <frodo@frodo.looijaard.name> |
4 | |
4 | |
5 | This program is free software; you can redistribute it and/or modify |
5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by |
6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or |
7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. |
8 | (at your option) any later version. |
… | |
… | |
21 | #include "compat.h" |
21 | #include "compat.h" |
22 | #include <stdlib.h> |
22 | #include <stdlib.h> |
23 | #include <string.h> |
23 | #include <string.h> |
24 | #include "data.h" |
24 | #include "data.h" |
25 | #include "list.h" |
25 | #include "list.h" |
|
|
26 | #include "unicode.h" |
|
|
27 | #include "error.h" |
|
|
28 | |
|
|
29 | #ifdef DMALLOC |
|
|
30 | #include <dmalloc.h> |
|
|
31 | #endif |
26 | |
32 | |
27 | static psiconv_color clone_color(psiconv_color color); |
33 | static psiconv_color clone_color(psiconv_color color); |
28 | static psiconv_font clone_font(psiconv_font font); |
34 | static psiconv_font clone_font(psiconv_font font); |
29 | static psiconv_border clone_border(psiconv_border border); |
35 | static psiconv_border clone_border(psiconv_border border); |
30 | static psiconv_bullet clone_bullet(psiconv_bullet bullet); |
36 | static psiconv_bullet clone_bullet(psiconv_bullet bullet); |
… | |
… | |
33 | static void psiconv_free_in_line_layout_aux(void * layout); |
39 | static void psiconv_free_in_line_layout_aux(void * layout); |
34 | static void psiconv_free_paragraph_aux(void * paragraph); |
40 | static void psiconv_free_paragraph_aux(void * paragraph); |
35 | static void psiconv_free_paint_data_section_aux(void * section); |
41 | static void psiconv_free_paint_data_section_aux(void * section); |
36 | static void psiconv_free_clipart_section_aux(void * section); |
42 | static void psiconv_free_clipart_section_aux(void * section); |
37 | static void psiconv_free_formula_aux(void *data); |
43 | static void psiconv_free_formula_aux(void *data); |
|
|
44 | static void psiconv_free_sheet_worksheet_aux (void *data); |
|
|
45 | static void psiconv_free_sheet_variable_aux(void * variable); |
|
|
46 | static void psiconv_free_sheet_cell_aux(void *cell); |
|
|
47 | static void psiconv_free_sheet_line_aux(void *line); |
|
|
48 | static void psiconv_free_sheet_worksheet_aux (void *data); |
38 | |
49 | |
39 | static psiconv_word_styles_section psiconv_empty_word_styles_section(void); |
50 | static psiconv_word_styles_section psiconv_empty_word_styles_section(void); |
40 | static psiconv_text_and_layout psiconv_empty_text_and_layout(void); |
51 | static psiconv_text_and_layout psiconv_empty_text_and_layout(void); |
41 | static psiconv_texted_section psiconv_empty_texted_section(void); |
52 | static psiconv_texted_section psiconv_empty_texted_section(void); |
42 | static psiconv_page_header psiconv_empty_page_header(void); |
53 | static psiconv_page_header psiconv_empty_page_header(void); |
… | |
… | |
73 | { |
84 | { |
74 | 0xff, /* red */ |
85 | 0xff, /* red */ |
75 | 0xff, /* green */ |
86 | 0xff, /* green */ |
76 | 0xff, /* blue */ |
87 | 0xff, /* blue */ |
77 | }; |
88 | }; |
|
|
89 | static psiconv_ucs2 font_times[16] = { 'T','i','m','e','s',' ', |
|
|
90 | 'N','e','w',' ', |
|
|
91 | 'R','o','m','a','n',0 }; |
78 | static struct psiconv_font_s font = |
92 | static struct psiconv_font_s font = |
79 | { |
93 | { |
80 | "Times New Roman", /* name */ |
94 | font_times, /* name */ |
81 | 3 /* screenfont */ |
95 | 3 /* screenfont */ |
82 | }; |
96 | }; |
83 | struct psiconv_character_layout_s cl = |
97 | struct psiconv_character_layout_s cl = |
84 | { |
98 | { |
85 | &black, /* color */ |
99 | &black, /* color */ |
… | |
… | |
98 | |
112 | |
99 | /* Note: these defaults seem to be hard-coded somewhere outside the |
113 | /* Note: these defaults seem to be hard-coded somewhere outside the |
100 | files themself. */ |
114 | files themself. */ |
101 | psiconv_paragraph_layout psiconv_basic_paragraph_layout(void) |
115 | psiconv_paragraph_layout psiconv_basic_paragraph_layout(void) |
102 | { |
116 | { |
|
|
117 | static psiconv_ucs2 font_times[16] = { 'T','i','m','e','s',' ', |
|
|
118 | 'N','e','w',' ', |
|
|
119 | 'R','o','m','a','n',0 }; |
|
|
120 | |
103 | static struct psiconv_font_s font = |
121 | static struct psiconv_font_s font = |
104 | { |
122 | { |
105 | "Times New Roman", /* name */ |
123 | font_times, /* name */ |
106 | 2 /* screenfont */ |
124 | 2 /* screenfont */ |
107 | }; |
125 | }; |
108 | static struct psiconv_color_s black = |
126 | static struct psiconv_color_s black = |
109 | { |
127 | { |
110 | 0x00, /* red */ |
128 | 0x00, /* red */ |
… | |
… | |
125 | }; |
143 | }; |
126 | static struct psiconv_bullet_s bullet = |
144 | static struct psiconv_bullet_s bullet = |
127 | { |
145 | { |
128 | psiconv_bool_false, /* on */ |
146 | psiconv_bool_false, /* on */ |
129 | 10.0, /* font_size */ |
147 | 10.0, /* font_size */ |
130 | 0x95, /* character */ |
148 | 0x201d, /* character */ |
131 | psiconv_bool_true, /* indent */ |
149 | psiconv_bool_true, /* indent */ |
132 | &black, /* color */ |
150 | &black, /* color */ |
133 | &font, /* font */ |
151 | &font, /* font */ |
134 | }; |
152 | }; |
135 | static struct psiconv_all_tabs_s tabs = |
153 | static struct psiconv_all_tabs_s tabs = |
… | |
… | |
184 | { |
202 | { |
185 | psiconv_font result; |
203 | psiconv_font result; |
186 | if(!(result = malloc(sizeof(*result)))) |
204 | if(!(result = malloc(sizeof(*result)))) |
187 | goto ERROR1; |
205 | goto ERROR1; |
188 | *result = *font; |
206 | *result = *font; |
189 | if (!(result->name = strdup(result->name))) |
207 | if (!(result->name = psiconv_unicode_strdup(result->name))) |
190 | goto ERROR2; |
208 | goto ERROR2; |
191 | return result; |
209 | return result; |
192 | ERROR2: |
210 | ERROR2: |
193 | free(result); |
211 | free(result); |
194 | ERROR1: |
212 | ERROR1: |
… | |
… | |
316 | return ss->normal; |
334 | return ss->normal; |
317 | else |
335 | else |
318 | return psiconv_list_get(ss->styles,0xff - nr); |
336 | return psiconv_list_get(ss->styles,0xff - nr); |
319 | } |
337 | } |
320 | |
338 | |
|
|
339 | int psiconv_find_style(const psiconv_word_styles_section ss, |
|
|
340 | const psiconv_ucs2 *name, |
|
|
341 | int *nr) |
|
|
342 | { |
|
|
343 | const psiconv_ucs2 value_normal[] = { 'N','o','r','m','a','l',0 }; |
|
|
344 | psiconv_word_style style; |
|
|
345 | int i; |
|
|
346 | |
|
|
347 | if (!nr) |
|
|
348 | return PSICONV_E_OTHER; |
|
|
349 | if(!psiconv_unicode_strcmp(value_normal,name)) { |
|
|
350 | *nr = 0; |
|
|
351 | return 0; |
|
|
352 | } |
|
|
353 | for (i = 0; i < psiconv_list_length(ss->styles);i++) { |
|
|
354 | if (!(style = psiconv_list_get(ss->styles,i))) |
|
|
355 | return PSICONV_E_NOMEM; |
|
|
356 | if (!psiconv_unicode_strcmp(style->name,name)) { |
|
|
357 | *nr = 0xff - i; |
|
|
358 | return 0; |
|
|
359 | } |
|
|
360 | } |
|
|
361 | *nr = 0; |
|
|
362 | return PSICONV_E_OTHER; |
|
|
363 | } |
|
|
364 | |
|
|
365 | |
|
|
366 | psiconv_formula psiconv_get_formula (psiconv_formula_list ss, int nr) |
|
|
367 | { |
|
|
368 | return psiconv_list_get(ss,psiconv_list_length(ss)-nr-1); |
|
|
369 | } |
|
|
370 | |
|
|
371 | /* TODO: What if a cell is both in a default row and a default column?!? */ |
|
|
372 | psiconv_sheet_cell_layout psiconv_get_default_layout |
|
|
373 | (psiconv_sheet_line_list row_defaults, |
|
|
374 | psiconv_sheet_line_list col_defaults, |
|
|
375 | psiconv_sheet_cell_layout cell_default, |
|
|
376 | int row,int col) |
|
|
377 | { |
|
|
378 | int i; |
|
|
379 | psiconv_sheet_line line; |
|
|
380 | for (i = 0;i < psiconv_list_length(row_defaults);i++) { |
|
|
381 | line = psiconv_list_get(row_defaults,i); |
|
|
382 | if (line->position == row) |
|
|
383 | return line->layout; |
|
|
384 | } |
|
|
385 | for (i = 0;i < psiconv_list_length(col_defaults);i++) { |
|
|
386 | line = psiconv_list_get(col_defaults,i); |
|
|
387 | if (line->position == col) |
|
|
388 | return line->layout; |
|
|
389 | } |
|
|
390 | return cell_default; |
|
|
391 | } |
|
|
392 | |
|
|
393 | |
321 | void psiconv_free_color (psiconv_color color) |
394 | void psiconv_free_color (psiconv_color color) |
322 | { |
395 | { |
323 | if (color) |
396 | if (color) |
324 | free(color); |
397 | free(color); |
325 | } |
398 | } |
… | |
… | |
402 | psiconv_free_style_aux(style); |
475 | psiconv_free_style_aux(style); |
403 | free(style); |
476 | free(style); |
404 | } |
477 | } |
405 | } |
478 | } |
406 | |
479 | |
|
|
480 | void psiconv_free_word_style_list(psiconv_word_style_list style_list) |
|
|
481 | { |
|
|
482 | if (style_list) |
|
|
483 | psiconv_list_free_el(style_list,psiconv_free_style_aux); |
|
|
484 | } |
|
|
485 | |
407 | void psiconv_free_word_styles_section(psiconv_word_styles_section styles) |
486 | void psiconv_free_word_styles_section(psiconv_word_styles_section styles) |
408 | { |
487 | { |
409 | if (styles) { |
488 | if (styles) { |
410 | psiconv_free_word_style(styles->normal); |
489 | psiconv_free_word_style(styles->normal); |
411 | if (styles->styles) |
490 | psiconv_free_word_style_list(styles->styles); |
412 | psiconv_list_free_el(styles->styles,psiconv_free_style_aux); |
491 | free(styles); |
413 | } |
492 | } |
414 | } |
493 | } |
415 | |
494 | |
416 | void psiconv_free_header_section(psiconv_header_section header) |
495 | void psiconv_free_header_section(psiconv_header_section header) |
417 | { |
496 | { |
… | |
… | |
438 | free(section->name); |
517 | free(section->name); |
439 | free(section); |
518 | free(section); |
440 | } |
519 | } |
441 | } |
520 | } |
442 | |
521 | |
|
|
522 | void psiconv_free_object_icon_section(psiconv_object_icon_section section) |
|
|
523 | { |
|
|
524 | if (section) { |
|
|
525 | if (section->icon_name) |
|
|
526 | free(section->icon_name); |
|
|
527 | free(section); |
|
|
528 | } |
|
|
529 | } |
|
|
530 | |
|
|
531 | void psiconv_free_object_display_section(psiconv_object_display_section section) |
|
|
532 | { |
|
|
533 | if (section) |
|
|
534 | free(section); |
|
|
535 | } |
|
|
536 | |
|
|
537 | void psiconv_free_embedded_object_section |
|
|
538 | (psiconv_embedded_object_section object) |
|
|
539 | { |
|
|
540 | if (object) { |
|
|
541 | psiconv_free_object_icon_section(object->icon); |
|
|
542 | psiconv_free_object_display_section(object->display); |
|
|
543 | psiconv_free_file(object->object); |
|
|
544 | free(object); |
|
|
545 | } |
|
|
546 | } |
|
|
547 | |
443 | void psiconv_free_in_line_layout_aux(void * layout) |
548 | void psiconv_free_in_line_layout_aux(void * layout) |
444 | { |
549 | { |
445 | psiconv_free_character_layout(((psiconv_in_line_layout) layout)->layout); |
550 | psiconv_free_character_layout(((psiconv_in_line_layout) layout)->layout); |
|
|
551 | psiconv_free_embedded_object_section |
|
|
552 | (((psiconv_in_line_layout) layout)->object); |
446 | } |
553 | } |
447 | |
554 | |
448 | void psiconv_free_in_line_layout(psiconv_in_line_layout layout) |
555 | void psiconv_free_in_line_layout(psiconv_in_line_layout layout) |
449 | { |
556 | { |
450 | if (layout) { |
557 | if (layout) { |
… | |
… | |
547 | { |
654 | { |
548 | if (section) |
655 | if (section) |
549 | free(section); |
656 | free(section); |
550 | } |
657 | } |
551 | |
658 | |
552 | void psiconv_free_numberformat(psiconv_numberformat numberformat) |
659 | void psiconv_free_sheet_numberformat(psiconv_sheet_numberformat numberformat) |
553 | { |
660 | { |
554 | if (numberformat) |
661 | if (numberformat) |
555 | free(numberformat); |
662 | free(numberformat); |
556 | } |
663 | } |
557 | |
664 | |
|
|
665 | void psiconv_free_sheet_cell_layout(psiconv_sheet_cell_layout layout) |
|
|
666 | { |
|
|
667 | psiconv_free_paragraph_layout(layout->paragraph); |
|
|
668 | psiconv_free_character_layout(layout->character); |
|
|
669 | psiconv_free_sheet_numberformat(layout->numberformat); |
|
|
670 | } |
|
|
671 | |
|
|
672 | void psiconv_free_sheet_cell_aux(void *cell) |
|
|
673 | { |
|
|
674 | psiconv_sheet_cell data = cell; |
|
|
675 | |
|
|
676 | psiconv_free_sheet_cell_layout(data->layout); |
|
|
677 | |
|
|
678 | if ((data->type == psiconv_cell_string) && (data->data.dat_string)) |
|
|
679 | free(data->data.dat_string); |
|
|
680 | } |
|
|
681 | |
558 | void psiconv_free_sheet_cell(psiconv_sheet_cell cell) |
682 | void psiconv_free_sheet_cell(psiconv_sheet_cell cell) |
559 | { |
683 | { |
560 | if (cell) { |
684 | if (cell) { |
561 | psiconv_free_paragraph_layout(cell->paragraph); |
|
|
562 | psiconv_free_character_layout(cell->character); |
|
|
563 | psiconv_free_numberformat(cell->numberformat); |
|
|
564 | |
|
|
565 | if ((cell->type == psiconv_cell_string) && (cell->data.dat_string)) |
|
|
566 | free(cell->data.dat_string); |
|
|
567 | |
|
|
568 | free(cell); |
|
|
569 | } |
|
|
570 | } |
|
|
571 | |
|
|
572 | void psiconv_free_sheet_cell_aux(void *data) |
|
|
573 | { |
|
|
574 | psiconv_sheet_cell cell; |
|
|
575 | cell = data; |
|
|
576 | psiconv_free_sheet_cell(cell); |
685 | psiconv_free_sheet_cell_aux(cell); |
|
|
686 | free(cell); |
|
|
687 | } |
577 | } |
688 | } |
578 | |
689 | |
579 | void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list) |
690 | void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list) |
580 | { |
691 | { |
581 | if (list) |
692 | if (list) |
582 | psiconv_list_free_el(list,psiconv_free_sheet_cell_aux); |
693 | psiconv_list_free_el(list,psiconv_free_sheet_cell_aux); |
583 | } |
694 | } |
584 | |
695 | |
585 | void psiconv_free_sheet_worksheet_section( |
696 | void psiconv_free_sheet_line_aux(void *line) |
586 | psiconv_sheet_worksheet_section section) |
|
|
587 | { |
697 | { |
|
|
698 | psiconv_sheet_line data = line; |
|
|
699 | |
|
|
700 | psiconv_free_sheet_cell_layout(data->layout); |
|
|
701 | } |
|
|
702 | |
|
|
703 | void psiconv_free_sheet_line(psiconv_sheet_line line) |
|
|
704 | { |
|
|
705 | if (line) { |
|
|
706 | psiconv_free_sheet_line_aux(line); |
|
|
707 | free(line); |
|
|
708 | } |
|
|
709 | } |
|
|
710 | |
|
|
711 | |
|
|
712 | void psiconv_free_sheet_line_list(psiconv_sheet_line_list list) |
|
|
713 | { |
|
|
714 | if (list) |
|
|
715 | psiconv_list_free_el(list,psiconv_free_sheet_line_aux); |
|
|
716 | } |
|
|
717 | |
|
|
718 | void psiconv_free_sheet_grid_break_list(psiconv_sheet_grid_break_list list) |
|
|
719 | { |
|
|
720 | if (list) |
|
|
721 | psiconv_list_free(list); |
|
|
722 | } |
|
|
723 | |
|
|
724 | void psiconv_free_sheet_grid_size(psiconv_sheet_grid_size s) |
|
|
725 | { |
|
|
726 | if (s) |
|
|
727 | free(s); |
|
|
728 | } |
|
|
729 | |
|
|
730 | void psiconv_free_sheet_grid_size_list(psiconv_sheet_grid_size_list list) |
|
|
731 | { |
|
|
732 | if (list) |
|
|
733 | psiconv_list_free(list); |
|
|
734 | } |
|
|
735 | |
|
|
736 | void psiconv_free_sheet_grid_section(psiconv_sheet_grid_section sec) |
|
|
737 | { |
588 | if (section) { |
738 | if (sec) { |
589 | psiconv_free_paragraph_layout(section->paragraph); |
739 | psiconv_free_sheet_grid_size_list(sec->row_heights); |
590 | psiconv_free_character_layout(section->character); |
740 | psiconv_free_sheet_grid_size_list(sec->column_heights); |
591 | psiconv_free_numberformat(section->numberformat); |
741 | psiconv_free_sheet_grid_break_list(sec->row_page_breaks); |
|
|
742 | psiconv_free_sheet_grid_break_list(sec->column_page_breaks); |
|
|
743 | free(sec); |
|
|
744 | } |
|
|
745 | } |
|
|
746 | |
|
|
747 | void psiconv_free_sheet_worksheet_aux (void *data) |
|
|
748 | { |
|
|
749 | psiconv_sheet_worksheet section = data; |
|
|
750 | psiconv_free_sheet_cell_layout(section->default_layout); |
592 | psiconv_free_sheet_cell_list(section->cells); |
751 | psiconv_free_sheet_cell_list(section->cells); |
|
|
752 | psiconv_free_sheet_line_list(section->row_default_layouts); |
|
|
753 | psiconv_free_sheet_line_list(section->col_default_layouts); |
|
|
754 | psiconv_free_sheet_grid_section(section->grid); |
|
|
755 | } |
|
|
756 | |
|
|
757 | void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet) |
|
|
758 | { |
|
|
759 | if (sheet) { |
|
|
760 | psiconv_free_sheet_worksheet_aux(sheet); |
593 | free(section); |
761 | free(sheet); |
594 | } |
762 | } |
|
|
763 | } |
|
|
764 | |
|
|
765 | void psiconv_free_sheet_worksheet_list(psiconv_sheet_worksheet_list list) |
|
|
766 | { |
|
|
767 | if (list) |
|
|
768 | psiconv_list_free_el(list,psiconv_free_sheet_worksheet_aux); |
595 | } |
769 | } |
596 | |
770 | |
597 | void psiconv_free_formula_aux(void *data) |
771 | void psiconv_free_formula_aux(void *data) |
598 | { |
772 | { |
599 | psiconv_formula formula; |
773 | psiconv_formula formula; |
… | |
… | |
625 | { |
799 | { |
626 | if (list) |
800 | if (list) |
627 | psiconv_list_free_el(list,psiconv_free_formula_aux); |
801 | psiconv_list_free_el(list,psiconv_free_formula_aux); |
628 | } |
802 | } |
629 | |
803 | |
|
|
804 | void psiconv_free_sheet_name_section(psiconv_sheet_name_section section) |
|
|
805 | { |
|
|
806 | if (section) { |
|
|
807 | if(section->name) |
|
|
808 | free(section->name); |
|
|
809 | free(section); |
|
|
810 | } |
|
|
811 | } |
|
|
812 | |
|
|
813 | void psiconv_free_sheet_info_section(psiconv_sheet_info_section section) |
|
|
814 | { |
|
|
815 | if (section) { |
|
|
816 | free(section); |
|
|
817 | } |
|
|
818 | } |
|
|
819 | |
|
|
820 | void psiconv_free_sheet_variable_aux(void * variable) |
|
|
821 | { |
|
|
822 | psiconv_sheet_variable var = variable; |
|
|
823 | if (var->name) |
|
|
824 | free(var->name); |
|
|
825 | if (var->type == psiconv_var_string) |
|
|
826 | free(var->data.dat_string); |
|
|
827 | } |
|
|
828 | |
|
|
829 | void psiconv_free_sheet_variable(psiconv_sheet_variable var) |
|
|
830 | { |
|
|
831 | if (var) { |
|
|
832 | psiconv_free_sheet_variable_aux(var); |
|
|
833 | free(var); |
|
|
834 | } |
|
|
835 | } |
|
|
836 | |
|
|
837 | void psiconv_free_sheet_variable_list(psiconv_sheet_variable_list list) |
|
|
838 | { |
|
|
839 | if (list) |
|
|
840 | psiconv_list_free_el(list,psiconv_free_sheet_variable_aux); |
|
|
841 | } |
|
|
842 | |
630 | void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) |
843 | void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section) |
631 | { |
844 | { |
632 | if (section) { |
845 | if (section) { |
633 | psiconv_free_formula_list(section->formulas); |
846 | psiconv_free_formula_list(section->formulas); |
634 | psiconv_free_sheet_worksheet_section(section->worksheet); |
847 | psiconv_free_sheet_worksheet_list(section->worksheets); |
|
|
848 | psiconv_free_sheet_name_section(section->name); |
|
|
849 | psiconv_free_sheet_info_section(section->info); |
|
|
850 | psiconv_free_sheet_variable_list(section->variables); |
635 | free(section); |
851 | free(section); |
636 | } |
852 | } |
637 | } |
853 | } |
638 | |
854 | |
639 | void psiconv_free_sheet_f(psiconv_sheet_f file) |
855 | void psiconv_free_sheet_f(psiconv_sheet_f file) |
… | |
… | |
710 | } |
926 | } |
711 | |
927 | |
712 | void psiconv_free_clipart_section_aux(void *section) |
928 | void psiconv_free_clipart_section_aux(void *section) |
713 | { |
929 | { |
714 | if (section) |
930 | if (section) |
715 | free(((psiconv_clipart_section ) section)->picture); |
931 | psiconv_free_paint_data_section(((psiconv_clipart_section) section)->picture); |
716 | } |
932 | } |
717 | |
933 | |
718 | void psiconv_free_clipart_section(psiconv_clipart_section section) |
934 | void psiconv_free_clipart_section(psiconv_clipart_section section) |
719 | { |
935 | { |
720 | if (section) { |
936 | if (section) { |
… | |
… | |
773 | const psiconv_font value2) |
989 | const psiconv_font value2) |
774 | { |
990 | { |
775 | if (!value1 || !value2 || !value1->name || !value2->name) |
991 | if (!value1 || !value2 || !value1->name || !value2->name) |
776 | return 1; |
992 | return 1; |
777 | if ((value1->screenfont == value2->screenfont) && |
993 | if ((value1->screenfont == value2->screenfont) && |
778 | !strcmp(value1->name,value2->name)) |
994 | !psiconv_unicode_strcmp(value1->name,value2->name)) |
779 | return 0; |
995 | return 0; |
780 | else |
996 | else |
781 | return 1; |
997 | return 1; |
782 | } |
998 | } |
783 | |
999 | |
… | |
… | |
1171 | psiconv_sketch_section psiconv_empty_sketch_section(void) |
1387 | psiconv_sketch_section psiconv_empty_sketch_section(void) |
1172 | { |
1388 | { |
1173 | psiconv_sketch_section result; |
1389 | psiconv_sketch_section result; |
1174 | if (!(result = malloc(sizeof(*result)))) |
1390 | if (!(result = malloc(sizeof(*result)))) |
1175 | goto ERROR1; |
1391 | goto ERROR1; |
1176 | result->form_xsize = 320; |
1392 | result->displayed_xsize = 320; |
1177 | result->form_ysize = 200; |
1393 | result->displayed_ysize = 200; |
1178 | result->picture_x_offset = result->picture_y_offset = result->picture_xsize = |
1394 | result->picture_data_x_offset = result->picture_data_y_offset = |
1179 | result->picture_ysize = 0; |
1395 | result->form_xsize = result->form_ysize = |
|
|
1396 | result->displayed_size_x_offset = result->displayed_size_y_offset = 0; |
1180 | result->magnification_x = result->magnification_y = 1.0; |
1397 | result->magnification_x = result->magnification_y = 1.0; |
1181 | result->cut_left = result->cut_right = result->cut_top = |
1398 | result->cut_left = result->cut_right = result->cut_top = |
1182 | result->cut_bottom = 0.0; |
1399 | result->cut_bottom = 0.0; |
1183 | if (!(result->picture = psiconv_empty_paint_data_section())) |
1400 | if (!(result->picture = psiconv_empty_paint_data_section())) |
1184 | goto ERROR2; |
1401 | goto ERROR2; |