… | |
… | |
163 | |
163 | |
164 | psiconv_progress(lev+2,off+len,"Going to read border thickness"); |
164 | psiconv_progress(lev+2,off+len,"Going to read border thickness"); |
165 | (*result)->thickness = psiconv_read_size(buf,lev+2,off+len,&leng,&res); |
165 | (*result)->thickness = psiconv_read_size(buf,lev+2,off+len,&leng,&res); |
166 | if (res) |
166 | if (res) |
167 | goto ERROR2; |
167 | goto ERROR2; |
|
|
168 | #if 0 |
|
|
169 | /* This seems no longer necessary to test? */ |
168 | if (((*result)->kind != psiconv_border_solid) && |
170 | if (((*result)->kind != psiconv_border_solid) && |
169 | ((*result)->kind != psiconv_border_double) && |
171 | ((*result)->kind != psiconv_border_double) && |
170 | ((*result)->thickness != 0.0) && |
172 | ((*result)->thickness != 0.0) && |
171 | (fabs((*result)->thickness - 1/20) >= 1/1000)) { |
173 | (fabs((*result)->thickness - 1/20) >= 1/1000)) { |
172 | psiconv_warn(lev+2,off, |
174 | psiconv_warn(lev+2,off, |
173 | "Border thickness specified for unlikely border type"); |
175 | "Border thickness specified for unlikely border type"); |
174 | } |
176 | } |
|
|
177 | #endif |
175 | psiconv_debug(lev+2,off+len,"Thickness: %f",(*result)->thickness); |
178 | psiconv_debug(lev+2,off+len,"Thickness: %f",(*result)->thickness); |
176 | len += leng; |
179 | len += leng; |
177 | |
180 | |
178 | psiconv_progress(lev+2,off+len,"Going to read the border color"); |
181 | psiconv_progress(lev+2,off+len,"Going to read the border color"); |
179 | if ((psiconv_parse_color(buf,lev+2,off+len,&leng,&(*result)->color))) |
182 | if ((psiconv_parse_color(buf,lev+2,off+len,&leng,&(*result)->color))) |
180 | goto ERROR2; |
183 | goto ERROR2; |
181 | len += leng; |
184 | len += leng; |
182 | |
185 | |
183 | psiconv_progress(lev+2,off+len,"Going to read the final unknown byte " |
186 | psiconv_progress(lev+2,off+len,"Going to read the final unknown byte " |
184 | "(0x01 expected)"); |
187 | "(0x00 or 0x01 expected)"); |
185 | temp = psiconv_read_u8(buf,lev+2,off + len,&res); |
188 | temp = psiconv_read_u8(buf,lev+2,off + len,&res); |
186 | if (res) |
189 | if (res) |
187 | goto ERROR3; |
190 | goto ERROR3; |
188 | if (temp != 0x01) { |
191 | if ((temp != 0x01) && (temp != 0x00)) { |
189 | psiconv_warn(lev+2,off,"Unknown last byte in border specification"); |
192 | psiconv_warn(lev+2,off,"Unknown last byte in border specification"); |
190 | psiconv_debug(lev+2,off+len, "Last byte: read %02x, expected %02x", |
193 | psiconv_debug(lev+2,off+len, "Last byte: read %02x, expected %02x or %02x", |
191 | temp,0x01); |
194 | temp,0x00,0x01); |
192 | } |
195 | } |
193 | len ++; |
196 | len ++; |
194 | |
197 | |
195 | if (length) |
198 | if (length) |
196 | *length = len; |
199 | *length = len; |
… | |
… | |
638 | if (res) |
641 | if (res) |
639 | goto ERROR1; |
642 | goto ERROR1; |
640 | psiconv_debug(lev+3,off+len,"Id: %02x",id); |
643 | psiconv_debug(lev+3,off+len,"Id: %02x",id); |
641 | len ++; |
644 | len ++; |
642 | switch(id) { |
645 | switch(id) { |
|
|
646 | case 0x18: |
|
|
647 | psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); |
|
|
648 | len ++; |
|
|
649 | break; |
643 | case 0x19: |
650 | case 0x19: |
644 | psiconv_progress(lev+3,off+len,"Going to read text color"); |
651 | psiconv_progress(lev+3,off+len,"Going to read text color"); |
645 | if ((res = psiconv_parse_color(buf,lev+3,off+len, &leng,&temp_color))) |
652 | if ((res = psiconv_parse_color(buf,lev+3,off+len, &leng,&temp_color))) |
646 | goto ERROR1; |
653 | goto ERROR1; |
647 | psiconv_free_color(result->color); |
654 | psiconv_free_color(result->color); |
… | |
… | |
653 | if ((res = psiconv_parse_color(buf,lev+2,off+len, &leng,&temp_color))) |
660 | if ((res = psiconv_parse_color(buf,lev+2,off+len, &leng,&temp_color))) |
654 | goto ERROR1; |
661 | goto ERROR1; |
655 | psiconv_free_color(result->back_color); |
662 | psiconv_free_color(result->back_color); |
656 | result->back_color = temp_color; |
663 | result->back_color = temp_color; |
657 | len += leng; |
664 | len += leng; |
|
|
665 | break; |
|
|
666 | case 0x1b: |
|
|
667 | psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); |
|
|
668 | len ++; |
658 | break; |
669 | break; |
659 | case 0x1c: |
670 | case 0x1c: |
660 | psiconv_progress(lev+3,off+len,"Going to read font size"); |
671 | psiconv_progress(lev+3,off+len,"Going to read font size"); |
661 | result->font_size = psiconv_read_size(buf,lev+3,off+len,&leng,&res); |
672 | result->font_size = psiconv_read_size(buf,lev+3,off+len,&leng,&res); |
662 | if (res) |
673 | if (res) |
… | |
… | |
713 | goto ERROR1; |
724 | goto ERROR1; |
714 | psiconv_free_font(result->font); |
725 | psiconv_free_font(result->font); |
715 | result->font = temp_font; |
726 | result->font = temp_font; |
716 | len += leng; |
727 | len += leng; |
717 | break; |
728 | break; |
|
|
729 | case 0x23: |
|
|
730 | psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); |
|
|
731 | len ++; |
|
|
732 | break; |
718 | case 0x24: |
733 | case 0x24: |
719 | psiconv_progress(lev+3,off+len, |
734 | psiconv_progress(lev+3,off+len, |
720 | "Going to read unknown code 0x24 (%02x expected)", 0); |
735 | "Going to read unknown code 0x24 (%02x expected)", 0); |
721 | temp = psiconv_read_u8(buf,lev+3,off+len,&res); |
736 | temp = psiconv_read_u8(buf,lev+3,off+len,&res); |
722 | if (res) |
737 | if (res) |