/[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 24 Revision 65
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.
… …
21#include <stdlib.h> 21#include <stdlib.h>
22 22
23#include "data.h" 23#include "data.h"
24#include "parse_routines.h" 24#include "parse_routines.h"
25 25
26int psiconv_parse_mbm_jumptable_section(const psiconv_buffer buf,int lev, 26int psiconv_parse_jumptable_section(const psiconv_buffer buf,int lev,
27 psiconv_u32 off, int *length, 27 psiconv_u32 off, int *length,
28 psiconv_mbm_jumptable_section *result) 28 psiconv_jumptable_section *result)
29{ 29{
30 int res = 0; 30 int res = 0;
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 mbm 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 mbm 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
65ERROR2:
66 psiconv_list_free(*result);
67ERROR1:
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
77static int decode_byte(int lev, psiconv_u32 off,
78 psiconv_paint_data_section data, int *pixelnr,
79 psiconv_u8 byte, int bits_per_pixel, int linelen,
80 int *linepos,int picsize)
81{
82 int mask = (bits_per_pixel << 1) -1;
83 int i;
84 if (*linepos < (data->xsize + (8/bits_per_pixel) - 1) / (8/bits_per_pixel))
85 for (i = 0; i < 8/bits_per_pixel; i ++) {
86 if ((i != 0) && ((*pixelnr % (data->xsize)) == 0)) {
87 psiconv_debug(lev+1,off,"Skipping padding: %02x",byte);
88 i = 8;
89 } else if (*pixelnr >= picsize) {
90 psiconv_warn(lev+1,off,"Corrupted picture data!");
91 psiconv_debug(lev+1,off,"Trying to write a pixel too far");
92 return -1;
93 } else {
94 data->red[*pixelnr] = data->green[*pixelnr] = data->blue[*pixelnr] =
95 ((float) (byte & mask)) / ((1 << bits_per_pixel) -1);
96 psiconv_debug(lev+1,off,"Pixel %04x: (%04x,%04x) value %02x, color %f",
97 *pixelnr,*pixelnr % data->xsize,
98 *pixelnr / data->xsize, byte&mask, data->red[*pixelnr]);
99 byte = byte >> bits_per_pixel;
100 (*pixelnr) ++;
101 }
102 }
103 else
104 psiconv_debug(lev+1,off,"Skipping padding byte");
105 (*linepos) ++;
106 if (*linepos == linelen)
107 *linepos = 0;
108 return 0;
109}
110
111
60int psiconv_parse_paint_data_section(const psiconv_buffer buf,int lev, 112int psiconv_parse_paint_data_section(const psiconv_buffer buf,int lev,
61 psiconv_u32 off, int *length, 113 psiconv_u32 off, int *length,int isclipart,
62 psiconv_paint_data_section *result) 114 psiconv_paint_data_section *result)
63{ 115{
64 int res = 0; 116 int res = 0;
65 int len = 0; 117 int len = 0;
66 int read_err = 0;
67 psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen; 118 psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen;
68 psiconv_u8 marker; 119 psiconv_u8 marker;
69 int i; 120 int i,leng;
121 psiconv_u32 bits_per_pixel,compression;
122 int linepos = 0;
70 123
71 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");
72 (*result) = malloc(sizeof(**result)); 125 if (!((*result) = malloc(sizeof(**result))))
126 goto ERROR1;
73 127
74 psiconv_progress(lev+2,off+len,"Going to read section size"); 128 psiconv_progress(lev+2,off+len,"Going to read section size");
75 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;
76 psiconv_debug(lev+2,off+len,"Section size: %08x",size); 132 psiconv_debug(lev+2,off+len,"Section size: %08x",size);
77 len += 4; 133 len += 4;
78 134
79 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");
80 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;
81 if (offset != 0x28) { 139 if (offset != 0x28) {
82 psiconv_warn(lev+2,off+len, 140 psiconv_warn(lev+2,off+len,
83 "Paint data section data offset has unexpected value"); 141 "Paint data section data offset has unexpected value");
84 psiconv_debug(lev+2,off+len, 142 psiconv_debug(lev+2,off+len,
85 "Data offset: read %08x, expected %08x",offset,0x28); 143 "Data offset: read %08x, expected %08x",offset,0x28);
86 res = -1; 144 res = -1;
87 } 145 }
88 len += 4; 146 len += 4;
89 147
90 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");
91 (*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;
92 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);
93 len += 4; 153 len += 4;
94 154
95 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");
96 (*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;
97 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);
98 len += 4; 160 len += 4;
99 161
100 picsize = (*result)->ysize * (*result)->xsize * 2; 162 picsize = (*result)->ysize * (*result)->xsize;
101 linelen = (*result)->xsize;
102 163
103 psiconv_progress(lev+2,off+len,"Going to read 6 unknown longs"); 164 psiconv_progress(lev+2,off+len,"Going to read the real picture x size");
165 (*result)->pic_xsize = psiconv_read_length(buf,lev+2,off+len,&leng,&res);
166 if (res)
167 goto ERROR2;
168 psiconv_debug(lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize);
169 len += leng;
170
171 psiconv_progress(lev+2,off+len,"Going to read the real picture y size");
172 (*result)->pic_ysize = psiconv_read_length(buf,lev+2,off+len,&leng,&res);
173 if (res)
174 goto ERROR2;
175 psiconv_debug(lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize);
176 len += leng;
177
178 psiconv_progress(lev+2,off+len,"Going to read the number of bits per pixel");
179 bits_per_pixel=psiconv_read_u32(buf,lev+2,off+len,&res);
180 if (res)
181 goto ERROR2;
182 if (bits_per_pixel > 8) {
183 psiconv_warn(lev+2,off+len,"Picture has too many colors");
184 psiconv_debug(lev+2,off+len,"Read %d colorbits",bits_per_pixel);
185 res = -PSICONV_E_PARSE;
186 goto ERROR2;
187 }
188 psiconv_debug(lev+2,off+len,"Bits per pixel: %d",bits_per_pixel);
189 len += 4;
190
104 for (i = 0 ; i < 6; i++) { 191 for (i = 0 ; i < 2; i++) {
105 temp = psiconv_read_u32(buf,lev+2,off+len); 192 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
106 if (temp != (i==2?0x02:i==5?0x01:0x00)) { 193 if (res)
194 goto ERROR2;
195 if (temp != 00) {
107 psiconv_warn(lev+2,off+len, 196 psiconv_warn(lev+2,off+len,
108 "Paint data section prologue has unknown values"); 197 "Paint data section prologue has unknown values (ignored)");
109 psiconv_debug(lev+2,off+len, 198 psiconv_debug(lev+2,off+len,
110 "offset %02x: read %08x, expected %08x",i,temp, 199 "offset %02x: read %08x, expected %08x",i,temp, 0x00);
111 i==2?0x02:i==5?0x01:0x00);
112 res = -1;
113 } 200 }
114 len += 4; 201 len += 4;
115 } 202 }
203
204 psiconv_progress(lev+2,off+len,
205 "Going to read whether RLE compression is used");
206 compression=psiconv_read_u32(buf,lev+2,off+len,&res);
207 if (res)
208 goto ERROR2;
209 if (compression > 1) {
210 psiconv_warn(lev+2,off+len,"Paint data section has unknown "
211 "compression type, assuming RLE");
212 psiconv_debug(lev+2,off+len,"Read compression type %d",compression);
213 compression = 1;
214 }
215 psiconv_debug(lev+2,off+len,"Compression: %s",compression?"RLE":"none");
216 len += 4;
116 217
218 if (isclipart) {
219 psiconv_progress(lev+2,off+len,"Going to read an unknown long");
220 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
221 if (res)
222 goto ERROR2;
223 if (temp != 0xffffffff) {
224 psiconv_warn(lev+2,off+len,
225 "Paint data section prologue has unknown values (ignoring)");
226 psiconv_debug(lev+2,off+len,
227 "offset %02x: read %08x, expected %08x",i,temp, 0xffffffff);
228 }
229 len += 4;
230 psiconv_progress(lev+2,off+len,"Going to read a second unknown long");
231 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
232 if (res)
233 goto ERROR2;
234 if (temp != 0x44) {
235 psiconv_warn(lev+2,off+len,
236 "Paint data section prologue has unknown values (ignoring)");
237 psiconv_debug(lev+2,off+len,
238 "offset %02x: read %08x, expected %08x",i,temp, 0x44);
239 }
240 len += 4;
241 }
242
117 (*result)->red = malloc(sizeof(float) * picsize); 243 if (!((*result)->red = malloc(sizeof(float) * picsize)))
244 goto ERROR2;
118 (*result)->green = malloc(sizeof(float) * picsize); 245 if (!((*result)->green = malloc(sizeof(float) * picsize)))
246 goto ERROR3;
119 (*result)->blue = malloc(sizeof(float) * picsize); 247 if (!((*result)->blue = malloc(sizeof(float) * picsize)))
248 goto ERROR4;
120 len = offset; 249 len = offset;
121 datasize = size - len; 250 datasize = size - len;
251 if (isclipart)
252 len += 8;
122 253
123 psiconv_progress(lev+2,off+len,"Going to read the pixel data"); 254 psiconv_progress(lev+2,off+len,"Going to read the pixel data");
124 pixelnr = 0; 255 pixelnr = 0;
125 datanr = 0; 256 datanr = 0;
126 while ((datanr < datasize) && (pixelnr < picsize)) { 257 if (!compression) {
258 linelen = datasize / (*result)->ysize;
259 psiconv_debug(lev+3,off+len,"Line length: %04x bytes",linelen);
260 while((datanr < datasize)) {
261 temp = psiconv_read_u8(buf,lev+2,off+len+datanr,&res);
262 if (res)
263 goto ERROR5;
264 if (decode_byte(lev+3,off+len+datanr,*result,&pixelnr,temp,bits_per_pixel,
265 linelen,&linepos,picsize)) {
266 res = -PSICONV_E_PARSE;
267 break;
268 }
269 datanr++;
270 }
271 } else {
272 psiconv_progress(lev+2,off+len,"First pass: determining line length");
273 datanr = 0;
274 i = 0;
275 while (datanr < datasize) {
127 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;
279 if (marker >= 0x80) {
280 datanr += 0x100 - marker + 1;
281 i += 0x100 - marker;
282 } else {
283 datanr += 2;
284 i += marker + 1;
285 }
286 }
287 linelen = i / (*result)->ysize;
288 datanr=0;
289 psiconv_debug(lev+2,off+len,"Linelen: %04x bytes",linelen);
290 while((datanr < datasize)) {
291 marker = psiconv_read_u8(buf,lev+3,off+len+datanr,&res);
292 if (res)
293 goto ERROR5;
128 psiconv_debug(lev+3,off+len+datanr, 294 psiconv_debug(lev+3,off+len+datanr,
129 "Pixelnr %08x, Datanr %08x: Read marker %02x", 295 "Pixelnr %08x, Datanr %08x: Read marker %02x",
130 pixelnr,datanr,marker); 296 pixelnr,datanr,marker);
131 datanr ++; 297 datanr ++;
132 if (marker >= 0x80) { 298 if (marker >= 0x80) {
133 /* 0x100 - marker bytes of data follow */ 299 /* 0x100 - marker bytes of data follow */
134 for (i = 0; i < 0x100-marker; i++,datanr++) { 300 for (i = 0; i < 0x100-marker; i++,datanr++) {
135 if ((picsize == pixelnr) || (datasize == datanr)) { 301 if (datanr >= datasize) {
302 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
303 psiconv_debug(lev+3,off+len+datanr,
304 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
305 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
306 datanr,marker);
307 res = -PSICONV_E_PARSE;
308 break;
309 }
310 temp = psiconv_read_u8(buf,lev+2,off+len+datanr,&res);
311 if (res)
312 goto ERROR5;
313 if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp,
314 bits_per_pixel,linelen,&linepos,picsize)) {
315 res = -PSICONV_E_PARSE;
316 break;
317 }
318 }
319 } else {
320 if (datanr >= datasize) {
136 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); 321 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
137 psiconv_debug(lev+3,off+len+datanr, 322 psiconv_debug(lev+3,off+len+datanr,
138 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," 323 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
139 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, 324 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
140 datanr,marker); 325 datanr,marker);
141 read_err = 1; 326 res = -PSICONV_E_PARSE;
142 res = -1; 327 } else {
143 break;
144 }
145 temp = psiconv_read_u8(buf,lev+3,off+len+datanr); 328 temp = psiconv_read_u8(buf,lev+3,off+len+datanr,&res);
146 (*result)->red[pixelnr] = 329 if (res)
147 (*result)->green[pixelnr] = 330 goto ERROR5;
148 (*result)->blue[pixelnr] = 331 for (i = 0; i <= marker; i++) {
149 (temp & 0x03) * (1.0/3.0); 332 if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp,
150 pixelnr ++; 333 bits_per_pixel,linelen,&linepos,picsize)) {
151 if (pixelnr % linelen == 0) 334 res = -PSICONV_E_PARSE;
152 continue; 335 break;
153 (*result)->red[pixelnr] = 336 }
154 (*result)->green[pixelnr] = 337 }
155 (*result)->blue[pixelnr] = 338 datanr ++;
156 ((temp >> 2) & 0x03) * (1.0/3.0); 339 }
157 pixelnr ++;
158 if (pixelnr % linelen == 0)
159 continue;
160 (*result)->red[pixelnr] =
161 (*result)->green[pixelnr] =
162 (*result)->blue[pixelnr] =
163 ((temp >> 4) & 0x03) * (1.0/3.0);
164 pixelnr ++;
165 if (pixelnr % linelen == 0)
166 continue;
167 (*result)->red[pixelnr] =
168 (*result)->green[pixelnr] =
169 (*result)->blue[pixelnr] =
170 ((temp >> 6) & 0x03) * (1.0/3.0);
171 } 340 }
172 } else { /* marker < 0x080 */
173 if (datasize == datanr) {
174 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
175 psiconv_debug(lev+3,off+len+datanr,
176 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
177 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
178 datanr,marker);
179 read_err = 1;
180 res = -1;
181 } else {
182 temp = psiconv_read_u8(buf,lev+3,off+len+datanr);
183 for (i = 0; i <= marker; i++) {
184 if (picsize == pixelnr) {
185 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
186 psiconv_debug(lev+3,off+len+datanr,
187 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
188 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
189 datanr,marker);
190 read_err = 1;
191 res = -1;
192 break;
193 }
194 (*result)->red[pixelnr] =
195 (*result)->green[pixelnr] =
196 (*result)->blue[pixelnr] =
197 (temp & 0x03) * (1.0/3.0);
198 pixelnr ++;
199 if (pixelnr % linelen == 0)
200 continue;
201 (*result)->red[pixelnr] =
202 (*result)->green[pixelnr] =
203 (*result)->blue[pixelnr] =
204 ((temp >> 2) & 0x03) * (1.0/3.0);
205 pixelnr ++;
206 if (pixelnr % linelen == 0)
207 continue;
208 (*result)->red[pixelnr] =
209 (*result)->green[pixelnr] =
210 (*result)->blue[pixelnr] =
211 ((temp >> 4) & 0x03) * (1.0/3.0);
212 pixelnr ++;
213 if (pixelnr % linelen == 0)
214 continue;
215 (*result)->red[pixelnr] =
216 (*result)->green[pixelnr] =
217 (*result)->blue[pixelnr] =
218 ((temp >> 6) & 0x03) * (1.0/3.0);
219 pixelnr ++;
220 }
221 } 341 }
222 datanr += 1; 342 }
343
344 if (linepos >= ((*result)->xsize + (8/bits_per_pixel) - 1) /
345 (8/bits_per_pixel))
346 datanr += (linelen - linepos);
223 } 347
224 }
225 if (!read_err && ((datanr != datasize) || (pixelnr != picsize))) { 348 if (res || (datanr != datasize) || (pixelnr != picsize)) {
226 psiconv_warn(lev+2,off+len,"Corrupted picture data!"); 349 psiconv_warn(lev+2,off+len,"Corrupted picture data!");
227 psiconv_debug(lev+3,off+len+datanr, 350 psiconv_debug(lev+3,off+len+datanr,
228 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," 351 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
229 "Datanr: %08x",picsize,datasize,pixelnr,datanr); 352 "Datanr: %08x",picsize,datasize,pixelnr,datanr);
230 res = -1; 353 goto ERROR5;
231 } 354 }
232 355
233 len += datanr; 356 len += datanr;
234 357
235 if (length) 358 if (length)
… …
237 360
238 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 "
239 "(total length: %08x)", len); 362 "(total length: %08x)", len);
240 363
241 return res; 364 return res;
365
366ERROR5:
367 free((*result)->blue);
368ERROR4:
369 free((*result)->green);
370ERROR3:
371 free((*result)->red);
372ERROR2:
373 free (*result);
374ERROR1:
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;
242} 382}
243
244
245
246 383
247int psiconv_parse_sketch_section(const psiconv_buffer buf, int lev, 384int psiconv_parse_sketch_section(const psiconv_buffer buf, int lev,
248 psiconv_u32 off, int *length, int is_object, 385 psiconv_u32 off, int *length, int is_object,
249 psiconv_sketch_section *result) 386 psiconv_sketch_section *result)
250{ 387{
… …
253 psiconv_u32 temp; 390 psiconv_u32 temp;
254 int leng; 391 int leng;
255 int i; 392 int i;
256 393
257 psiconv_progress(lev+1,off,"Going to read the sketch section"); 394 psiconv_progress(lev+1,off,"Going to read the sketch section");
258 *result = malloc(sizeof(**result)); 395 if (!(*result = malloc(sizeof(**result))))
396 goto ERROR1;
259 397
260 if (!is_object) { 398 if (!is_object) {
261 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");
262 (*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;
263 psiconv_debug(lev+2,off+len,"Form hor. size: %04x", 403 psiconv_debug(lev+2,off+len,"Form hor. size: %04x",
264 (*result)->form_xsize); 404 (*result)->form_xsize);
265 len += 0x02; 405 len += 0x02;
266 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");
267 (*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;
268 psiconv_debug(lev+2,off+len,"Form ver. size: %04x", 410 psiconv_debug(lev+2,off+len,"Form ver. size: %04x",
269 (*result)->form_ysize); 411 (*result)->form_ysize);
270 len += 0x02; 412 len += 0x02;
271 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");
272 (*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;
273 psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x", 417 psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x",
274 (*result)->picture_x_offset); 418 (*result)->picture_x_offset);
275 len += 0x02; 419 len += 0x02;
276 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");
277 (*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;
278 psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x", 424 psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x",
279 (*result)->picture_y_offset); 425 (*result)->picture_y_offset);
280 len += 0x02; 426 len += 0x02;
281 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");
282 for (i = 0; i < 5; i++) { 428 for (i = 0; i < 5; i++) {
283 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;
284 if (temp != 0) { 432 if (temp != 0) {
285 psiconv_warn(lev+2,off+len, 433 psiconv_warn(lev+2,off+len,
286 "Unexpected value in sketch section preamble"); 434 "Unexpected value in sketch section preamble (ignored)");
287 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,
288 temp,0); 436 temp,0);
289 res = -1;
290 } 437 }
291 off += 0x02; 438 off += 0x02;
292 } 439 }
293 } else { 440 } else {
294 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");
295 (*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;
296 psiconv_debug(lev+2,off+len,"Displayed hor. size: %04x", 445 psiconv_debug(lev+2,off+len,"Displayed hor. size: %04x",
297 (*result)->picture_xsize); 446 (*result)->picture_xsize);
298 len += 0x02; 447 len += 0x02;
299 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");
300 (*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;
301 psiconv_debug(lev+2,off+len,"Displayed ver. size: %04x", 452 psiconv_debug(lev+2,off+len,"Displayed ver. size: %04x",
302 (*result)->picture_ysize); 453 (*result)->picture_ysize);
303 len += 0x02; 454 len += 0x02;
304 455
305 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");
306 for (i = 0; i < 2; i++) { 457 for (i = 0; i < 2; i++) {
307 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;
308 if (temp != 0) { 461 if (temp != 0) {
309 psiconv_warn(lev+2,off+len, 462 psiconv_warn(lev+2,off+len,
310 "Unexpected value in sketch section preamble"); 463 "Unexpected value in sketch section preamble (ignored)");
311 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,
312 temp,0); 465 temp,0);
313 res = -1;
314 } 466 }
315 off += 0x02; 467 off += 0x02;
316 } 468 }
317 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");
318 (*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;
319 psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x", 473 psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x",
320 (*result)->picture_x_offset); 474 (*result)->picture_x_offset);
321 len += 0x02; 475 len += 0x02;
322 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");
323 (*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;
324 psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x", 480 psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x",
325 (*result)->picture_y_offset); 481 (*result)->picture_y_offset);
326 len += 0x02; 482 len += 0x02;
327 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");
328 (*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;
329 psiconv_debug(lev+2,off+len,"Form hor. size: %04x", 487 psiconv_debug(lev+2,off+len,"Form hor. size: %04x",
330 (*result)->form_xsize); 488 (*result)->form_xsize);
331 len += 0x02; 489 len += 0x02;
332 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");
333 (*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;
334 psiconv_debug(lev+2,off+len,"Form ver. size: %04x", 494 psiconv_debug(lev+2,off+len,"Form ver. size: %04x",
335 (*result)->form_ysize); 495 (*result)->form_ysize);
336 len += 0x02; 496 len += 0x02;
337 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");
338 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;
339 if (temp != 0) { 501 if (temp != 0) {
340 psiconv_warn(lev+2,off+len, 502 psiconv_warn(lev+2,off+len,
341 "Unexpected value in sketch section preamble"); 503 "Unexpected value in sketch section preamble (ignored)");
342 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);
343 res = -1;
344 } 505 }
345 off += 0x02; 506 off += 0x02;
346 } 507 }
347 508
348 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");
349 res |= psiconv_parse_paint_data_section(buf,lev+2,off+len,&leng, 510 if ((res = psiconv_parse_paint_data_section(buf,lev+2,off+len,&leng,0,
350 &((*result)->picture)); 511 &((*result)->picture))))
512 goto ERROR2;
351 off += leng; 513 off += leng;
352 if (!is_object) { 514 if (!is_object) {
353 (*result)->picture_xsize = (*result)->picture->xsize; 515 (*result)->picture_xsize = (*result)->picture->xsize;
354 (*result)->picture_ysize = (*result)->picture->ysize; 516 (*result)->picture_ysize = (*result)->picture->ysize;
355 } 517 }
356 518
357 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");
358 (*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;
359 psiconv_debug(lev+2,off+len,"Form hor. magnification: %f", 523 psiconv_debug(lev+2,off+len,"Form hor. magnification: %f",
360 (*result)->magnification_x); 524 (*result)->magnification_x);
361 len += 0x02; 525 len += 0x02;
362 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");
363 (*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;
364 psiconv_debug(lev+2,off+len,"Form ver. magnification: %f", 530 psiconv_debug(lev+2,off+len,"Form ver. magnification: %f",
365 (*result)->magnification_y); 531 (*result)->magnification_y);
366 len += 0x02; 532 len += 0x02;
367 533
368 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");
369 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;
370 (*result)->cut_left = (temp * 6.0) / (*result)->picture_xsize; 538 (*result)->cut_left = (temp * 6.0) / (*result)->picture_xsize;
371 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",
372 temp,(*result)->cut_left); 540 temp,(*result)->cut_left);
373 len += 0x04; 541 len += 0x04;
374 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");
375 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;
376 (*result)->cut_right = (temp * 6.0) / (*result)->picture_xsize; 546 (*result)->cut_right = (temp * 6.0) / (*result)->picture_xsize;
377 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",
378 temp,(*result)->cut_right); 548 temp,(*result)->cut_right);
379 len += 0x04; 549 len += 0x04;
380 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");
381 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;
382 (*result)->cut_top = (temp * 6.0) / (*result)->picture_ysize; 554 (*result)->cut_top = (temp * 6.0) / (*result)->picture_ysize;
383 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",
384 temp,(*result)->cut_top); 556 temp,(*result)->cut_top);
385 len += 0x04; 557 len += 0x04;
386 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");
387 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;
388 (*result)->cut_bottom = (temp * 6.0) / (*result)->picture_ysize; 562 (*result)->cut_bottom = (temp * 6.0) / (*result)->picture_ysize;
389 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",
390 temp,(*result)->cut_bottom); 564 temp,(*result)->cut_bottom);
391 len += 0x04; 565 len += 0x04;
392 566
… …
395 569
396 psiconv_progress(lev,off+len-1, 570 psiconv_progress(lev,off+len-1,
397 "End of sketch section (total length: %08x)", len); 571 "End of sketch section (total length: %08x)", len);
398 572
399 return res; 573 return res;
574ERROR3:
575 psiconv_free_paint_data_section((*result)->picture);
576ERROR2:
577 free (*result);
578ERROR1:
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;
400} 586}
401 587
588
589int psiconv_parse_clipart_section(const psiconv_buffer buf,int lev,
590 psiconv_u32 off, int *length,
591 psiconv_clipart_section *result)
592{
593 int res=0;
594 int len=0;
595 int leng;
596 psiconv_u32 temp;
597
598 psiconv_progress(lev+1,off+len,"Going to read the clipart section");
599 if (!(*result = malloc(sizeof(**result))))
600 goto ERROR1;
601
602 psiconv_progress(lev+2,off+len,"Going to read the section ID");
603 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
604 if (res)
605 goto ERROR2;
606 if (temp != PSICONV_ID_CLIPART_ITEM) {
607 psiconv_warn(lev+2,off+len,
608 "Unexpected value in clipart section preamble (ignored)");
609 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp,
610 PSICONV_ID_CLIPART_ITEM);
611 } else
612 psiconv_debug(lev+2,off+len,"Clipart ID: %08x", temp);
613 off += 4;
614
615 psiconv_progress(lev+2,off+len,"Going to read an unknown long");
616 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
617 if (res)
618 goto ERROR2;
619 if (temp != 0x02) {
620 psiconv_warn(lev+2,off+len,
621 "Unexpected value in clipart section preamble (ignored)");
622 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp,
623 0x02);
624 } else
625 psiconv_debug(lev+2,off+len,"First unknown long: %08x", temp);
626 off += 4;
627
628 psiconv_progress(lev+2,off+len,"Going to read a second unknown long");
629 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
630 if (res)
631 goto ERROR2;
632 if (temp != 0) {
633 psiconv_warn(lev+2,off+len,
634 "Unexpected value in clipart section preamble (ignored)");
635 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, 0);
636 } else
637 psiconv_debug(lev+2,off+len,"Second unknown long: %08x", temp);
638 off += 4;
639
640 psiconv_progress(lev+2,off+len,"Going to read a third unknown long");
641 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
642 if (res)
643 goto ERROR2;
644 if (temp != 0) {
645 psiconv_warn(lev+2,off+len,
646 "Unexpected value in clipart section preamble (ignored)");
647 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, 0);
648 } else
649 psiconv_debug(lev+2,off+len,"Third unknown long: %08x", temp);
650 off += 4;
651
652 psiconv_progress(lev+2,off+len,"Going to read a fourth unknown long");
653 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
654 if (res)
655 goto ERROR2;
656 if ((temp != 0x0c) && (temp != 0x08)) {
657 psiconv_warn(lev+2,off+len,
658 "Unexpected value in clipart section preamble (ignored)");
659 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x or %08x",temp,
660 0x0c, 0x08);
661 } else
662 psiconv_debug(lev+2,off+len,"Fourth unknown long: %08x", temp);
663 off += 4;
664
665 psiconv_progress(lev+2,off+len,"Going to read the Paint Data Section");
666 if ((res = psiconv_parse_paint_data_section(buf,lev+2,off+len,&leng,1,
667 &((*result)->picture))))
668 goto ERROR2;
669 len += leng;
670
671 if (length)
672 *length = len;
673
674 psiconv_progress(lev,off+len-1,
675 "End of clipart section (total length: %08x)", len);
676 return 0;
677
678ERROR2:
679 free (*result);
680ERROR1:
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
687 return res;
688}
Legend:
Removed from v.24  
changed lines
  Added in v.65
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26