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