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