… | |
… | |
505 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, |
505 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, |
506 | &result->no_widow_protection))) |
506 | &result->no_widow_protection))) |
507 | goto ERROR1; |
507 | goto ERROR1; |
508 | len += leng; |
508 | len += leng; |
509 | break; |
509 | break; |
|
|
510 | case 0x0f: |
|
|
511 | psiconv_progress(lev+3,off+len,"Going to read wrap to fit cell limits"); |
|
|
512 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, |
|
|
513 | &result->wrap_to_fit_cell))) |
|
|
514 | goto ERROR1; |
|
|
515 | len += leng; |
|
|
516 | break; |
510 | case 0x10: |
517 | case 0x10: |
511 | psiconv_progress(lev+3,off+len,"Going to read border distance to text"); |
518 | psiconv_progress(lev+3,off+len,"Going to read border distance to text"); |
512 | result->border_distance = psiconv_read_length(buf,lev+3, |
519 | result->border_distance = psiconv_read_length(buf,lev+3, |
513 | off+len,&leng,&res); |
520 | off+len,&leng,&res); |
514 | if (res) |
521 | if (res) |
… | |
… | |
641 | if (res) |
648 | if (res) |
642 | goto ERROR1; |
649 | goto ERROR1; |
643 | psiconv_debug(lev+3,off+len,"Id: %02x",id); |
650 | psiconv_debug(lev+3,off+len,"Id: %02x",id); |
644 | len ++; |
651 | len ++; |
645 | switch(id) { |
652 | switch(id) { |
|
|
653 | case 0x18: |
|
|
654 | psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); |
|
|
655 | len ++; |
|
|
656 | break; |
646 | case 0x19: |
657 | case 0x19: |
647 | psiconv_progress(lev+3,off+len,"Going to read text color"); |
658 | psiconv_progress(lev+3,off+len,"Going to read text color"); |
648 | if ((res = psiconv_parse_color(buf,lev+3,off+len, &leng,&temp_color))) |
659 | if ((res = psiconv_parse_color(buf,lev+3,off+len, &leng,&temp_color))) |
649 | goto ERROR1; |
660 | goto ERROR1; |
650 | psiconv_free_color(result->color); |
661 | psiconv_free_color(result->color); |
… | |
… | |
656 | if ((res = psiconv_parse_color(buf,lev+2,off+len, &leng,&temp_color))) |
667 | if ((res = psiconv_parse_color(buf,lev+2,off+len, &leng,&temp_color))) |
657 | goto ERROR1; |
668 | goto ERROR1; |
658 | psiconv_free_color(result->back_color); |
669 | psiconv_free_color(result->back_color); |
659 | result->back_color = temp_color; |
670 | result->back_color = temp_color; |
660 | len += leng; |
671 | len += leng; |
|
|
672 | break; |
|
|
673 | case 0x1b: |
|
|
674 | psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); |
|
|
675 | len ++; |
661 | break; |
676 | break; |
662 | case 0x1c: |
677 | case 0x1c: |
663 | psiconv_progress(lev+3,off+len,"Going to read font size"); |
678 | psiconv_progress(lev+3,off+len,"Going to read font size"); |
664 | result->font_size = psiconv_read_size(buf,lev+3,off+len,&leng,&res); |
679 | result->font_size = psiconv_read_size(buf,lev+3,off+len,&leng,&res); |
665 | if (res) |
680 | if (res) |
… | |
… | |
716 | goto ERROR1; |
731 | goto ERROR1; |
717 | psiconv_free_font(result->font); |
732 | psiconv_free_font(result->font); |
718 | result->font = temp_font; |
733 | result->font = temp_font; |
719 | len += leng; |
734 | len += leng; |
720 | break; |
735 | break; |
|
|
736 | case 0x23: |
|
|
737 | psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); |
|
|
738 | len ++; |
|
|
739 | break; |
721 | case 0x24: |
740 | case 0x24: |
722 | psiconv_progress(lev+3,off+len, |
741 | psiconv_progress(lev+3,off+len, |
723 | "Going to read unknown code 0x24 (%02x expected)", 0); |
742 | "Going to read unknown code 0x24 (%02x expected)", 0); |
724 | temp = psiconv_read_u8(buf,lev+3,off+len,&res); |
743 | temp = psiconv_read_u8(buf,lev+3,off+len,&res); |
725 | if (res) |
744 | if (res) |