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