1 | /* |
1 | /* |
2 | parse_image.c - Part of psiconv, a PSION 5 file formats converter |
2 | parse_image.c - Part of psiconv, a PSION 5 file formats converter |
3 | Copyright (c) 1999 Frodo Looijaard <frodol@dds.nl> |
3 | Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl> |
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. |
… | |
… | |
16 | along with this program; if not, write to the Free Software |
16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
17 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
18 | */ |
18 | */ |
19 | |
19 | |
20 | #include "config.h" |
20 | #include "config.h" |
|
|
21 | #include "compat.h" |
|
|
22 | |
21 | #include <stdlib.h> |
23 | #include <stdlib.h> |
22 | |
24 | |
23 | #include "data.h" |
|
|
24 | #include "parse_routines.h" |
25 | #include "parse_routines.h" |
|
|
26 | #include "error.h" |
25 | |
27 | |
|
|
28 | #ifdef DMALLOC |
|
|
29 | #include <dmalloc.h> |
|
|
30 | #endif |
|
|
31 | |
|
|
32 | |
26 | int psiconv_parse_mbm_jumptable_section(const psiconv_buffer buf,int lev, |
33 | int psiconv_parse_jumptable_section(const psiconv_buffer buf,int lev, |
27 | psiconv_u32 off, int *length, |
34 | psiconv_u32 off, int *length, |
28 | psiconv_mbm_jumptable_section *result) |
35 | psiconv_jumptable_section *result) |
29 | { |
36 | { |
30 | int res = 0; |
37 | int res = 0; |
31 | int len = 0; |
38 | int len = 0; |
32 | psiconv_u32 listlen,temp; |
39 | psiconv_u32 listlen,temp; |
33 | int i; |
40 | int i; |
34 | |
41 | |
35 | psiconv_progress(lev+1,off+len,"Going to read the mbm jumptable section"); |
42 | psiconv_progress(lev+1,off+len,"Going to read the jumptable section"); |
36 | (*result) = psiconv_list_new(sizeof(psiconv_u32)); |
43 | if (!((*result) = psiconv_list_new(sizeof(psiconv_u32)))) |
|
|
44 | goto ERROR1; |
37 | |
45 | |
38 | psiconv_progress(lev+2,off+len,"Going to read the list length"); |
46 | psiconv_progress(lev+2,off+len,"Going to read the list length"); |
39 | listlen = psiconv_read_u32(buf,lev+2,off+len); |
47 | listlen = psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
48 | if (res) |
|
|
49 | goto ERROR2; |
40 | psiconv_debug(lev+2,off+len,"List length: %08x",listlen); |
50 | psiconv_debug(lev+2,off+len,"List length: %08x",listlen); |
41 | len += 4; |
51 | len += 4; |
42 | |
52 | |
43 | psiconv_progress(lev+2,off+len,"Going to read the list"); |
53 | psiconv_progress(lev+2,off+len,"Going to read the list"); |
44 | for (i = 0; i < listlen; i++) { |
54 | for (i = 0; i < listlen; i++) { |
45 | temp = psiconv_read_u32(buf,lev+2,off+len); |
55 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
56 | if (res) |
|
|
57 | goto ERROR2; |
46 | psiconv_list_add(*result,&temp); |
58 | if ((res = psiconv_list_add(*result,&temp))) |
|
|
59 | goto ERROR2; |
47 | psiconv_debug(lev+3,off+len,"Offset: %08x",temp); |
60 | psiconv_debug(lev+3,off+len,"Offset: %08x",temp); |
48 | len += 4; |
61 | len += 4; |
49 | } |
62 | } |
50 | |
63 | |
51 | if (length) |
64 | if (length) |
52 | *length = len; |
65 | *length = len; |
53 | |
66 | |
54 | psiconv_progress(lev+1,off+len-1,"End of mbm jumptable section " |
67 | psiconv_progress(lev+1,off+len-1,"End of jumptable section " |
55 | "(total length: %08x)", len); |
68 | "(total length: %08x)", len); |
56 | |
69 | |
|
|
70 | return 0; |
|
|
71 | |
|
|
72 | ERROR2: |
|
|
73 | psiconv_list_free(*result); |
|
|
74 | ERROR1: |
|
|
75 | psiconv_warn(lev+1,off,"Reading of Jumptable Section failed"); |
|
|
76 | if (length) |
|
|
77 | *length = 0; |
|
|
78 | if (!res) |
|
|
79 | return -PSICONV_E_NOMEM; |
|
|
80 | else |
57 | return res; |
81 | return res; |
58 | } |
82 | } |
59 | |
83 | |
60 | static int decode_byte(int lev, psiconv_u32 off, |
84 | static int decode_byte(int lev, psiconv_u32 off, |
61 | psiconv_paint_data_section data, int *pixelnr, |
85 | psiconv_paint_data_section data, psiconv_u32 *pixelnr, |
62 | psiconv_u8 byte, int bits_per_pixel, int linelen, |
86 | psiconv_u8 byte, int bits_per_pixel, int linelen, |
63 | int *linepos,int picsize) |
87 | int *linepos,int picsize) |
64 | { |
88 | { |
65 | int mask = (bits_per_pixel << 1) -1; |
89 | int mask = (bits_per_pixel << 1) -1; |
66 | int i; |
90 | int i; |
… | |
… | |
75 | return -1; |
99 | return -1; |
76 | } else { |
100 | } else { |
77 | data->red[*pixelnr] = data->green[*pixelnr] = data->blue[*pixelnr] = |
101 | data->red[*pixelnr] = data->green[*pixelnr] = data->blue[*pixelnr] = |
78 | ((float) (byte & mask)) / ((1 << bits_per_pixel) -1); |
102 | ((float) (byte & mask)) / ((1 << bits_per_pixel) -1); |
79 | psiconv_debug(lev+1,off,"Pixel %04x: (%04x,%04x) value %02x, color %f", |
103 | psiconv_debug(lev+1,off,"Pixel %04x: (%04x,%04x) value %02x, color %f", |
|
|
104 | *pixelnr,*pixelnr % data->xsize, |
80 | *pixelnr,*pixelnr % data->xsize,*pixelnr / data->xsize, byte&mask, data->red[*pixelnr]); |
105 | *pixelnr / data->xsize, byte&mask, data->red[*pixelnr]); |
81 | byte = byte >> bits_per_pixel; |
106 | byte = byte >> bits_per_pixel; |
82 | (*pixelnr) ++; |
107 | (*pixelnr) ++; |
83 | } |
108 | } |
84 | } |
109 | } |
85 | else |
110 | else |
… | |
… | |
90 | return 0; |
115 | return 0; |
91 | } |
116 | } |
92 | |
117 | |
93 | |
118 | |
94 | int psiconv_parse_paint_data_section(const psiconv_buffer buf,int lev, |
119 | int psiconv_parse_paint_data_section(const psiconv_buffer buf,int lev, |
95 | psiconv_u32 off, int *length, |
120 | psiconv_u32 off, int *length,int isclipart, |
96 | psiconv_paint_data_section *result) |
121 | psiconv_paint_data_section *result) |
97 | { |
122 | { |
98 | int res = 0; |
123 | int res = 0; |
99 | int len = 0; |
124 | int len = 0; |
100 | int read_err = 0; |
|
|
101 | psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen; |
125 | psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen; |
102 | psiconv_u8 marker; |
126 | psiconv_u8 marker; |
103 | int i,leng; |
127 | int i,leng; |
104 | psiconv_u32 bits_per_pixel,compression; |
128 | psiconv_u32 bits_per_pixel,compression; |
105 | int linepos = 0; |
129 | int linepos = 0; |
106 | |
130 | |
107 | psiconv_progress(lev+1,off,"Going to read a paint data section"); |
131 | psiconv_progress(lev+1,off,"Going to read a paint data section"); |
108 | (*result) = malloc(sizeof(**result)); |
132 | if (!((*result) = malloc(sizeof(**result)))) |
|
|
133 | goto ERROR1; |
109 | |
134 | |
110 | psiconv_progress(lev+2,off+len,"Going to read section size"); |
135 | psiconv_progress(lev+2,off+len,"Going to read section size"); |
111 | size = psiconv_read_u32(buf,lev+2,off+len); |
136 | size = psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
137 | if (res) |
|
|
138 | goto ERROR2; |
112 | psiconv_debug(lev+2,off+len,"Section size: %08x",size); |
139 | psiconv_debug(lev+2,off+len,"Section size: %08x",size); |
113 | len += 4; |
140 | len += 4; |
114 | |
141 | |
115 | psiconv_progress(lev+2,off+len,"Going to read pixel data offset"); |
142 | psiconv_progress(lev+2,off+len,"Going to read pixel data offset"); |
116 | offset = psiconv_read_u32(buf,lev+2,off+len); |
143 | offset = psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
144 | if (res) |
|
|
145 | goto ERROR2; |
117 | if (offset != 0x28) { |
146 | if (offset != 0x28) { |
118 | psiconv_warn(lev+2,off+len, |
147 | psiconv_warn(lev+2,off+len, |
119 | "Paint data section data offset has unexpected value"); |
148 | "Paint data section data offset has unexpected value"); |
120 | psiconv_debug(lev+2,off+len, |
149 | psiconv_debug(lev+2,off+len, |
121 | "Data offset: read %08x, expected %08x",offset,0x28); |
150 | "Data offset: read %08x, expected %08x",offset,0x28); |
122 | res = -1; |
151 | res = -1; |
123 | } |
152 | } |
124 | len += 4; |
153 | len += 4; |
125 | |
154 | |
126 | psiconv_progress(lev+2,off+len,"Going to read picture X size"); |
155 | psiconv_progress(lev+2,off+len,"Going to read picture X size"); |
127 | (*result)->xsize = psiconv_read_u32(buf,lev+2,off+len); |
156 | (*result)->xsize = psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
157 | if (res) |
|
|
158 | goto ERROR2; |
128 | psiconv_debug(lev+2,off+len,"Picture X size: %08x:",(*result)->xsize); |
159 | psiconv_debug(lev+2,off+len,"Picture X size: %08x:",(*result)->xsize); |
129 | len += 4; |
160 | len += 4; |
130 | |
161 | |
131 | psiconv_progress(lev+2,off+len,"Going to read picture Y size"); |
162 | psiconv_progress(lev+2,off+len,"Going to read picture Y size"); |
132 | (*result)->ysize = psiconv_read_u32(buf,lev+2,off+len); |
163 | (*result)->ysize = psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
164 | if (res) |
|
|
165 | goto ERROR2; |
133 | psiconv_debug(lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize); |
166 | psiconv_debug(lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize); |
134 | len += 4; |
167 | len += 4; |
135 | |
168 | |
136 | picsize = (*result)->ysize * (*result)->xsize; |
169 | picsize = (*result)->ysize * (*result)->xsize; |
137 | |
170 | |
138 | psiconv_progress(lev+2,off+len,"Going to read the real picture x size"); |
171 | psiconv_progress(lev+2,off+len,"Going to read the real picture x size"); |
139 | (*result)->pic_xsize = psiconv_read_length(buf,lev+2,off+len,&leng); |
172 | (*result)->pic_xsize = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
|
|
173 | if (res) |
|
|
174 | goto ERROR2; |
140 | psiconv_debug(lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize); |
175 | psiconv_debug(lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize); |
141 | len += leng; |
176 | len += leng; |
142 | |
177 | |
143 | psiconv_progress(lev+2,off+len,"Going to read the real picture y size"); |
178 | psiconv_progress(lev+2,off+len,"Going to read the real picture y size"); |
144 | (*result)->pic_ysize = psiconv_read_length(buf,lev+2,off+len,&leng); |
179 | (*result)->pic_ysize = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
|
|
180 | if (res) |
|
|
181 | goto ERROR2; |
145 | psiconv_debug(lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize); |
182 | psiconv_debug(lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize); |
146 | len += leng; |
183 | len += leng; |
147 | |
184 | |
148 | psiconv_progress(lev+2,off+len,"Going to read the number of bits per pixel"); |
185 | psiconv_progress(lev+2,off+len,"Going to read the number of bits per pixel"); |
149 | bits_per_pixel=psiconv_read_u32(buf,lev+2,off+len); |
186 | bits_per_pixel=psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
187 | if (res) |
|
|
188 | goto ERROR2; |
150 | if (bits_per_pixel > 8) { |
189 | if (bits_per_pixel > 8) { |
151 | psiconv_warn(lev+2,off+len,"Picture has too many colors"); |
190 | psiconv_warn(lev+2,off+len,"Picture has too many colors"); |
152 | psiconv_debug(lev+2,off+len,"Read %d colorbits",bits_per_pixel); |
191 | psiconv_debug(lev+2,off+len,"Read %d colorbits",bits_per_pixel); |
153 | res = -1; |
192 | res = -PSICONV_E_PARSE; |
154 | bits_per_pixel = 2; |
193 | goto ERROR2; |
155 | } |
194 | } |
156 | psiconv_debug(lev+2,off+len,"Bits per pixel: %d",bits_per_pixel); |
195 | psiconv_debug(lev+2,off+len,"Bits per pixel: %d",bits_per_pixel); |
157 | len += 4; |
196 | len += 4; |
158 | |
197 | |
159 | for (i = 0 ; i < 2; i++) { |
198 | for (i = 0 ; i < 2; i++) { |
160 | temp = psiconv_read_u32(buf,lev+2,off+len); |
199 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
200 | if (res) |
|
|
201 | goto ERROR2; |
161 | if (temp != 00) { |
202 | if (temp != 00) { |
162 | psiconv_warn(lev+2,off+len, |
203 | psiconv_warn(lev+2,off+len, |
163 | "Paint data section prologue has unknown values"); |
204 | "Paint data section prologue has unknown values (ignored)"); |
164 | psiconv_debug(lev+2,off+len, |
205 | psiconv_debug(lev+2,off+len, |
165 | "offset %02x: read %08x, expected %08x",i,temp, 0x00); |
206 | "offset %02x: read %08x, expected %08x",i,temp, 0x00); |
166 | res = -1; |
|
|
167 | } |
207 | } |
168 | len += 4; |
208 | len += 4; |
169 | } |
209 | } |
170 | |
210 | |
171 | psiconv_progress(lev+2,off+len, |
211 | psiconv_progress(lev+2,off+len, |
172 | "Going to read whether RLE compression is used"); |
212 | "Going to read whether RLE compression is used"); |
173 | compression=psiconv_read_u32(buf,lev+2,off+len); |
213 | compression=psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
214 | if (res) |
|
|
215 | goto ERROR2; |
174 | if (compression > 1) { |
216 | if (compression > 1) { |
175 | psiconv_warn(lev+2,off+len,"Paint data section has unknown " |
217 | psiconv_warn(lev+2,off+len,"Paint data section has unknown " |
176 | "compression type, assuming RLE"); |
218 | "compression type, assuming RLE"); |
177 | psiconv_debug(lev+2,off+len,"Read compression type %d",compression); |
219 | psiconv_debug(lev+2,off+len,"Read compression type %d",compression); |
178 | compression = 1; |
220 | compression = 1; |
179 | } |
221 | } |
180 | psiconv_debug(lev+2,off+len,"Compression: %s",compression?"RLE":"none"); |
222 | psiconv_debug(lev+2,off+len,"Compression: %s",compression?"RLE":"none"); |
|
|
223 | len += 4; |
181 | |
224 | |
|
|
225 | if (isclipart) { |
|
|
226 | psiconv_progress(lev+2,off+len,"Going to read an unknown long"); |
|
|
227 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
228 | if (res) |
|
|
229 | goto ERROR2; |
|
|
230 | if (temp != 0xffffffff) { |
|
|
231 | psiconv_warn(lev+2,off+len, |
|
|
232 | "Paint data section prologue has unknown values (ignoring)"); |
|
|
233 | psiconv_debug(lev+2,off+len, |
|
|
234 | "offset %02x: read %08x, expected %08x",i,temp, 0xffffffff); |
|
|
235 | } |
|
|
236 | len += 4; |
|
|
237 | psiconv_progress(lev+2,off+len,"Going to read a second unknown long"); |
|
|
238 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
239 | if (res) |
|
|
240 | goto ERROR2; |
|
|
241 | if (temp != 0x44) { |
|
|
242 | psiconv_warn(lev+2,off+len, |
|
|
243 | "Paint data section prologue has unknown values (ignoring)"); |
|
|
244 | psiconv_debug(lev+2,off+len, |
|
|
245 | "offset %02x: read %08x, expected %08x",i,temp, 0x44); |
|
|
246 | } |
|
|
247 | len += 4; |
|
|
248 | } |
|
|
249 | |
182 | (*result)->red = malloc(sizeof(float) * picsize); |
250 | if (!((*result)->red = malloc(sizeof(float) * picsize))) |
|
|
251 | goto ERROR2; |
183 | (*result)->green = malloc(sizeof(float) * picsize); |
252 | if (!((*result)->green = malloc(sizeof(float) * picsize))) |
|
|
253 | goto ERROR3; |
184 | (*result)->blue = malloc(sizeof(float) * picsize); |
254 | if (!((*result)->blue = malloc(sizeof(float) * picsize))) |
|
|
255 | goto ERROR4; |
185 | len = offset; |
256 | len = offset; |
186 | datasize = size - len; |
257 | datasize = size - len; |
|
|
258 | if (isclipart) |
|
|
259 | len += 8; |
187 | |
260 | |
188 | psiconv_progress(lev+2,off+len,"Going to read the pixel data"); |
261 | psiconv_progress(lev+2,off+len,"Going to read the pixel data"); |
189 | pixelnr = 0; |
262 | pixelnr = 0; |
190 | datanr = 0; |
263 | datanr = 0; |
191 | if (!compression) { |
264 | if (!compression) { |
192 | linelen = datasize / (*result)->ysize; |
265 | linelen = datasize / (*result)->ysize; |
193 | psiconv_debug(lev+3,off+len,"Line length: %04x bytes",linelen); |
266 | psiconv_debug(lev+3,off+len,"Line length: %04x bytes",linelen); |
194 | while((datanr < datasize)) { |
267 | while((datanr < datasize)) { |
195 | temp = psiconv_read_u8(buf,lev+2,off+len+datanr); |
268 | temp = psiconv_read_u8(buf,lev+2,off+len+datanr,&res); |
|
|
269 | if (res) |
|
|
270 | goto ERROR5; |
196 | if (decode_byte(lev+3,off+len+datanr,*result,&pixelnr,temp,bits_per_pixel, |
271 | if (decode_byte(lev+3,off+len+datanr,*result,&pixelnr,temp,bits_per_pixel, |
197 | linelen,&linepos,picsize)) { |
272 | linelen,&linepos,picsize)) { |
198 | read_err = 1; |
273 | res = -PSICONV_E_PARSE; |
199 | res = -1; |
|
|
200 | break; |
274 | break; |
201 | } |
275 | } |
202 | datanr++; |
276 | datanr++; |
203 | } |
277 | } |
204 | } else { |
278 | } else { |
205 | psiconv_progress(lev+2,off+len,"First pass: determining line length"); |
279 | psiconv_progress(lev+2,off+len,"First pass: determining line length"); |
206 | datanr = 0; |
280 | datanr = 0; |
207 | i = 0; |
281 | i = 0; |
208 | while (datanr < datasize) { |
282 | while (datanr < datasize) { |
209 | marker = psiconv_read_u8(buf,lev+3,off+len+datanr); |
283 | marker = psiconv_read_u8(buf,lev+3,off+len+datanr,&res); |
|
|
284 | if (res) |
|
|
285 | goto ERROR5; |
210 | if (marker >= 0x80) { |
286 | if (marker >= 0x80) { |
211 | datanr += 0x100 - marker + 1; |
287 | datanr += 0x100 - marker + 1; |
212 | i += 0x100 - marker; |
288 | i += 0x100 - marker; |
213 | } else { |
289 | } else { |
214 | datanr += 2; |
290 | datanr += 2; |
… | |
… | |
217 | } |
293 | } |
218 | linelen = i / (*result)->ysize; |
294 | linelen = i / (*result)->ysize; |
219 | datanr=0; |
295 | datanr=0; |
220 | psiconv_debug(lev+2,off+len,"Linelen: %04x bytes",linelen); |
296 | psiconv_debug(lev+2,off+len,"Linelen: %04x bytes",linelen); |
221 | while((datanr < datasize)) { |
297 | while((datanr < datasize)) { |
222 | marker = psiconv_read_u8(buf,lev+3,off+len+datanr); |
298 | marker = psiconv_read_u8(buf,lev+3,off+len+datanr,&res); |
|
|
299 | if (res) |
|
|
300 | goto ERROR5; |
223 | psiconv_debug(lev+3,off+len+datanr, |
301 | psiconv_debug(lev+3,off+len+datanr, |
224 | "Pixelnr %08x, Datanr %08x: Read marker %02x", |
302 | "Pixelnr %08x, Datanr %08x: Read marker %02x", |
225 | pixelnr,datanr,marker); |
303 | pixelnr,datanr,marker); |
226 | datanr ++; |
304 | datanr ++; |
227 | if (marker >= 0x80) { |
305 | if (marker >= 0x80) { |
… | |
… | |
231 | psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); |
309 | psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); |
232 | psiconv_debug(lev+3,off+len+datanr, |
310 | psiconv_debug(lev+3,off+len+datanr, |
233 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
311 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
234 | "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, |
312 | "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, |
235 | datanr,marker); |
313 | datanr,marker); |
236 | read_err = 1; |
314 | res = -PSICONV_E_PARSE; |
237 | res = -1; |
|
|
238 | break; |
315 | break; |
239 | } |
316 | } |
240 | temp = psiconv_read_u8(buf,lev+2,off+len+datanr); |
317 | temp = psiconv_read_u8(buf,lev+2,off+len+datanr,&res); |
|
|
318 | if (res) |
|
|
319 | goto ERROR5; |
241 | if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp, |
320 | if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp, |
242 | bits_per_pixel,linelen,&linepos,picsize)) { |
321 | bits_per_pixel,linelen,&linepos,picsize)) { |
243 | res = -1; |
322 | res = -PSICONV_E_PARSE; |
244 | read_err = 1; |
|
|
245 | break; |
323 | break; |
246 | } |
324 | } |
247 | } |
325 | } |
248 | } else { |
326 | } else { |
249 | if (datanr >= datasize) { |
327 | if (datanr >= datasize) { |
250 | psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); |
328 | psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); |
251 | psiconv_debug(lev+3,off+len+datanr, |
329 | psiconv_debug(lev+3,off+len+datanr, |
252 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
330 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
253 | "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, |
331 | "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, |
254 | datanr,marker); |
332 | datanr,marker); |
255 | read_err = 1; |
333 | res = -PSICONV_E_PARSE; |
256 | res = -1; |
|
|
257 | } else { |
334 | } else { |
258 | temp = psiconv_read_u8(buf,lev+3,off+len+datanr); |
335 | temp = psiconv_read_u8(buf,lev+3,off+len+datanr,&res); |
|
|
336 | if (res) |
|
|
337 | goto ERROR5; |
259 | for (i = 0; i <= marker; i++) { |
338 | for (i = 0; i <= marker; i++) { |
260 | if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp, |
339 | if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp, |
261 | bits_per_pixel,linelen,&linepos,picsize)) { |
340 | bits_per_pixel,linelen,&linepos,picsize)) { |
262 | read_err = 1; |
341 | res = -PSICONV_E_PARSE; |
263 | res = -1; |
|
|
264 | break; |
342 | break; |
265 | } |
343 | } |
266 | } |
344 | } |
267 | datanr ++; |
345 | datanr ++; |
268 | } |
346 | } |
… | |
… | |
272 | |
350 | |
273 | if (linepos >= ((*result)->xsize + (8/bits_per_pixel) - 1) / |
351 | if (linepos >= ((*result)->xsize + (8/bits_per_pixel) - 1) / |
274 | (8/bits_per_pixel)) |
352 | (8/bits_per_pixel)) |
275 | datanr += (linelen - linepos); |
353 | datanr += (linelen - linepos); |
276 | |
354 | |
277 | if (!read_err && ((datanr != datasize) || (pixelnr != picsize))) { |
355 | if (res || (datanr != datasize) || (pixelnr != picsize)) { |
278 | psiconv_warn(lev+2,off+len,"Corrupted picture data!"); |
356 | psiconv_warn(lev+2,off+len,"Corrupted picture data!"); |
279 | psiconv_debug(lev+3,off+len+datanr, |
357 | psiconv_debug(lev+3,off+len+datanr, |
280 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
358 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
281 | "Datanr: %08x",picsize,datasize,pixelnr,datanr); |
359 | "Datanr: %08x",picsize,datasize,pixelnr,datanr); |
282 | res = -1; |
360 | goto ERROR5; |
283 | } |
361 | } |
284 | |
362 | |
285 | len += datanr; |
363 | len += datanr; |
286 | |
364 | |
287 | if (length) |
365 | if (length) |
… | |
… | |
289 | |
367 | |
290 | psiconv_progress(lev+1,off+len-1,"End of paint data section " |
368 | psiconv_progress(lev+1,off+len-1,"End of paint data section " |
291 | "(total length: %08x)", len); |
369 | "(total length: %08x)", len); |
292 | |
370 | |
293 | return res; |
371 | return res; |
|
|
372 | |
|
|
373 | ERROR5: |
|
|
374 | free((*result)->blue); |
|
|
375 | ERROR4: |
|
|
376 | free((*result)->green); |
|
|
377 | ERROR3: |
|
|
378 | free((*result)->red); |
|
|
379 | ERROR2: |
|
|
380 | free (*result); |
|
|
381 | ERROR1: |
|
|
382 | psiconv_warn(lev+1,off,"Reading of Paint Data Section failed"); |
|
|
383 | if (length) |
|
|
384 | *length = 0; |
|
|
385 | if (!res) |
|
|
386 | return -PSICONV_E_NOMEM; |
|
|
387 | else |
|
|
388 | return res; |
294 | } |
389 | } |
295 | |
390 | |
296 | int psiconv_parse_sketch_section(const psiconv_buffer buf, int lev, |
391 | int psiconv_parse_sketch_section(const psiconv_buffer buf, int lev, |
297 | psiconv_u32 off, int *length, int is_object, |
392 | psiconv_u32 off, int *length, |
298 | psiconv_sketch_section *result) |
393 | psiconv_sketch_section *result) |
299 | { |
394 | { |
300 | int res=0; |
395 | int res=0; |
301 | int len=0; |
396 | int len=0; |
302 | psiconv_u32 temp; |
397 | psiconv_u32 temp; |
303 | int leng; |
398 | int leng; |
304 | int i; |
|
|
305 | |
399 | |
306 | psiconv_progress(lev+1,off,"Going to read the sketch section"); |
400 | psiconv_progress(lev+1,off,"Going to read the sketch section"); |
307 | *result = malloc(sizeof(**result)); |
401 | if (!(*result = malloc(sizeof(**result)))) |
|
|
402 | goto ERROR1; |
308 | |
403 | |
309 | if (!is_object) { |
|
|
310 | psiconv_progress(lev+2,off+len,"Going to read the form hor. size"); |
|
|
311 | (*result)->form_xsize = psiconv_read_u16(buf,lev+2,off + len); |
|
|
312 | psiconv_debug(lev+2,off+len,"Form hor. size: %04x", |
|
|
313 | (*result)->form_xsize); |
|
|
314 | len += 0x02; |
|
|
315 | psiconv_progress(lev+2,off+len,"Going to read the form ver. size"); |
|
|
316 | (*result)->form_ysize = psiconv_read_u16(buf,lev+2,off + len); |
|
|
317 | psiconv_debug(lev+2,off+len,"Form ver. size: %04x", |
|
|
318 | (*result)->form_ysize); |
|
|
319 | len += 0x02; |
|
|
320 | psiconv_progress(lev+2,off+len,"Going to read the picture hor. offset"); |
|
|
321 | (*result)->picture_x_offset = psiconv_read_u16(buf,lev+2,off + len); |
|
|
322 | psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x", |
|
|
323 | (*result)->picture_x_offset); |
|
|
324 | len += 0x02; |
|
|
325 | psiconv_progress(lev+2,off+len,"Going to read the picture ver. offset"); |
|
|
326 | (*result)->picture_y_offset = psiconv_read_u16(buf,lev+2,off + len); |
|
|
327 | psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x", |
|
|
328 | (*result)->picture_y_offset); |
|
|
329 | len += 0x02; |
|
|
330 | psiconv_progress(lev+2,off+len,"Going to skip 5 words of zeros"); |
|
|
331 | for (i = 0; i < 5; i++) { |
|
|
332 | temp = psiconv_read_u16(buf,lev+2,off+len); |
|
|
333 | if (temp != 0) { |
|
|
334 | psiconv_warn(lev+2,off+len, |
|
|
335 | "Unexpected value in sketch section preamble"); |
|
|
336 | psiconv_debug(lev+2,off+len,"Word %d: Read %04x, expected %04x",i, |
|
|
337 | temp,0); |
|
|
338 | res = -1; |
|
|
339 | } |
|
|
340 | off += 0x02; |
|
|
341 | } |
|
|
342 | } else { |
|
|
343 | psiconv_progress(lev+2,off+len,"Going to read the displayed hor. size"); |
404 | psiconv_progress(lev+2,off+len,"Going to read the displayed hor. size"); |
344 | (*result)->picture_xsize = psiconv_read_u16(buf,lev+2,off + len); |
405 | (*result)->displayed_xsize = psiconv_read_u16(buf,lev+2,off + len,&res); |
|
|
406 | if (res) |
|
|
407 | goto ERROR2; |
345 | psiconv_debug(lev+2,off+len,"Displayed hor. size: %04x", |
408 | psiconv_debug(lev+2,off+len,"Displayed hor. size: %04x", |
346 | (*result)->picture_xsize); |
409 | (*result)->displayed_xsize); |
347 | len += 0x02; |
410 | len += 0x02; |
348 | psiconv_progress(lev+2,off+len,"Going to read the displayed ver. size"); |
411 | psiconv_progress(lev+2,off+len,"Going to read displayed ver. size"); |
349 | (*result)->picture_ysize = psiconv_read_u16(buf,lev+2,off + len); |
412 | (*result)->displayed_ysize = psiconv_read_u16(buf,lev+2,off + len,&res); |
|
|
413 | if (res) |
|
|
414 | goto ERROR2; |
350 | psiconv_debug(lev+2,off+len,"Displayed ver. size: %04x", |
415 | psiconv_debug(lev+2,off+len,"Displayed ver. size: %04x", |
351 | (*result)->picture_ysize); |
416 | (*result)->displayed_ysize); |
352 | len += 0x02; |
417 | len += 0x02; |
353 | |
418 | |
354 | psiconv_progress(lev+2,off+len,"Going to skip 2 words of zeros"); |
|
|
355 | for (i = 0; i < 2; i++) { |
|
|
356 | temp = psiconv_read_u16(buf,lev+2,off+len); |
|
|
357 | if (temp != 0) { |
|
|
358 | psiconv_warn(lev+2,off+len, |
|
|
359 | "Unexpected value in sketch section preamble"); |
|
|
360 | psiconv_debug(lev+2,off+len,"Word %d: Read %04x, expected %04x",i, |
|
|
361 | temp,0); |
|
|
362 | res = -1; |
|
|
363 | } |
|
|
364 | off += 0x02; |
|
|
365 | } |
|
|
366 | psiconv_progress(lev+2,off+len,"Going to read the picture hor. offset"); |
419 | psiconv_progress(lev+2,off+len,"Going to read the data hor. offset"); |
367 | (*result)->picture_x_offset = psiconv_read_u16(buf,lev+2,off + len); |
420 | (*result)->picture_data_x_offset = psiconv_read_u16(buf,lev+2,off + len, |
|
|
421 | &res); |
|
|
422 | if (res) |
|
|
423 | goto ERROR2; |
368 | psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x", |
424 | psiconv_debug(lev+2,off+len,"Data hor. offset: %04x", |
369 | (*result)->picture_x_offset); |
425 | (*result)->picture_data_x_offset); |
370 | len += 0x02; |
426 | len += 0x02; |
371 | psiconv_progress(lev+2,off+len,"Going to read the picture ver. offset"); |
427 | psiconv_progress(lev+2,off+len,"Going to read the data ver. offset"); |
372 | (*result)->picture_y_offset = psiconv_read_u16(buf,lev+2,off + len); |
428 | (*result)->picture_data_y_offset = psiconv_read_u16(buf,lev+2,off + len, |
|
|
429 | &res); |
|
|
430 | if (res) |
|
|
431 | goto ERROR2; |
373 | psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x", |
432 | psiconv_debug(lev+2,off+len,"Data ver. offset: %04x", |
374 | (*result)->picture_y_offset); |
433 | (*result)->picture_data_y_offset); |
375 | len += 0x02; |
434 | len += 0x02; |
|
|
435 | |
|
|
436 | psiconv_progress(lev+2,off+len,"Going to read the displayed hor. offset"); |
|
|
437 | (*result)->displayed_size_x_offset = psiconv_read_u16(buf,lev+2,off + len, |
|
|
438 | &res); |
|
|
439 | if (res) |
|
|
440 | goto ERROR2; |
|
|
441 | psiconv_debug(lev+2,off+len,"Displayed hor. offset: %04x", |
|
|
442 | (*result)->displayed_size_x_offset); |
|
|
443 | len += 0x02; |
|
|
444 | psiconv_progress(lev+2,off+len,"Going to read the displayed ver. offset"); |
|
|
445 | (*result)->displayed_size_y_offset = psiconv_read_u16(buf,lev+2,off + len, |
|
|
446 | &res); |
|
|
447 | if (res) |
|
|
448 | goto ERROR2; |
|
|
449 | psiconv_debug(lev+2,off+len,"Displayed ver. offset: %04x", |
|
|
450 | (*result)->displayed_size_y_offset); |
|
|
451 | len += 0x02; |
|
|
452 | |
376 | psiconv_progress(lev+2,off+len,"Going to read the form hor. size"); |
453 | psiconv_progress(lev+2,off+len,"Going to read the form hor. size"); |
377 | (*result)->form_xsize = psiconv_read_u16(buf,lev+2,off + len); |
454 | (*result)->form_xsize = psiconv_read_u16(buf,lev+2,off + len,&res); |
|
|
455 | if (res) |
|
|
456 | goto ERROR2; |
378 | psiconv_debug(lev+2,off+len,"Form hor. size: %04x", |
457 | psiconv_debug(lev+2,off+len,"Form hor. size: %04x", |
379 | (*result)->form_xsize); |
458 | (*result)->form_xsize); |
380 | len += 0x02; |
459 | len += 0x02; |
381 | psiconv_progress(lev+2,off+len,"Going to read the form ver. size"); |
460 | psiconv_progress(lev+2,off+len,"Going to read form ver. size"); |
382 | (*result)->form_ysize = psiconv_read_u16(buf,lev+2,off + len); |
461 | (*result)->form_ysize = psiconv_read_u16(buf,lev+2,off + len,&res); |
|
|
462 | if (res) |
|
|
463 | goto ERROR2; |
383 | psiconv_debug(lev+2,off+len,"Form ver. size: %04x", |
464 | psiconv_debug(lev+2,off+len,"Form ver. size: %04x", |
384 | (*result)->form_ysize); |
465 | (*result)->form_ysize); |
385 | len += 0x02; |
466 | len += 0x02; |
|
|
467 | |
386 | psiconv_progress(lev+2,off+len,"Going to skip 1 zero word"); |
468 | psiconv_progress(lev+2,off+len,"Going to skip 1 word of zeros"); |
387 | temp = psiconv_read_u16(buf,lev+2,off+len); |
469 | temp = psiconv_read_u16(buf,lev+2,off+len,&res); |
|
|
470 | if (res) |
|
|
471 | goto ERROR2; |
388 | if (temp != 0) { |
472 | if (temp != 0) { |
389 | psiconv_warn(lev+2,off+len, |
473 | psiconv_warn(lev+2,off+len, |
390 | "Unexpected value in sketch section preamble"); |
474 | "Unexpected value in sketch section preamble (ignored)"); |
391 | psiconv_debug(lev+2,off+len,"Read %04x, expected %04x",i, temp,0); |
475 | psiconv_debug(lev+2,off+len,"Read %04x, expected %04x", |
392 | res = -1; |
476 | temp,0); |
393 | } |
477 | } |
394 | off += 0x02; |
478 | off += 0x02; |
395 | } |
|
|
396 | |
479 | |
397 | psiconv_progress(lev+2,off+len,"Going to read the picture data"); |
480 | psiconv_progress(lev+2,off+len,"Going to read the picture data"); |
398 | res |= psiconv_parse_paint_data_section(buf,lev+2,off+len,&leng, |
481 | if ((res = psiconv_parse_paint_data_section(buf,lev+2,off+len,&leng,0, |
399 | &((*result)->picture)); |
482 | &((*result)->picture)))) |
|
|
483 | goto ERROR2; |
400 | off += leng; |
484 | off += leng; |
401 | if (!is_object) { |
|
|
402 | (*result)->picture_xsize = (*result)->picture->xsize; |
|
|
403 | (*result)->picture_ysize = (*result)->picture->ysize; |
|
|
404 | } |
|
|
405 | |
485 | |
406 | psiconv_progress(lev+2,off+len,"Going to read the hor. magnification"); |
486 | psiconv_progress(lev+2,off+len,"Going to read the hor. magnification"); |
407 | (*result)->magnification_x = psiconv_read_u16(buf,lev+2,off + len) / 1000.0; |
487 | (*result)->magnification_x = psiconv_read_u16(buf,lev+2,off+len,&res)/1000.0; |
|
|
488 | if (res) |
|
|
489 | goto ERROR3; |
408 | psiconv_debug(lev+2,off+len,"Form hor. magnification: %f", |
490 | psiconv_debug(lev+2,off+len,"Form hor. magnification: %f", |
409 | (*result)->magnification_x); |
491 | (*result)->magnification_x); |
410 | len += 0x02; |
492 | len += 0x02; |
411 | psiconv_progress(lev+2,off+len,"Going to read the ver. magnification"); |
493 | psiconv_progress(lev+2,off+len,"Going to read the ver. magnification"); |
412 | (*result)->magnification_y = psiconv_read_u16(buf,lev+2,off + len) / 1000.0; |
494 | (*result)->magnification_y = psiconv_read_u16(buf,lev+2,off+len,&res)/1000.0; |
|
|
495 | if (res) |
|
|
496 | goto ERROR3; |
413 | psiconv_debug(lev+2,off+len,"Form ver. magnification: %f", |
497 | psiconv_debug(lev+2,off+len,"Form ver. magnification: %f", |
414 | (*result)->magnification_y); |
498 | (*result)->magnification_y); |
415 | len += 0x02; |
499 | len += 0x02; |
416 | |
500 | |
417 | psiconv_progress(lev+2,off+len,"Going to read the left cut"); |
501 | psiconv_progress(lev+2,off+len,"Going to read the left cut"); |
418 | temp = psiconv_read_u32(buf,lev+2,off + len); |
502 | temp = psiconv_read_u32(buf,lev+2,off + len,&res); |
|
|
503 | if (res) |
|
|
504 | goto ERROR3; |
419 | (*result)->cut_left = (temp * 6.0) / (*result)->picture_xsize; |
505 | (*result)->cut_left = (temp * 6.0) / (*result)->displayed_xsize; |
420 | psiconv_debug(lev+2,off+len,"Left cut: raw %08x, real: %f", |
506 | psiconv_debug(lev+2,off+len,"Left cut: raw %08x, real: %f", |
421 | temp,(*result)->cut_left); |
507 | temp,(*result)->cut_left); |
422 | len += 0x04; |
508 | len += 0x04; |
423 | psiconv_progress(lev+2,off+len,"Going to read the right cut"); |
509 | psiconv_progress(lev+2,off+len,"Going to read the right cut"); |
424 | temp = psiconv_read_u32(buf,lev+2,off + len); |
510 | temp = psiconv_read_u32(buf,lev+2,off + len,&res); |
|
|
511 | if (res) |
|
|
512 | goto ERROR3; |
425 | (*result)->cut_right = (temp * 6.0) / (*result)->picture_xsize; |
513 | (*result)->cut_right = (temp * 6.0) / (*result)->displayed_xsize; |
426 | psiconv_debug(lev+2,off+len,"Right cut: raw %08x, real: %f", |
514 | psiconv_debug(lev+2,off+len,"Right cut: raw %08x, real: %f", |
427 | temp,(*result)->cut_right); |
515 | temp,(*result)->cut_right); |
428 | len += 0x04; |
516 | len += 0x04; |
429 | psiconv_progress(lev+2,off+len,"Going to read the top cut"); |
517 | psiconv_progress(lev+2,off+len,"Going to read the top cut"); |
430 | temp = psiconv_read_u32(buf,lev+2,off + len); |
518 | temp = psiconv_read_u32(buf,lev+2,off + len,&res); |
|
|
519 | if (res) |
|
|
520 | goto ERROR3; |
431 | (*result)->cut_top = (temp * 6.0) / (*result)->picture_ysize; |
521 | (*result)->cut_top = (temp * 6.0) / (*result)->displayed_ysize; |
432 | psiconv_debug(lev+2,off+len,"Top cut: raw %08x, real: %f", |
522 | psiconv_debug(lev+2,off+len,"Top cut: raw %08x, real: %f", |
433 | temp,(*result)->cut_top); |
523 | temp,(*result)->cut_top); |
434 | len += 0x04; |
524 | len += 0x04; |
435 | psiconv_progress(lev+2,off+len,"Going to read the bottom cut"); |
525 | psiconv_progress(lev+2,off+len,"Going to read the bottom cut"); |
436 | temp = psiconv_read_u32(buf,lev+2,off + len); |
526 | temp = psiconv_read_u32(buf,lev+2,off + len,&res); |
|
|
527 | if (res) |
|
|
528 | goto ERROR3; |
437 | (*result)->cut_bottom = (temp * 6.0) / (*result)->picture_ysize; |
529 | (*result)->cut_bottom = (temp * 6.0) / (*result)->displayed_ysize; |
438 | psiconv_debug(lev+2,off+len,"Bottom cut: raw %08x, real: %f", |
530 | psiconv_debug(lev+2,off+len,"Bottom cut: raw %08x, real: %f", |
439 | temp,(*result)->cut_bottom); |
531 | temp,(*result)->cut_bottom); |
440 | len += 0x04; |
532 | len += 0x04; |
441 | |
533 | |
442 | if (length) |
534 | if (length) |
… | |
… | |
444 | |
536 | |
445 | psiconv_progress(lev,off+len-1, |
537 | psiconv_progress(lev,off+len-1, |
446 | "End of sketch section (total length: %08x)", len); |
538 | "End of sketch section (total length: %08x)", len); |
447 | |
539 | |
448 | return res; |
540 | return res; |
|
|
541 | ERROR3: |
|
|
542 | psiconv_free_paint_data_section((*result)->picture); |
|
|
543 | ERROR2: |
|
|
544 | free (*result); |
|
|
545 | ERROR1: |
|
|
546 | psiconv_warn(lev+1,off,"Reading of Sketch Section failed"); |
|
|
547 | if (length) |
|
|
548 | *length = 0; |
|
|
549 | if (!res) |
|
|
550 | return -PSICONV_E_NOMEM; |
|
|
551 | else |
|
|
552 | return res; |
449 | } |
553 | } |
450 | |
554 | |
|
|
555 | |
|
|
556 | int psiconv_parse_clipart_section(const psiconv_buffer buf,int lev, |
|
|
557 | psiconv_u32 off, int *length, |
|
|
558 | psiconv_clipart_section *result) |
|
|
559 | { |
|
|
560 | int res=0; |
|
|
561 | int len=0; |
|
|
562 | int leng; |
|
|
563 | psiconv_u32 temp; |
|
|
564 | |
|
|
565 | psiconv_progress(lev+1,off+len,"Going to read the clipart section"); |
|
|
566 | if (!(*result = malloc(sizeof(**result)))) |
|
|
567 | goto ERROR1; |
|
|
568 | |
|
|
569 | psiconv_progress(lev+2,off+len,"Going to read the section ID"); |
|
|
570 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
571 | if (res) |
|
|
572 | goto ERROR2; |
|
|
573 | if (temp != PSICONV_ID_CLIPART_ITEM) { |
|
|
574 | psiconv_warn(lev+2,off+len, |
|
|
575 | "Unexpected value in clipart section preamble (ignored)"); |
|
|
576 | psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, |
|
|
577 | PSICONV_ID_CLIPART_ITEM); |
|
|
578 | } else |
|
|
579 | psiconv_debug(lev+2,off+len,"Clipart ID: %08x", temp); |
|
|
580 | off += 4; |
|
|
581 | |
|
|
582 | psiconv_progress(lev+2,off+len,"Going to read an unknown long"); |
|
|
583 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
584 | if (res) |
|
|
585 | goto ERROR2; |
|
|
586 | if (temp != 0x02) { |
|
|
587 | psiconv_warn(lev+2,off+len, |
|
|
588 | "Unexpected value in clipart section preamble (ignored)"); |
|
|
589 | psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, |
|
|
590 | 0x02); |
|
|
591 | } else |
|
|
592 | psiconv_debug(lev+2,off+len,"First unknown long: %08x", temp); |
|
|
593 | off += 4; |
|
|
594 | |
|
|
595 | psiconv_progress(lev+2,off+len,"Going to read a second unknown long"); |
|
|
596 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
597 | if (res) |
|
|
598 | goto ERROR2; |
|
|
599 | if (temp != 0) { |
|
|
600 | psiconv_warn(lev+2,off+len, |
|
|
601 | "Unexpected value in clipart section preamble (ignored)"); |
|
|
602 | psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, 0); |
|
|
603 | } else |
|
|
604 | psiconv_debug(lev+2,off+len,"Second unknown long: %08x", temp); |
|
|
605 | off += 4; |
|
|
606 | |
|
|
607 | psiconv_progress(lev+2,off+len,"Going to read a third unknown long"); |
|
|
608 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
609 | if (res) |
|
|
610 | goto ERROR2; |
|
|
611 | if (temp != 0) { |
|
|
612 | psiconv_warn(lev+2,off+len, |
|
|
613 | "Unexpected value in clipart section preamble (ignored)"); |
|
|
614 | psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, 0); |
|
|
615 | } else |
|
|
616 | psiconv_debug(lev+2,off+len,"Third unknown long: %08x", temp); |
|
|
617 | off += 4; |
|
|
618 | |
|
|
619 | psiconv_progress(lev+2,off+len,"Going to read a fourth unknown long"); |
|
|
620 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
|
|
621 | if (res) |
|
|
622 | goto ERROR2; |
|
|
623 | if ((temp != 0x0c) && (temp != 0x08)) { |
|
|
624 | psiconv_warn(lev+2,off+len, |
|
|
625 | "Unexpected value in clipart section preamble (ignored)"); |
|
|
626 | psiconv_debug(lev+2,off+len,"Read %08x, expected %08x or %08x",temp, |
|
|
627 | 0x0c, 0x08); |
|
|
628 | } else |
|
|
629 | psiconv_debug(lev+2,off+len,"Fourth unknown long: %08x", temp); |
|
|
630 | off += 4; |
|
|
631 | |
|
|
632 | psiconv_progress(lev+2,off+len,"Going to read the Paint Data Section"); |
|
|
633 | if ((res = psiconv_parse_paint_data_section(buf,lev+2,off+len,&leng,1, |
|
|
634 | &((*result)->picture)))) |
|
|
635 | goto ERROR2; |
|
|
636 | len += leng; |
|
|
637 | |
|
|
638 | if (length) |
|
|
639 | *length = len; |
|
|
640 | |
|
|
641 | psiconv_progress(lev,off+len-1, |
|
|
642 | "End of clipart section (total length: %08x)", len); |
|
|
643 | return 0; |
|
|
644 | |
|
|
645 | ERROR2: |
|
|
646 | free (*result); |
|
|
647 | ERROR1: |
|
|
648 | psiconv_warn(lev+1,off,"Reading of Font failed"); |
|
|
649 | if (length) |
|
|
650 | *length = 0; |
|
|
651 | if (!res) |
|
|
652 | return -PSICONV_E_NOMEM; |
|
|
653 | else |
|
|
654 | return res; |
|
|
655 | } |