/[public]/psiconv/trunk/lib/psiconv/parse_image.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/parse_image.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 12 Revision 25
… …
50 50
51 if (length) 51 if (length)
52 *length = len; 52 *length = len;
53 53
54 psiconv_progress(lev+1,off+len-1,"End of mbm jumptable section " 54 psiconv_progress(lev+1,off+len-1,"End of mbm jumptable section "
55 "(total length: %08x", len); 55 "(total length: %08x)", len);
56 56
57 return res; 57 return res;
58} 58}
59
60static int decode_byte(int lev, psiconv_u32 off,
61 psiconv_paint_data_section data, int *pixelnr,
62 psiconv_u8 byte, int bits_per_pixel, int linelen,
63 int *linepos,int picsize)
64{
65 int mask = (bits_per_pixel << 1) -1;
66 int i;
67 if (*linepos < (data->xsize + (8/bits_per_pixel) - 1) / (8/bits_per_pixel))
68 for (i = 0; i < 8/bits_per_pixel; i ++) {
69 if ((i != 0) && ((*pixelnr % (data->xsize)) == 0)) {
70 psiconv_debug(lev+1,off,"Skipping padding: %02x",byte);
71 i = 8;
72 } else if (*pixelnr >= picsize) {
73 psiconv_warn(lev+1,off,"Corrupted picture data!");
74 psiconv_debug(lev+1,off,"Trying to write a pixel too far");
75 return -1;
76 } else {
77 data->red[*pixelnr] = data->green[*pixelnr] = data->blue[*pixelnr] =
78 ((float) (byte & mask)) / ((1 << bits_per_pixel) -1);
79 psiconv_debug(lev+1,off,"Pixel %04x: (%04x,%04x) value %02x, color %f",
80 *pixelnr,*pixelnr % data->xsize,*pixelnr / data->xsize, byte&mask, data->red[*pixelnr]);
81 byte = byte >> bits_per_pixel;
82 (*pixelnr) ++;
83 }
84 }
85 else
86 psiconv_debug(lev+1,off,"Skipping padding byte");
87 (*linepos) ++;
88 if (*linepos == linelen)
89 *linepos = 0;
90 return 0;
91}
92
59 93
60int psiconv_parse_paint_data_section(const psiconv_buffer buf,int lev, 94int psiconv_parse_paint_data_section(const psiconv_buffer buf,int lev,
61 psiconv_u32 off, int *length, 95 psiconv_u32 off, int *length,
62 psiconv_paint_data_section *result) 96 psiconv_paint_data_section *result)
63{ 97{
64 int res = 0; 98 int res = 0;
65 int len = 0; 99 int len = 0;
66 int read_err = 0; 100 int read_err = 0;
67 psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr; 101 psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen;
68 psiconv_u8 marker; 102 psiconv_u8 marker;
69 int i; 103 int i,leng;
104 psiconv_u32 bits_per_pixel,compression;
105 int linepos = 0;
70 106
71 psiconv_progress(lev+1,off,"Going to read a paint data section"); 107 psiconv_progress(lev+1,off,"Going to read a paint data section");
72 (*result) = malloc(sizeof(**result)); 108 (*result) = malloc(sizeof(**result));
73 109
74 psiconv_progress(lev+2,off+len,"Going to read section size"); 110 psiconv_progress(lev+2,off+len,"Going to read section size");
… …
76 psiconv_debug(lev+2,off+len,"Section size: %08x",size); 112 psiconv_debug(lev+2,off+len,"Section size: %08x",size);
77 len += 4; 113 len += 4;
78 114
79 psiconv_progress(lev+2,off+len,"Going to read pixel data offset"); 115 psiconv_progress(lev+2,off+len,"Going to read pixel data offset");
80 offset = psiconv_read_u32(buf,lev+2,off+len); 116 offset = psiconv_read_u32(buf,lev+2,off+len);
81 if (size != 0x28) { 117 if (offset != 0x28) {
82 psiconv_warn(lev+2,off+len, 118 psiconv_warn(lev+2,off+len,
83 "Paint data section data offset has unexpected value"); 119 "Paint data section data offset has unexpected value");
84 psiconv_debug(lev+2,off+len, 120 psiconv_debug(lev+2,off+len,
85 "Data offset: read %08x, expected %08x",offset,0x28); 121 "Data offset: read %08x, expected %08x",offset,0x28);
86 res = -1; 122 res = -1;
… …
97 psiconv_debug(lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize); 133 psiconv_debug(lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize);
98 len += 4; 134 len += 4;
99 135
100 picsize = (*result)->ysize * (*result)->xsize; 136 picsize = (*result)->ysize * (*result)->xsize;
101 137
138 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);
140 psiconv_debug(lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize);
141 len += leng;
142
143 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);
145 psiconv_debug(lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize);
146 len += leng;
147
102 psiconv_progress(lev+2,off+len,"Going to read 6 unused longs"); 148 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);
150 if (bits_per_pixel > 8) {
151 psiconv_warn(lev+2,off+len,"Picture has too many colors");
152 psiconv_debug(lev+2,off+len,"Read %d colorbits",bits_per_pixel);
153 res = -1;
154 bits_per_pixel = 2;
155 }
156 psiconv_debug(lev+2,off+len,"Bits per pixel: %d",bits_per_pixel);
157 len += 4;
158
103 for (i = 0 ; i < 6; i++) { 159 for (i = 0 ; i < 2; i++) {
104 temp = psiconv_read_u32(buf,lev+2,off+len); 160 temp = psiconv_read_u32(buf,lev+2,off+len);
105 if (temp != 0x00) { 161 if (temp != 00) {
106 psiconv_warn(lev+2,off+len, 162 psiconv_warn(lev+2,off+len,
107 "Paint data section prologue has unknown values"); 163 "Paint data section prologue has unknown values");
108 psiconv_debug(lev+2,off+len, 164 psiconv_debug(lev+2,off+len,
109 "offset %02x: read %08x, expected %08x",i,temp,0x00); 165 "offset %02x: read %08x, expected %08x",i,temp, 0x00);
110 res = -1; 166 res = -1;
111 } 167 }
112 len += 4; 168 len += 4;
113 } 169 }
170
171 psiconv_progress(lev+2,off+len,
172 "Going to read whether RLE compression is used");
173 compression=psiconv_read_u32(buf,lev+2,off+len);
174 if (compression > 1) {
175 psiconv_warn(lev+2,off+len,"Paint data section has unknown "
176 "compression type, assuming RLE");
177 psiconv_debug(lev+2,off+len,"Read compression type %d",compression);
178 compression = 1;
179 }
180 psiconv_debug(lev+2,off+len,"Compression: %s",compression?"RLE":"none");
114 181
115 (*result)->red = malloc(sizeof(float) * picsize); 182 (*result)->red = malloc(sizeof(float) * picsize);
116 (*result)->green = malloc(sizeof(float) * picsize); 183 (*result)->green = malloc(sizeof(float) * picsize);
117 (*result)->blue = malloc(sizeof(float) * picsize); 184 (*result)->blue = malloc(sizeof(float) * picsize);
118 len = offset; 185 len = offset;
119 datasize = size - len; 186 datasize = size - len;
120 187
121 psiconv_progress(lev+2,off+len,"Going to read the pixel data"); 188 psiconv_progress(lev+2,off+len,"Going to read the pixel data");
122 pixelnr = 0; 189 pixelnr = 0;
123 datanr = 0; 190 datanr = 0;
124 while ((datanr < datasize) && (pixelnr < picsize)) { 191 if (!compression) {
192 linelen = datasize / (*result)->ysize;
193 psiconv_debug(lev+3,off+len,"Line length: %04x bytes",linelen);
194 while((datanr < datasize)) {
125 marker = psiconv_read_u8(buf,lev+3,off+len+datanr); 195 temp = psiconv_read_u8(buf,lev+2,off+len+datanr);
126 psiconv_debug(lev+3,off+len+datanr, 196 if (decode_byte(lev+3,off+len+datanr,*result,&pixelnr,temp,bits_per_pixel,
127 "Pixelnr %08x, Datanr %08x: Read marker %02x", 197 linelen,&linepos,picsize)) {
128 pixelnr,datanr,marker); 198 read_err = 1;
129 datanr ++;
130 if (marker >= 0x80) {
131 /* 0x100 - marker bytes of data follow */
132 if ((0x100 - marker + datanr > datasize) ||
133 ((0x100 - marker) * 4 + pixelnr > picsize)) {
134 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
135 psiconv_debug(lev+3,off+len+datanr,
136 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
137 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
138 datanr,marker);
139 res = -1; 199 res = -1;
140 read_err = 1; 200 break;
201 }
202 datanr++;
203 }
204 } else {
205 psiconv_progress(lev+2,off+len,"First pass: determining line length");
206 datanr = 0;
207 i = 0;
208 while (datanr < datasize) {
209 marker = psiconv_read_u8(buf,lev+3,off+len+datanr);
210 if (marker >= 0x80) {
211 datanr += 0x100 - marker + 1;
212 i += 0x100 - marker;
141 } else { 213 } else {
142 for (i = 0; i < 0x100-marker; i++) { 214 datanr += 2;
215 i += marker + 1;
216 }
217 }
218 linelen = i / (*result)->ysize;
219 datanr=0;
220 psiconv_debug(lev+2,off+len,"Linelen: %04x bytes",linelen);
221 while((datanr < datasize)) {
143 temp = psiconv_read_u8(buf,lev+3,off+len+datanr+i); 222 marker = psiconv_read_u8(buf,lev+3,off+len+datanr);
144 (*result)->red[pixelnr + i*4] =
145 (*result)->green[pixelnr + i*4] =
146 (*result)->blue[pixelnr + i*4] =
147 (temp & 0x03) * (1.0/3.0);
148 (*result)->red[pixelnr + i*4 + 1] =
149 (*result)->green[pixelnr + i*4 +1] =
150 (*result)->blue[pixelnr + i*4 + 1] =
151 ((temp >> 2) & 0x03) * (1.0/3.0);
152 (*result)->red[pixelnr + i*4 + 2] =
153 (*result)->green[pixelnr + i*4 +2] =
154 (*result)->blue[pixelnr + i*4 + 2] =
155 ((temp >> 4) & 0x03) * (1.0/3.0);
156 (*result)->red[pixelnr + i*4 + 3] =
157 (*result)->green[pixelnr + i*4 +3] =
158 (*result)->blue[pixelnr + i*4 + 3] =
159 ((temp >> 6) & 0x03) * (1.0/3.0);
160 }
161 }
162 pixelnr += (0x100 - marker) * 4;
163 datanr += (0x100 - marker);
164 } else { /* marker < 0x080 */
165 if ((datanr + 1 > datasize) ||
166 (marker * 4 + pixelnr > picsize)) {
167 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
168 psiconv_debug(lev+3,off+len+datanr, 223 psiconv_debug(lev+3,off+len+datanr,
224 "Pixelnr %08x, Datanr %08x: Read marker %02x",
225 pixelnr,datanr,marker);
226 datanr ++;
227 if (marker >= 0x80) {
228 /* 0x100 - marker bytes of data follow */
229 for (i = 0; i < 0x100-marker; i++,datanr++) {
230 if (datanr >= datasize) {
231 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
232 psiconv_debug(lev+3,off+len+datanr,
169 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," 233 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
170 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, 234 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
171 datanr,marker); 235 datanr,marker);
172 res = -1;
173 read_err = 1; 236 read_err = 1;
237 res = -1;
238 break;
239 }
240 temp = psiconv_read_u8(buf,lev+2,off+len+datanr);
241 if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp,
242 bits_per_pixel,linelen,&linepos,picsize)) {
243 res = -1;
244 read_err = 1;
245 break;
246 }
247 }
174 } else { 248 } else {
249 if (datanr >= datasize) {
250 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
251 psiconv_debug(lev+3,off+len+datanr,
252 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
253 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
254 datanr,marker);
255 read_err = 1;
256 res = -1;
257 } else {
175 temp = psiconv_read_u8(buf,lev+3,off+len+datanr); 258 temp = psiconv_read_u8(buf,lev+3,off+len+datanr);
176 for (i = 0; i < marker; i++) { 259 for (i = 0; i <= marker; i++) {
177 (*result)->red[pixelnr + i*4] = 260 if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp,
178 (*result)->green[pixelnr + i*4] = 261 bits_per_pixel,linelen,&linepos,picsize)) {
179 (*result)->blue[pixelnr + i*4] = 262 read_err = 1;
180 (temp & 0x03) * (1.0/3.0); 263 res = -1;
181 (*result)->red[pixelnr + i*4 + 1] = 264 break;
182 (*result)->green[pixelnr + i*4 +1] = 265 }
183 (*result)->blue[pixelnr + i*4 + 1] = 266 }
184 ((temp >> 2) & 0x03) * (1.0/3.0); 267 datanr ++;
185 (*result)->red[pixelnr + i*4 + 2] = 268 }
186 (*result)->green[pixelnr + i*4 +2] =
187 (*result)->blue[pixelnr + i*4 + 2] =
188 ((temp >> 4) & 0x03) * (1.0/3.0);
189 (*result)->red[pixelnr + i*4 + 3] =
190 (*result)->green[pixelnr + i*4 +3] =
191 (*result)->blue[pixelnr + i*4 + 3] =
192 ((temp >> 6) & 0x03) * (1.0/3.0);
193 } 269 }
194 } 270 }
195 pixelnr += marker * 4; 271 }
196 datanr += 1; 272
273 if (linepos >= ((*result)->xsize + (8/bits_per_pixel) - 1) /
274 (8/bits_per_pixel))
275 datanr += (linelen - linepos);
197 } 276
198 }
199 if (!read_err && ((datanr != datasize) || (pixelnr != picsize))) { 277 if (!read_err && ((datanr != datasize) || (pixelnr != picsize))) {
200 psiconv_warn(lev+2,off+len,"Corrupted picture data!"); 278 psiconv_warn(lev+2,off+len,"Corrupted picture data!");
201 psiconv_debug(lev+3,off+len+datanr, 279 psiconv_debug(lev+3,off+len+datanr,
202 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," 280 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
203 "Datanr: %08x",picsize,datasize,pixelnr,datanr); 281 "Datanr: %08x",picsize,datasize,pixelnr,datanr);
… …
208 286
209 if (length) 287 if (length)
210 *length = len; 288 *length = len;
211 289
212 psiconv_progress(lev+1,off+len-1,"End of paint data section " 290 psiconv_progress(lev+1,off+len-1,"End of paint data section "
213 "(total length: %08x", len); 291 "(total length: %08x)", len);
214 292
215 return res; 293 return res;
216} 294}
217 295
296int psiconv_parse_sketch_section(const psiconv_buffer buf, int lev,
297 psiconv_u32 off, int *length, int is_object,
298 psiconv_sketch_section *result)
299{
300 int res=0;
301 int len=0;
302 psiconv_u32 temp;
303 int leng;
304 int i;
218 305
306 psiconv_progress(lev+1,off,"Going to read the sketch section");
307 *result = malloc(sizeof(**result));
308
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");
344 (*result)->picture_xsize = psiconv_read_u16(buf,lev+2,off + len);
345 psiconv_debug(lev+2,off+len,"Displayed hor. size: %04x",
346 (*result)->picture_xsize);
347 len += 0x02;
348 psiconv_progress(lev+2,off+len,"Going to read the displayed ver. size");
349 (*result)->picture_ysize = psiconv_read_u16(buf,lev+2,off + len);
350 psiconv_debug(lev+2,off+len,"Displayed ver. size: %04x",
351 (*result)->picture_ysize);
352 len += 0x02;
353
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");
367 (*result)->picture_x_offset = psiconv_read_u16(buf,lev+2,off + len);
368 psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x",
369 (*result)->picture_x_offset);
370 len += 0x02;
371 psiconv_progress(lev+2,off+len,"Going to read the picture ver. offset");
372 (*result)->picture_y_offset = psiconv_read_u16(buf,lev+2,off + len);
373 psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x",
374 (*result)->picture_y_offset);
375 len += 0x02;
376 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);
378 psiconv_debug(lev+2,off+len,"Form hor. size: %04x",
379 (*result)->form_xsize);
380 len += 0x02;
381 psiconv_progress(lev+2,off+len,"Going to read the form ver. size");
382 (*result)->form_ysize = psiconv_read_u16(buf,lev+2,off + len);
383 psiconv_debug(lev+2,off+len,"Form ver. size: %04x",
384 (*result)->form_ysize);
385 len += 0x02;
386 psiconv_progress(lev+2,off+len,"Going to skip 1 zero word");
387 temp = psiconv_read_u16(buf,lev+2,off+len);
388 if (temp != 0) {
389 psiconv_warn(lev+2,off+len,
390 "Unexpected value in sketch section preamble");
391 psiconv_debug(lev+2,off+len,"Read %04x, expected %04x",i, temp,0);
392 res = -1;
393 }
394 off += 0x02;
395 }
396
397 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,
399 &((*result)->picture));
400 off += leng;
401 if (!is_object) {
402 (*result)->picture_xsize = (*result)->picture->xsize;
403 (*result)->picture_ysize = (*result)->picture->ysize;
404 }
405
406 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;
408 psiconv_debug(lev+2,off+len,"Form hor. magnification: %f",
409 (*result)->magnification_x);
410 len += 0x02;
411 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;
413 psiconv_debug(lev+2,off+len,"Form ver. magnification: %f",
414 (*result)->magnification_y);
415 len += 0x02;
416
417 psiconv_progress(lev+2,off+len,"Going to read the left cut");
418 temp = psiconv_read_u32(buf,lev+2,off + len);
419 (*result)->cut_left = (temp * 6.0) / (*result)->picture_xsize;
420 psiconv_debug(lev+2,off+len,"Left cut: raw %08x, real: %f",
421 temp,(*result)->cut_left);
422 len += 0x04;
423 psiconv_progress(lev+2,off+len,"Going to read the right cut");
424 temp = psiconv_read_u32(buf,lev+2,off + len);
425 (*result)->cut_right = (temp * 6.0) / (*result)->picture_xsize;
426 psiconv_debug(lev+2,off+len,"Right cut: raw %08x, real: %f",
427 temp,(*result)->cut_right);
428 len += 0x04;
429 psiconv_progress(lev+2,off+len,"Going to read the top cut");
430 temp = psiconv_read_u32(buf,lev+2,off + len);
431 (*result)->cut_top = (temp * 6.0) / (*result)->picture_ysize;
432 psiconv_debug(lev+2,off+len,"Top cut: raw %08x, real: %f",
433 temp,(*result)->cut_top);
434 len += 0x04;
435 psiconv_progress(lev+2,off+len,"Going to read the bottom cut");
436 temp = psiconv_read_u32(buf,lev+2,off + len);
437 (*result)->cut_bottom = (temp * 6.0) / (*result)->picture_ysize;
438 psiconv_debug(lev+2,off+len,"Bottom cut: raw %08x, real: %f",
439 temp,(*result)->cut_bottom);
440 len += 0x04;
441
442 if (length)
443 *length = len;
444
445 psiconv_progress(lev,off+len-1,
446 "End of sketch section (total length: %08x)", len);
447
448 return res;
449}
450
Legend:
Removed from v.12  
changed lines
  Added in v.25
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26