/[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 64 Revision 230
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, 2000 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 1999-2004 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"
27#include "image.h"
25 28
29#ifdef DMALLOC
30#include <dmalloc.h>
31#endif
32
33/* Extreme debugging info */
34#undef LOUD
35
36static int psiconv_decode_rle8 (const psiconv_config config, int lev,
37 psiconv_u32 off,
38 const psiconv_pixel_bytes encoded,
39 psiconv_pixel_bytes *decoded);
40
41static int psiconv_decode_rle12 (const psiconv_config config, int lev,
42 psiconv_u32 off,
43 const psiconv_pixel_bytes encoded,
44 psiconv_pixel_bytes *decoded);
45
46static int psiconv_decode_rle16 (const psiconv_config config, int lev,
47 psiconv_u32 off,
48 const psiconv_pixel_bytes encoded,
49 psiconv_pixel_bytes *decoded);
50
51static int psiconv_decode_rle24 (const psiconv_config config, int lev,
52 psiconv_u32 off,
53 const psiconv_pixel_bytes encoded,
54 psiconv_pixel_bytes *decoded);
55
56static int psiconv_bytes_to_pixel_data(const psiconv_config config,
57 int lev, psiconv_u32 off,
58 const psiconv_pixel_bytes bytes,
59 psiconv_pixel_ints *pixels,
60 int colordepth, int xsize, int ysize);
61
62static int psiconv_pixel_data_to_floats (const psiconv_config config, int lev,
63 psiconv_u32 off,
64 const psiconv_pixel_ints pixels,
65 psiconv_pixel_floats_t *floats,
66 int colordepth, int color,
67 int redbits, int bluebits, int greenbits,
68 const psiconv_pixel_floats_t palet);
69
70
71
26int psiconv_parse_jumptable_section(const psiconv_buffer buf,int lev, 72int psiconv_parse_jumptable_section(const psiconv_config config,
73 const psiconv_buffer buf,int lev,
27 psiconv_u32 off, int *length, 74 psiconv_u32 off, int *length,
28 psiconv_jumptable_section *result) 75 psiconv_jumptable_section *result)
29{ 76{
30 int res = 0; 77 int res = 0;
31 int len = 0; 78 int len = 0;
32 psiconv_u32 listlen,temp; 79 psiconv_u32 listlen,temp;
33 int i; 80 int i;
34 81
35 psiconv_progress(lev+1,off+len,"Going to read the jumptable section"); 82 psiconv_progress(config,lev+1,off+len,"Going to read the jumptable section");
36 if (!((*result) = psiconv_list_new(sizeof(psiconv_u32)))) 83 if (!((*result) = psiconv_list_new(sizeof(psiconv_u32))))
37 goto ERROR1; 84 goto ERROR1;
38 85
39 psiconv_progress(lev+2,off+len,"Going to read the list length"); 86 psiconv_progress(config,lev+2,off+len,"Going to read the list length");
40 listlen = psiconv_read_u32(buf,lev+2,off+len,&res); 87 listlen = psiconv_read_u32(config,buf,lev+2,off+len,&res);
41 if (!res) 88 if (res)
42 goto ERROR2; 89 goto ERROR2;
43 psiconv_debug(lev+2,off+len,"List length: %08x",listlen); 90 psiconv_debug(config,lev+2,off+len,"List length: %08x",listlen);
44 len += 4; 91 len += 4;
45 92
46 psiconv_progress(lev+2,off+len,"Going to read the list"); 93 psiconv_progress(config,lev+2,off+len,"Going to read the list");
47 for (i = 0; i < listlen; i++) { 94 for (i = 0; i < listlen; i++) {
48 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 95 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
49 if (!res) 96 if (res)
50 goto ERROR2; 97 goto ERROR2;
51 if ((res = psiconv_list_add(*result,&temp))) 98 if ((res = psiconv_list_add(*result,&temp)))
52 goto ERROR2; 99 goto ERROR2;
53 psiconv_debug(lev+3,off+len,"Offset: %08x",temp); 100 psiconv_debug(config,lev+3,off+len,"Offset: %08x",temp);
54 len += 4; 101 len += 4;
55 } 102 }
56 103
57 if (length) 104 if (length)
58 *length = len; 105 *length = len;
59 106
60 psiconv_progress(lev+1,off+len-1,"End of jumptable section " 107 psiconv_progress(config,lev+1,off+len-1,"End of jumptable section "
61 "(total length: %08x)", len); 108 "(total length: %08x)", len);
62 109
63 return 0; 110 return 0;
64 111
65ERROR2: 112ERROR2:
66 psiconv_list_free(*result); 113 psiconv_list_free(*result);
67ERROR1: 114ERROR1:
68 psiconv_warn(lev+1,off,"Reading of Jumptable Section failed"); 115 psiconv_error(config,lev+1,off,"Reading of Jumptable Section failed");
69 if (length) 116 if (length)
70 *length = 0; 117 *length = 0;
71 if (!res) 118 if (!res)
72 return -PSICONV_E_NOMEM; 119 return -PSICONV_E_NOMEM;
73 else 120 else
74 return res; 121 return res;
75} 122}
76 123
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
112int psiconv_parse_paint_data_section(const psiconv_buffer buf,int lev, 124int psiconv_parse_paint_data_section(const psiconv_config config,
125 const psiconv_buffer buf,int lev,
113 psiconv_u32 off, int *length,int isclipart, 126 psiconv_u32 off, int *length,int isclipart,
114 psiconv_paint_data_section *result) 127 psiconv_paint_data_section *result)
115{ 128{
116 int res = 0; 129 int res = 0;
117 int len = 0; 130 int len = 0;
118 psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen; 131 psiconv_u32 size,offset,picsize,temp,datasize,color,
132 redbits,bluebits,greenbits;
119 psiconv_u8 marker; 133 psiconv_u8 byte;
120 int i,leng; 134 int leng,i;
121 psiconv_u32 bits_per_pixel,compression; 135 psiconv_u32 bits_per_pixel,compression;
122 int linepos = 0; 136 psiconv_pixel_bytes bytes,decoded;
137 psiconv_pixel_ints pixels;
138 psiconv_pixel_floats_t floats,palet;
123 139
124 psiconv_progress(lev+1,off,"Going to read a paint data section"); 140 psiconv_progress(config,lev+1,off,"Going to read a paint data section");
125 if (!((*result) = malloc(sizeof(**result)))) 141 if (!((*result) = malloc(sizeof(**result))))
126 goto ERROR1; 142 goto ERROR1;
127 143
144 if (!(bytes = psiconv_list_new(sizeof(psiconv_u8))))
145 goto ERROR2;
146
128 psiconv_progress(lev+2,off+len,"Going to read section size"); 147 psiconv_progress(config,lev+2,off+len,"Going to read section size");
129 size = psiconv_read_u32(buf,lev+2,off+len,&res); 148 size = psiconv_read_u32(config,buf,lev+2,off+len,&res);
130 if (res) 149 if (res)
131 goto ERROR2; 150 goto ERROR3;
132 psiconv_debug(lev+2,off+len,"Section size: %08x",size); 151 psiconv_debug(config,lev+2,off+len,"Section size: %08x",size);
133 len += 4; 152 len += 4;
134 153
135 psiconv_progress(lev+2,off+len,"Going to read pixel data offset"); 154 psiconv_progress(config,lev+2,off+len,"Going to read pixel data offset");
136 offset = psiconv_read_u32(buf,lev+2,off+len,&res); 155 offset = psiconv_read_u32(config,buf,lev+2,off+len,&res);
137 if (res) 156 if (res)
138 goto ERROR2; 157 goto ERROR3;
139 if (offset != 0x28) { 158 if (offset != 0x28) {
140 psiconv_warn(lev+2,off+len, 159 psiconv_error(config,lev+2,off+len,
141 "Paint data section data offset has unexpected value"); 160 "Paint data section data offset has unexpected value");
142 psiconv_debug(lev+2,off+len, 161 psiconv_debug(config,lev+2,off+len,
143 "Data offset: read %08x, expected %08x",offset,0x28); 162 "Data offset: read %08x, expected %08x",offset,0x28);
144 res = -1; 163 res = -1;
145 } 164 }
146 len += 4; 165 len += 4;
147 166
148 psiconv_progress(lev+2,off+len,"Going to read picture X size"); 167 psiconv_progress(config,lev+2,off+len,"Going to read picture X size");
149 (*result)->xsize = psiconv_read_u32(buf,lev+2,off+len,&res); 168 (*result)->xsize = psiconv_read_u32(config,buf,lev+2,off+len,&res);
150 if (res) 169 if (res)
151 goto ERROR2; 170 goto ERROR3;
152 psiconv_debug(lev+2,off+len,"Picture X size: %08x:",(*result)->xsize); 171 psiconv_debug(config,lev+2,off+len,"Picture X size: %08x:",(*result)->xsize);
153 len += 4; 172 len += 4;
154 173
155 psiconv_progress(lev+2,off+len,"Going to read picture Y size"); 174 psiconv_progress(config,lev+2,off+len,"Going to read picture Y size");
156 (*result)->ysize = psiconv_read_u32(buf,lev+2,off+len,&res); 175 (*result)->ysize = psiconv_read_u32(config,buf,lev+2,off+len,&res);
157 if (res) 176 if (res)
158 goto ERROR2; 177 goto ERROR3;
159 psiconv_debug(lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize); 178 psiconv_debug(config,lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize);
160 len += 4; 179 len += 4;
161 180
162 picsize = (*result)->ysize * (*result)->xsize; 181 picsize = (*result)->ysize * (*result)->xsize;
163 182
164 psiconv_progress(lev+2,off+len,"Going to read the real picture x size"); 183 psiconv_progress(config,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); 184 (*result)->pic_xsize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
166 if (res) 185 if (res)
167 goto ERROR2; 186 goto ERROR3;
168 psiconv_debug(lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize); 187 psiconv_debug(config,lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize);
169 len += leng; 188 len += leng;
170 189
171 psiconv_progress(lev+2,off+len,"Going to read the real picture y size"); 190 psiconv_progress(config,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); 191 (*result)->pic_ysize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
173 if (res) 192 if (res)
174 goto ERROR2; 193 goto ERROR3;
175 psiconv_debug(lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize); 194 psiconv_debug(config,lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize);
176 len += leng; 195 len += leng;
177 196
178 psiconv_progress(lev+2,off+len,"Going to read the number of bits per pixel"); 197 psiconv_progress(config,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); 198 bits_per_pixel=psiconv_read_u32(config,buf,lev+2,off+len,&res);
180 if (res) 199 if (res)
181 goto ERROR2; 200 goto ERROR3;
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); 201 psiconv_debug(config,lev+2,off+len,"Bits per pixel: %d",bits_per_pixel);
189 len += 4; 202 len += 4;
190 203
191 for (i = 0 ; i < 2; i++) { 204 psiconv_progress(config,lev+2,off+len,
205 "Going to read whether this is a colour or greyscale picture");
206 color = psiconv_read_u32(config,buf,lev+2,off+len,&res);
207 if (res)
208 goto ERROR3;
209 if ((color != 0) && (color != 1)) {
210 psiconv_warn(config,lev+2,off+len,
211 "Paint data section unknown color type (ignored)");
212 psiconv_debug(config,lev+2,off+len,
213 "Color: read %08x, expected %08x or %08x",color,0,1);
214 color = 1;
215 } else {
216 psiconv_debug(config,lev+2,off+len,"Color: %08x (%s picture)",
217 color,(color?"color":"greyscale"));
218 }
219 len += 4;
220
221 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
222 if (res)
223 goto ERROR3;
224 if (temp != 00) {
225 psiconv_warn(config,lev+2,off+len,
226 "Paint data section prologue has unknown values (ignored)");
227 psiconv_debug(config,lev+2,off+len,
228 "read %08x, expected %08x",temp, 0x00);
229 }
230 len += 4;
231
232 psiconv_progress(config,lev+2,off+len,
233 "Going to read whether RLE compression is used");
234 compression=psiconv_read_u32(config,buf,lev+2,off+len,&res);
235 if (res)
236 goto ERROR3;
237 if (compression > 4) {
238 psiconv_warn(config,lev+2,off+len,"Paint data section has unknown "
239 "compression type, assuming RLE");
240 psiconv_debug(config,lev+2,off+len,"Read compression type %d",compression);
241 compression = 0;
242 }
243 psiconv_debug(config,lev+2,off+len,"Compression: %s",
244 compression == 4?"RLE24":compression == 3?"RLE16":
245 compression == 2?"RLE12":compression == 1?"RLE8":"none");
246 len += 4;
247
248 if (isclipart) {
249 psiconv_progress(config,lev+2,off+len,"Going to read an unknown long");
192 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 250 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
193 if (res) 251 if (res)
194 goto ERROR2; 252 goto ERROR3;
195 if (temp != 00) { 253 if (temp != 0xffffffff) {
196 psiconv_warn(lev+2,off+len, 254 psiconv_warn(config,lev+2,off+len,
197 "Paint data section prologue has unknown values (ignored)"); 255 "Paint data section prologue has unknown values (ignoring)");
198 psiconv_debug(lev+2,off+len, 256 psiconv_debug(config,lev+2,off+len,
199 "offset %02x: read %08x, expected %08x",i,temp, 0x00); 257 "Read %08x, expected %08x",temp, 0xffffffff);
200 } 258 }
201 len += 4; 259 len += 4;
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;
217
218 if (isclipart) {
219 psiconv_progress(lev+2,off+len,"Going to read an unknown long"); 260 psiconv_progress(config,lev+2,off+len,"Going to read a second unknown long");
220 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 261 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
221 if (res) 262 if (res)
222 goto ERROR2; 263 goto ERROR3;
223 if (temp != 0xffffffff) { 264 if (temp != 0x44) {
224 psiconv_warn(lev+2,off+len, 265 psiconv_warn(config,lev+2,off+len,
225 "Paint data section prologue has unknown values (ignoring)"); 266 "Paint data section prologue has unknown values (ignoring)");
226 psiconv_debug(lev+2,off+len, 267 psiconv_debug(config,lev+2,off+len,
227 "offset %02x: read %08x, expected %08x",i,temp, 0xffffffff); 268 "read %08x, expected %08x",temp, 0x44);
228 } 269 }
229 len += 4; 270 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 } 271 }
240 len += 4;
241 }
242 272
243 if (!((*result)->red = malloc(sizeof(float) * picsize)))
244 goto ERROR2;
245 if (!((*result)->green = malloc(sizeof(float) * picsize)))
246 goto ERROR3;
247 if (!((*result)->blue = malloc(sizeof(float) * picsize)))
248 goto ERROR4;
249 len = offset; 273 len = offset;
250 datasize = size - len; 274 datasize = size - len;
251 if (isclipart) 275 if (isclipart)
252 len += 8; 276 len += 8;
253 277
278 if (color || (bits_per_pixel != 2))
279 psiconv_warn(config,lev+2,off+len,
280 "All image types except 2-bit greyscale are experimental!");
281
254 psiconv_progress(lev+2,off+len,"Going to read the pixel data"); 282 psiconv_progress(config,lev+2,off+len,"Going to read the pixel data");
255 pixelnr = 0; 283 for (i = 0; i < datasize; i++) {
256 datanr = 0;
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); 284 byte = psiconv_read_u8(config,buf,lev+2,off+len+i,&res);
285#ifdef LOUD
286 psiconv_debug(config,lev+2,off+len+i,
287 "Pixel byte %04x of %04x has value %02x",
288 i,datasize,byte);
289#endif
262 if (res) 290 if (res)
291 goto ERROR3;
292 psiconv_list_add(bytes,&byte);
293 }
294 len += datasize;
295
296 switch(compression) {
297 case 1:
298 if ((res = psiconv_decode_rle8(config,lev+2,off+len,bytes,&decoded)))
299 goto ERROR3;
300 psiconv_list_free(bytes);
301 bytes = decoded;
302 break;
303 case 2:
304 if ((psiconv_decode_rle12(config,lev+2,off+len,bytes,&decoded)))
305 goto ERROR3;
306 psiconv_list_free(bytes);
307 bytes = decoded;
308 break;
309 case 3:
310 if ((psiconv_decode_rle16(config,lev+2,off+len,bytes,&decoded)))
263 goto ERROR5; 311 goto ERROR3;
264 if (decode_byte(lev+3,off+len+datanr,*result,&pixelnr,temp,bits_per_pixel, 312 psiconv_list_free(bytes);
265 linelen,&linepos,picsize)) { 313 bytes = decoded;
266 res = -PSICONV_E_PARSE;
267 break; 314 break;
268 } 315 case 4:
269 datanr++; 316 if ((psiconv_decode_rle24(config,lev+2,off+len,bytes,&decoded)))
317 goto ERROR3;
318 psiconv_list_free(bytes);
319 bytes = decoded;
320 break;
321 }
322
323 if ((res = psiconv_bytes_to_pixel_data(config,lev+2,off+len,bytes,
324 &pixels,bits_per_pixel,
325 (*result)->xsize,(*result)->ysize)))
326 goto ERROR3;
327
328 /* Use some heuristics; things may get unexpected around here */
329 bluebits = redbits = greenbits = 0;
330 palet = psiconv_palet_none;
331 if (color) {
332 if (bits_per_pixel == 4)
333 palet = psiconv_palet_color_4;
334 else if (bits_per_pixel == 8)
335 palet = psiconv_palet_color_8;
336 else {
337 redbits = (bits_per_pixel+2) / 3;
338 greenbits = (bits_per_pixel+2) / 3;
339 bluebits = bits_per_pixel - redbits - greenbits;
270 } 340 }
271 } else {
272 psiconv_progress(lev+2,off+len,"First pass: determining line length");
273 datanr = 0;
274 i = 0;
275 while (datanr < datasize) {
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 } 341 }
287 linelen = i / (*result)->ysize; 342 if ((res = psiconv_pixel_data_to_floats(config,lev+2,off+len,pixels,
288 datanr=0; 343 &floats,bits_per_pixel,color,
289 psiconv_debug(lev+2,off+len,"Linelen: %04x bytes",linelen); 344 redbits,greenbits,bluebits,palet)))
290 while((datanr < datasize)) {
291 marker = psiconv_read_u8(buf,lev+3,off+len+datanr,&res);
292 if (res)
293 goto ERROR5;
294 psiconv_debug(lev+3,off+len+datanr,
295 "Pixelnr %08x, Datanr %08x: Read marker %02x",
296 pixelnr,datanr,marker);
297 datanr ++;
298 if (marker >= 0x80) {
299 /* 0x100 - marker bytes of data follow */
300 for (i = 0; i < 0x100-marker; i++,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) {
321 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
322 psiconv_debug(lev+3,off+len+datanr,
323 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
324 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
325 datanr,marker);
326 res = -PSICONV_E_PARSE;
327 } else {
328 temp = psiconv_read_u8(buf,lev+3,off+len+datanr,&res);
329 if (res)
330 goto ERROR5;
331 for (i = 0; i <= marker; i++) {
332 if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp,
333 bits_per_pixel,linelen,&linepos,picsize)) {
334 res = -PSICONV_E_PARSE;
335 break;
336 }
337 }
338 datanr ++;
339 }
340 }
341 }
342 }
343
344 if (linepos >= ((*result)->xsize + (8/bits_per_pixel) - 1) /
345 (8/bits_per_pixel))
346 datanr += (linelen - linepos);
347
348 if (res || (datanr != datasize) || (pixelnr != picsize)) {
349 psiconv_warn(lev+2,off+len,"Corrupted picture data!");
350 psiconv_debug(lev+3,off+len+datanr,
351 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
352 "Datanr: %08x",picsize,datasize,pixelnr,datanr);
353 goto ERROR5; 345 goto ERROR4;
354 } 346
347 (*result)->red = floats.red;
348 (*result)->green = floats.green;
349 (*result)->blue = floats.blue;
355 350
356 len += datanr; 351 psiconv_list_free(bytes);
352 psiconv_list_free(pixels);
353
357 354
358 if (length) 355 if (length)
359 *length = len; 356 *length = len;
360 357
361 psiconv_progress(lev+1,off+len-1,"End of paint data section " 358 psiconv_progress(config,lev,off+len-1,
362 "(total length: %08x)", len); 359 "End of Paint Data Section (total length: %08x)", len);
363 360
364 return res; 361 return 0;
365 362
366ERROR5:
367 free((*result)->blue);
368ERROR4: 363ERROR4:
369 free((*result)->green); 364 psiconv_list_free(pixels);
370ERROR3: 365ERROR3:
371 free((*result)->red); 366 psiconv_list_free(bytes);
372ERROR2: 367ERROR2:
373 free (*result); 368 free(*result);
374ERROR1: 369ERROR1:
375 psiconv_warn(lev+1,off,"Reading of Paint Data Section failed"); 370 psiconv_error(config,lev+1,off,"Reading of Paint Data Section failed");
376 if (length) 371 if (length)
377 *length = 0; 372 *length = 0;
378 if (!res) 373 if (!res)
379 return -PSICONV_E_NOMEM; 374 return -PSICONV_E_NOMEM;
380 else 375 else
381 return res; 376 return res;
382} 377}
383 378
384int psiconv_parse_sketch_section(const psiconv_buffer buf, int lev, 379int psiconv_parse_sketch_section(const psiconv_config config,
380 const psiconv_buffer buf, int lev,
385 psiconv_u32 off, int *length, int is_object, 381 psiconv_u32 off, int *length,
386 psiconv_sketch_section *result) 382 psiconv_sketch_section *result)
387{ 383{
388 int res=0; 384 int res=0;
389 int len=0; 385 int len=0;
390 psiconv_u32 temp; 386 psiconv_u32 temp;
391 int leng; 387 int leng;
392 int i;
393 388
394 psiconv_progress(lev+1,off,"Going to read the sketch section"); 389 psiconv_progress(config,lev+1,off,"Going to read the sketch section");
395 if (!(*result = malloc(sizeof(**result)))) 390 if (!(*result = malloc(sizeof(**result))))
396 goto ERROR1; 391 goto ERROR1;
397 392
398 if (!is_object) {
399 psiconv_progress(lev+2,off+len,"Going to read the form hor. size"); 393 psiconv_progress(config,lev+2,off+len,"Going to read the displayed hor. size");
400 (*result)->form_xsize = psiconv_read_u16(buf,lev+2,off + len,&res); 394 (*result)->displayed_xsize = psiconv_read_u16(config,buf,lev+2,off + len,&res);
401 if (res) 395 if (res)
402 goto ERROR2; 396 goto ERROR2;
397 psiconv_debug(config,lev+2,off+len,"Displayed hor. size: %04x",
398 (*result)->displayed_xsize);
399 len += 0x02;
400 psiconv_progress(config,lev+2,off+len,"Going to read displayed ver. size");
401 (*result)->displayed_ysize = psiconv_read_u16(config,buf,lev+2,off + len,&res);
402 if (res)
403 goto ERROR2;
404 psiconv_debug(config,lev+2,off+len,"Displayed ver. size: %04x",
405 (*result)->displayed_ysize);
406 len += 0x02;
407
408 psiconv_progress(config,lev+2,off+len,"Going to read the data hor. offset");
409 (*result)->picture_data_x_offset = psiconv_read_u16(config,buf,lev+2,off + len,
410 &res);
411 if (res)
412 goto ERROR2;
413 psiconv_debug(config,lev+2,off+len,"Data hor. offset: %04x",
414 (*result)->picture_data_x_offset);
415 len += 0x02;
416 psiconv_progress(config,lev+2,off+len,"Going to read the data ver. offset");
417 (*result)->picture_data_y_offset = psiconv_read_u16(config,buf,lev+2,off + len,
418 &res);
419 if (res)
420 goto ERROR2;
421 psiconv_debug(config,lev+2,off+len,"Data ver. offset: %04x",
422 (*result)->picture_data_y_offset);
423 len += 0x02;
424
425 psiconv_progress(config,lev+2,off+len,"Going to read the displayed hor. offset");
426 (*result)->displayed_size_x_offset = psiconv_read_u16(config,buf,lev+2,off + len,
427 &res);
428 if (res)
429 goto ERROR2;
430 psiconv_debug(config,lev+2,off+len,"Displayed hor. offset: %04x",
431 (*result)->displayed_size_x_offset);
432 len += 0x02;
433 psiconv_progress(config,lev+2,off+len,"Going to read the displayed ver. offset");
434 (*result)->displayed_size_y_offset = psiconv_read_u16(config,buf,lev+2,off + len,
435 &res);
436 if (res)
437 goto ERROR2;
438 psiconv_debug(config,lev+2,off+len,"Displayed ver. offset: %04x",
439 (*result)->displayed_size_y_offset);
440 len += 0x02;
441
442 psiconv_progress(config,lev+2,off+len,"Going to read the form hor. size");
443 (*result)->form_xsize = psiconv_read_u16(config,buf,lev+2,off + len,&res);
444 if (res)
445 goto ERROR2;
403 psiconv_debug(lev+2,off+len,"Form hor. size: %04x", 446 psiconv_debug(config,lev+2,off+len,"Form hor. size: %04x",
404 (*result)->form_xsize); 447 (*result)->form_xsize);
405 len += 0x02; 448 len += 0x02;
406 psiconv_progress(lev+2,off+len,"Going to read the form ver. size"); 449 psiconv_progress(config,lev+2,off+len,"Going to read form ver. size");
407 (*result)->form_ysize = psiconv_read_u16(buf,lev+2,off + len,&res); 450 (*result)->form_ysize = psiconv_read_u16(config,buf,lev+2,off + len,&res);
408 if (res) 451 if (res)
409 goto ERROR2; 452 goto ERROR2;
410 psiconv_debug(lev+2,off+len,"Form ver. size: %04x", 453 psiconv_debug(config,lev+2,off+len,"Form ver. size: %04x",
411 (*result)->form_ysize); 454 (*result)->form_ysize);
412 len += 0x02; 455 len += 0x02;
413 psiconv_progress(lev+2,off+len,"Going to read the picture hor. offset"); 456
414 (*result)->picture_x_offset = psiconv_read_u16(buf,lev+2,off + len,&res); 457 psiconv_progress(config,lev+2,off+len,"Going to skip 1 word of zeros");
458 temp = psiconv_read_u16(config,buf,lev+2,off+len,&res);
415 if (res) 459 if (res)
416 goto ERROR2; 460 goto ERROR2;
417 psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x",
418 (*result)->picture_x_offset);
419 len += 0x02;
420 psiconv_progress(lev+2,off+len,"Going to read the picture ver. offset");
421 (*result)->picture_y_offset = psiconv_read_u16(buf,lev+2,off + len,&res);
422 if (res)
423 goto ERROR2;
424 psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x",
425 (*result)->picture_y_offset);
426 len += 0x02;
427 psiconv_progress(lev+2,off+len,"Going to skip 5 words of zeros");
428 for (i = 0; i < 5; i++) {
429 temp = psiconv_read_u16(buf,lev+2,off+len,&res);
430 if (res)
431 goto ERROR2;
432 if (temp != 0) {
433 psiconv_warn(lev+2,off+len,
434 "Unexpected value in sketch section preamble (ignored)");
435 psiconv_debug(lev+2,off+len,"Word %d: Read %04x, expected %04x",i,
436 temp,0);
437 }
438 off += 0x02;
439 }
440 } else {
441 psiconv_progress(lev+2,off+len,"Going to read the displayed hor. size");
442 (*result)->picture_xsize = psiconv_read_u16(buf,lev+2,off + len,&res);
443 if (res)
444 goto ERROR2;
445 psiconv_debug(lev+2,off+len,"Displayed hor. size: %04x",
446 (*result)->picture_xsize);
447 len += 0x02;
448 psiconv_progress(lev+2,off+len,"Going to read the displayed ver. size");
449 (*result)->picture_ysize = psiconv_read_u16(buf,lev+2,off + len,&res);
450 if (res)
451 goto ERROR2;
452 psiconv_debug(lev+2,off+len,"Displayed ver. size: %04x",
453 (*result)->picture_ysize);
454 len += 0x02;
455
456 psiconv_progress(lev+2,off+len,"Going to skip 2 words of zeros");
457 for (i = 0; i < 2; i++) {
458 temp = psiconv_read_u16(buf,lev+2,off+len,&res);
459 if (res)
460 goto ERROR2;
461 if (temp != 0) {
462 psiconv_warn(lev+2,off+len,
463 "Unexpected value in sketch section preamble (ignored)");
464 psiconv_debug(lev+2,off+len,"Word %d: Read %04x, expected %04x",i,
465 temp,0);
466 }
467 off += 0x02;
468 }
469 psiconv_progress(lev+2,off+len,"Going to read the picture hor. offset");
470 (*result)->picture_x_offset = psiconv_read_u16(buf,lev+2,off + len,&res);
471 if (res)
472 goto ERROR2;
473 psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x",
474 (*result)->picture_x_offset);
475 len += 0x02;
476 psiconv_progress(lev+2,off+len,"Going to read the picture ver. offset");
477 (*result)->picture_y_offset = psiconv_read_u16(buf,lev+2,off + len,&res);
478 if (res)
479 goto ERROR2;
480 psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x",
481 (*result)->picture_y_offset);
482 len += 0x02;
483 psiconv_progress(lev+2,off+len,"Going to read the form hor. size");
484 (*result)->form_xsize = psiconv_read_u16(buf,lev+2,off + len,&res);
485 if (res)
486 goto ERROR2;
487 psiconv_debug(lev+2,off+len,"Form hor. size: %04x",
488 (*result)->form_xsize);
489 len += 0x02;
490 psiconv_progress(lev+2,off+len,"Going to read the form ver. size");
491 (*result)->form_ysize = psiconv_read_u16(buf,lev+2,off + len,&res);
492 if (res)
493 goto ERROR2;
494 psiconv_debug(lev+2,off+len,"Form ver. size: %04x",
495 (*result)->form_ysize);
496 len += 0x02;
497 psiconv_progress(lev+2,off+len,"Going to skip 1 zero word");
498 temp = psiconv_read_u16(buf,lev+2,off+len,&res);
499 if (res)
500 goto ERROR2;
501 if (temp != 0) { 461 if (temp != 0) {
502 psiconv_warn(lev+2,off+len, 462 psiconv_warn(config,lev+2,off+len,
503 "Unexpected value in sketch section preamble (ignored)"); 463 "Unexpected value in sketch section preamble (ignored)");
504 psiconv_debug(lev+2,off+len,"Read %04x, expected %04x",i, temp,0); 464 psiconv_debug(config,lev+2,off+len,"Read %04x, expected %04x",
465 temp,0);
505 } 466 }
506 off += 0x02; 467 off += 0x02;
507 }
508 468
509 psiconv_progress(lev+2,off+len,"Going to read the picture data"); 469 psiconv_progress(config,lev+2,off+len,"Going to read the picture data");
510 if ((res = psiconv_parse_paint_data_section(buf,lev+2,off+len,&leng,0, 470 if ((res = psiconv_parse_paint_data_section(config,buf,lev+2,off+len,&leng,0,
511 &((*result)->picture)))) 471 &((*result)->picture))))
512 goto ERROR2; 472 goto ERROR2;
513 off += leng; 473 off += leng;
514 if (!is_object) {
515 (*result)->picture_xsize = (*result)->picture->xsize;
516 (*result)->picture_ysize = (*result)->picture->ysize;
517 }
518 474
519 psiconv_progress(lev+2,off+len,"Going to read the hor. magnification"); 475 psiconv_progress(config,lev+2,off+len,"Going to read the hor. magnification");
520 (*result)->magnification_x = psiconv_read_u16(buf,lev+2,off+len,&res)/1000.0; 476 (*result)->magnification_x = psiconv_read_u16(config,buf,lev+2,off+len,&res)/1000.0;
521 if (res) 477 if (res)
522 goto ERROR3; 478 goto ERROR3;
523 psiconv_debug(lev+2,off+len,"Form hor. magnification: %f", 479 psiconv_debug(config,lev+2,off+len,"Form hor. magnification: %f",
524 (*result)->magnification_x); 480 (*result)->magnification_x);
525 len += 0x02; 481 len += 0x02;
526 psiconv_progress(lev+2,off+len,"Going to read the ver. magnification"); 482 psiconv_progress(config,lev+2,off+len,"Going to read the ver. magnification");
527 (*result)->magnification_y = psiconv_read_u16(buf,lev+2,off+len,&res)/1000.0; 483 (*result)->magnification_y = psiconv_read_u16(config,buf,lev+2,off+len,&res)/1000.0;
528 if (res) 484 if (res)
529 goto ERROR3; 485 goto ERROR3;
530 psiconv_debug(lev+2,off+len,"Form ver. magnification: %f", 486 psiconv_debug(config,lev+2,off+len,"Form ver. magnification: %f",
531 (*result)->magnification_y); 487 (*result)->magnification_y);
532 len += 0x02; 488 len += 0x02;
533 489
534 psiconv_progress(lev+2,off+len,"Going to read the left cut"); 490 psiconv_progress(config,lev+2,off+len,"Going to read the left cut");
535 temp = psiconv_read_u32(buf,lev+2,off + len,&res); 491 temp = psiconv_read_u32(config,buf,lev+2,off + len,&res);
536 if (res) 492 if (res)
537 goto ERROR3; 493 goto ERROR3;
538 (*result)->cut_left = (temp * 6.0) / (*result)->picture_xsize; 494 (*result)->cut_left = (temp * 6.0) / (*result)->displayed_xsize;
539 psiconv_debug(lev+2,off+len,"Left cut: raw %08x, real: %f", 495 psiconv_debug(config,lev+2,off+len,"Left cut: raw %08x, real: %f",
540 temp,(*result)->cut_left); 496 temp,(*result)->cut_left);
541 len += 0x04; 497 len += 0x04;
542 psiconv_progress(lev+2,off+len,"Going to read the right cut"); 498 psiconv_progress(config,lev+2,off+len,"Going to read the right cut");
543 temp = psiconv_read_u32(buf,lev+2,off + len,&res); 499 temp = psiconv_read_u32(config,buf,lev+2,off + len,&res);
544 if (res) 500 if (res)
545 goto ERROR3; 501 goto ERROR3;
546 (*result)->cut_right = (temp * 6.0) / (*result)->picture_xsize; 502 (*result)->cut_right = (temp * 6.0) / (*result)->displayed_xsize;
547 psiconv_debug(lev+2,off+len,"Right cut: raw %08x, real: %f", 503 psiconv_debug(config,lev+2,off+len,"Right cut: raw %08x, real: %f",
548 temp,(*result)->cut_right); 504 temp,(*result)->cut_right);
549 len += 0x04; 505 len += 0x04;
550 psiconv_progress(lev+2,off+len,"Going to read the top cut"); 506 psiconv_progress(config,lev+2,off+len,"Going to read the top cut");
551 temp = psiconv_read_u32(buf,lev+2,off + len,&res); 507 temp = psiconv_read_u32(config,buf,lev+2,off + len,&res);
552 if (res) 508 if (res)
553 goto ERROR3; 509 goto ERROR3;
554 (*result)->cut_top = (temp * 6.0) / (*result)->picture_ysize; 510 (*result)->cut_top = (temp * 6.0) / (*result)->displayed_ysize;
555 psiconv_debug(lev+2,off+len,"Top cut: raw %08x, real: %f", 511 psiconv_debug(config,lev+2,off+len,"Top cut: raw %08x, real: %f",
556 temp,(*result)->cut_top); 512 temp,(*result)->cut_top);
557 len += 0x04; 513 len += 0x04;
558 psiconv_progress(lev+2,off+len,"Going to read the bottom cut"); 514 psiconv_progress(config,lev+2,off+len,"Going to read the bottom cut");
559 temp = psiconv_read_u32(buf,lev+2,off + len,&res); 515 temp = psiconv_read_u32(config,buf,lev+2,off + len,&res);
560 if (res) 516 if (res)
561 goto ERROR3; 517 goto ERROR3;
562 (*result)->cut_bottom = (temp * 6.0) / (*result)->picture_ysize; 518 (*result)->cut_bottom = (temp * 6.0) / (*result)->displayed_ysize;
563 psiconv_debug(lev+2,off+len,"Bottom cut: raw %08x, real: %f", 519 psiconv_debug(config,lev+2,off+len,"Bottom cut: raw %08x, real: %f",
564 temp,(*result)->cut_bottom); 520 temp,(*result)->cut_bottom);
565 len += 0x04; 521 len += 0x04;
566 522
567 if (length) 523 if (length)
568 *length = len; 524 *length = len;
569 525
570 psiconv_progress(lev,off+len-1, 526 psiconv_progress(config,lev,off+len-1,
571 "End of sketch section (total length: %08x)", len); 527 "End of sketch section (total length: %08x)", len);
572 528
573 return res; 529 return res;
574ERROR3: 530ERROR3:
575 psiconv_free_paint_data_section((*result)->picture); 531 psiconv_free_paint_data_section((*result)->picture);
576ERROR2: 532ERROR2:
577 free (*result); 533 free (*result);
578ERROR1: 534ERROR1:
579 psiconv_warn(lev+1,off,"Reading of Sketch Section failed"); 535 psiconv_error(config,lev+1,off,"Reading of Sketch Section failed");
580 if (length) 536 if (length)
581 *length = 0; 537 *length = 0;
582 if (!res) 538 if (!res)
583 return -PSICONV_E_NOMEM; 539 return -PSICONV_E_NOMEM;
584 else 540 else
585 return res; 541 return res;
586} 542}
587 543
588 544
589int psiconv_parse_clipart_section(const psiconv_buffer buf,int lev, 545int psiconv_parse_clipart_section(const psiconv_config config,
546 const psiconv_buffer buf,int lev,
590 psiconv_u32 off, int *length, 547 psiconv_u32 off, int *length,
591 psiconv_clipart_section *result) 548 psiconv_clipart_section *result)
592{ 549{
593 int res=0; 550 int res=0;
594 int len=0; 551 int len=0;
595 int leng; 552 int leng;
596 psiconv_u32 temp; 553 psiconv_u32 temp;
597 554
598 psiconv_progress(lev+1,off+len,"Going to read the clipart section"); 555 psiconv_progress(config,lev+1,off+len,"Going to read the clipart section");
599 if (!(*result = malloc(sizeof(**result)))) 556 if (!(*result = malloc(sizeof(**result))))
600 goto ERROR1; 557 goto ERROR1;
601 558
602 psiconv_progress(lev+2,off+len,"Going to read the section ID"); 559 psiconv_progress(config,lev+2,off+len,"Going to read the section ID");
603 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 560 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
604 if (res) 561 if (res)
605 goto ERROR2; 562 goto ERROR2;
606 if (temp != PSICONV_ID_CLIPART_ITEM) { 563 if (temp != PSICONV_ID_CLIPART_ITEM) {
607 psiconv_warn(lev+2,off+len, 564 psiconv_warn(config,lev+2,off+len,
608 "Unexpected value in clipart section preamble (ignored)"); 565 "Unexpected value in clipart section preamble (ignored)");
609 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, 566 psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x",temp,
610 PSICONV_ID_CLIPART_ITEM); 567 PSICONV_ID_CLIPART_ITEM);
611 } else 568 } else
612 psiconv_debug(lev+2,off+len,"Clipart ID: %08x", temp); 569 psiconv_debug(config,lev+2,off+len,"Clipart ID: %08x", temp);
613 off += 4; 570 off += 4;
614 571
615 psiconv_progress(lev+2,off+len,"Going to read an unknown long"); 572 psiconv_progress(config,lev+2,off+len,"Going to read an unknown long");
616 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 573 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
617 if (res) 574 if (res)
618 goto ERROR2; 575 goto ERROR2;
619 if (temp != 0x02) { 576 if (temp != 0x02) {
620 psiconv_warn(lev+2,off+len, 577 psiconv_warn(config,lev+2,off+len,
621 "Unexpected value in clipart section preamble (ignored)"); 578 "Unexpected value in clipart section preamble (ignored)");
622 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, 579 psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x",temp,
623 0x02); 580 0x02);
624 } else 581 } else
625 psiconv_debug(lev+2,off+len,"First unknown long: %08x", temp); 582 psiconv_debug(config,lev+2,off+len,"First unknown long: %08x", temp);
626 off += 4; 583 off += 4;
627 584
628 psiconv_progress(lev+2,off+len,"Going to read a second unknown long"); 585 psiconv_progress(config,lev+2,off+len,"Going to read a second unknown long");
629 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 586 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
630 if (res) 587 if (res)
631 goto ERROR2; 588 goto ERROR2;
632 if (temp != 0) { 589 if (temp != 0) {
633 psiconv_warn(lev+2,off+len, 590 psiconv_warn(config,lev+2,off+len,
634 "Unexpected value in clipart section preamble (ignored)"); 591 "Unexpected value in clipart section preamble (ignored)");
635 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, 0); 592 psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x",temp, 0);
636 } else 593 } else
637 psiconv_debug(lev+2,off+len,"Second unknown long: %08x", temp); 594 psiconv_debug(config,lev+2,off+len,"Second unknown long: %08x", temp);
638 off += 4; 595 off += 4;
639 596
640 psiconv_progress(lev+2,off+len,"Going to read a third unknown long"); 597 psiconv_progress(config,lev+2,off+len,"Going to read a third unknown long");
641 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 598 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
642 if (res) 599 if (res)
643 goto ERROR2; 600 goto ERROR2;
644 if (temp != 0) { 601 if (temp != 0) {
645 psiconv_warn(lev+2,off+len, 602 psiconv_warn(config,lev+2,off+len,
646 "Unexpected value in clipart section preamble (ignored)"); 603 "Unexpected value in clipart section preamble (ignored)");
647 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, 0); 604 psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x",temp, 0);
648 } else 605 } else
649 psiconv_debug(lev+2,off+len,"Third unknown long: %08x", temp); 606 psiconv_debug(config,lev+2,off+len,"Third unknown long: %08x", temp);
650 off += 4; 607 off += 4;
651 608
652 psiconv_progress(lev+2,off+len,"Going to read a fourth unknown long"); 609 psiconv_progress(config,lev+2,off+len,"Going to read a fourth unknown long");
653 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 610 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
654 if (res) 611 if (res)
655 goto ERROR2; 612 goto ERROR2;
656 if ((temp != 0x0c) && (temp != 0x08)) { 613 if ((temp != 0x0c) && (temp != 0x08)) {
657 psiconv_warn(lev+2,off+len, 614 psiconv_warn(config,lev+2,off+len,
658 "Unexpected value in clipart section preamble (ignored)"); 615 "Unexpected value in clipart section preamble (ignored)");
659 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x or %08x",temp, 616 psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x or %08x",temp,
660 0x0c, 0x08); 617 0x0c, 0x08);
661 } else 618 } else
662 psiconv_debug(lev+2,off+len,"Fourth unknown long: %08x", temp); 619 psiconv_debug(config,lev+2,off+len,"Fourth unknown long: %08x", temp);
663 off += 4; 620 off += 4;
664 621
665 psiconv_progress(lev+2,off+len,"Going to read the Paint Data Section"); 622 psiconv_progress(config,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, 623 if ((res = psiconv_parse_paint_data_section(config,buf,lev+2,off+len,&leng,1,
667 &((*result)->picture)))) 624 &((*result)->picture))))
668 goto ERROR2; 625 goto ERROR2;
669 len += leng; 626 len += leng;
670 627
671 if (length) 628 if (length)
672 *length = len; 629 *length = len;
673 630
674 psiconv_progress(lev,off+len-1, 631 psiconv_progress(config,lev,off+len-1,
675 "End of clipart section (total length: %08x)", len); 632 "End of clipart section (total length: %08x)", len);
676 return 0; 633 return 0;
677 634
678ERROR2: 635ERROR2:
679 free (*result); 636 free (*result);
680ERROR1: 637ERROR1:
681 psiconv_warn(lev+1,off,"Reading of Font failed"); 638 psiconv_error(config,lev+1,off,"Reading of Font failed");
682 if (length) 639 if (length)
683 *length = 0; 640 *length = 0;
684 if (!res) 641 if (!res)
685 return -PSICONV_E_NOMEM; 642 return -PSICONV_E_NOMEM;
686 else 643 else
687 return res; 644 return res;
688} 645}
646
647int psiconv_decode_rle8 (const psiconv_config config, int lev, psiconv_u32 off,
648 const psiconv_pixel_bytes encoded,
649 psiconv_pixel_bytes *decoded)
650{
651 int res=0;
652 psiconv_u8 *marker,*value;
653 int i,j;
654
655 psiconv_progress(config,lev+1,off,"Going to decode the RLE8 encoding");
656 if (!(*decoded = psiconv_list_new(sizeof(psiconv_u8))))
657 goto ERROR1;
658
659 for (i = 0; i < psiconv_list_length(encoded);) {
660#ifdef LOUD
661 psiconv_progress(config,lev+2,off,"Going to read marker byte at %04x",i);
662#endif
663 if (!(marker = psiconv_list_get(encoded,i)))
664 goto ERROR2;
665#ifdef LOUD
666 psiconv_debug(config,lev+2,off,"Marker byte: %02x",*marker);
667#endif
668 if (*marker < 0x80) {
669#ifdef LOUD
670 psiconv_debug(config,lev+2,off,"Marker: repeat value byte %02x times",
671 *marker+1); */
672 psiconv_progress(config,lev+2,off,"Going to read value byte at %04x",i+1);
673#endif
674 if (!(value = psiconv_list_get(encoded,i+1)))
675 goto ERROR2;
676#ifdef LOUD
677 psiconv_debug(config,lev+2,off,"Value byte: %02x",*value);
678 psiconv_progress(config,lev+2,off,"Adding %02x pixels %02x",
679 *marker+1,*value);
680#endif
681 for (j = 0; j < *marker + 1; j++)
682 if ((res = psiconv_list_add(*decoded,value)))
683 goto ERROR2;
684 i += 2;
685 } else {
686#ifdef LOUD
687 psiconv_debug(config,lev+2,off,"Marker: %02x value bytes follow",
688 0x100 - *marker);
689#endif
690 for (j = 0; j < (0x100 - *marker); j++) {
691#ifdef LOUD
692 psiconv_progress(config,lev+2,off,"Going to read value byte at %04x",
693 i+j+1);
694#endif
695 if (!(value = psiconv_list_get(encoded,i+j+1)))
696 goto ERROR2;
697#ifdef LOUD
698 psiconv_debug(config,lev+2,off,"Value: %02x",*value);
699#endif
700 if ((res = psiconv_list_add(*decoded,value)))
701 goto ERROR2;
702 }
703 i += (0x100 - *marker) + 1;
704 }
705 }
706 psiconv_progress(config,lev,off,
707 "End of RLE8 decoding process");
708 return 0;
709
710ERROR2:
711 psiconv_list_free(*decoded);
712ERROR1:
713 psiconv_error(config,lev+1,off,"Decoding of RLE8 failed");
714 if (!res)
715 return -PSICONV_E_NOMEM;
716 else
717 return res;
718}
719
720int psiconv_decode_rle12 (const psiconv_config config, int lev, psiconv_u32 off,
721 const psiconv_pixel_bytes encoded,
722 psiconv_pixel_bytes *decoded)
723{
724 int res=0;
725 psiconv_u8 *value0,*value1;
726 psiconv_u32 value,repeat;
727 int i,j;
728
729 psiconv_progress(config,lev+1,off,"Going to decode the RLE12 encoding");
730 if (!(*decoded = psiconv_list_new(sizeof(psiconv_u8))))
731 goto ERROR1;
732
733 for (i = 0; i < psiconv_list_length(encoded);) {
734 psiconv_progress(config,lev+2,off,"Going to read data word at %04x",i);
735 if (!(value0 = psiconv_list_get(encoded,i)))
736 goto ERROR2;
737 if (!(value1 = psiconv_list_get(encoded,i+1)))
738 goto ERROR2;
739 psiconv_debug(config,lev+2,off,"Data Word: %04x",*value0 + (*value1 << 8));
740 value = *value0 + ((*value1 & 0x0f) << 8);
741 repeat = (*value1 >> 4) + 1;
742 psiconv_progress(config,lev+2,off,"Adding %02x pixels %03x",
743 repeat,value);
744 for (j = 0; j < repeat; j ++)
745 if ((res = psiconv_list_add(*decoded,&value)))
746 goto ERROR2;
747 i += 2;
748 }
749 psiconv_progress(config,lev,off,
750 "End of RLE12 decoding process");
751 return 0;
752
753ERROR2:
754 psiconv_list_free(*decoded);
755ERROR1:
756 psiconv_error(config,lev+1,off,"Decoding of RLE12 failed");
757 if (!res)
758 return -PSICONV_E_NOMEM;
759 else
760 return res;
761}
762
763int psiconv_decode_rle16 (const psiconv_config config, int lev, psiconv_u32 off,
764 const psiconv_pixel_bytes encoded,
765 psiconv_pixel_bytes *decoded)
766{
767 int res=0;
768 psiconv_u8 *marker,*value0,*value1;
769 psiconv_u32 value;
770 int i,j;
771
772 psiconv_progress(config,lev+1,off,"Going to decode the RLE16 encoding");
773 if (!(*decoded = psiconv_list_new(sizeof(psiconv_u8))))
774 goto ERROR1;
775
776 for (i = 0; i < psiconv_list_length(encoded);) {
777 psiconv_progress(config,lev+2,off,"Going to read marker byte at %04x",i);
778 if (!(marker = psiconv_list_get(encoded,i)))
779 goto ERROR2;
780 psiconv_debug(config,lev+2,off,"Marker byte: %02x",*marker);
781 if (*marker < 0x80) {
782 psiconv_debug(config,lev+2,off,"Marker: repeat value word %02x times",
783 *marker+1);
784 psiconv_progress(config,lev+2,off,"Going to read value word at %04x",i+1);
785 if (!(value0 = psiconv_list_get(encoded,i+1)))
786 goto ERROR2;
787 if (!(value1 = psiconv_list_get(encoded,i+2)))
788 goto ERROR2;
789 value = *value0 + (*value1 << 8);
790 psiconv_debug(config,lev+2,off,"Value word: %02x",value);
791 psiconv_progress(config,lev+2,off,"Adding %02x pixels %04x",
792 *marker+1,value);
793 for (j = 0; j < *marker + 1; j++)
794 if ((res = psiconv_list_add(*decoded,&value)))
795 goto ERROR2;
796 i += 3;
797 } else {
798 psiconv_debug(config,lev+2,off,"Marker: %02x value words follow",
799 0x100 - *marker);
800 for (j = 0; j < (0x100 - *marker); j++) {
801 psiconv_progress(config,lev+2,off,"Going to read value word at %04x",
802 i+j*2+1);
803 if (!(value0 = psiconv_list_get(encoded,i+j*2+1)))
804 goto ERROR2;
805 if (!(value1 = psiconv_list_get(encoded,i+j*2+2)))
806 goto ERROR2;
807 value = *value0 + (*value1 << 8);
808 psiconv_debug(config,lev+2,off,"Value: %04x",value);
809 if ((res = psiconv_list_add(*decoded,&value)))
810 goto ERROR2;
811 }
812 i += (0x100 - *marker)*2 + 1;
813 }
814 }
815 psiconv_progress(config,lev,off,
816 "End of RLE16 decoding process");
817 return 0;
818
819ERROR2:
820 psiconv_list_free(*decoded);
821ERROR1:
822 psiconv_error(config,lev+1,off,"Decoding of RLE16 failed");
823 if (!res)
824 return -PSICONV_E_NOMEM;
825 else
826 return res;
827}
828
829int psiconv_decode_rle24 (const psiconv_config config, int lev, psiconv_u32 off,
830 const psiconv_pixel_bytes encoded,
831 psiconv_pixel_bytes *decoded)
832{
833 int res=0;
834 psiconv_u8 *marker,*value0,*value1,*value2;
835 psiconv_u32 value;
836 int i,j;
837
838 psiconv_progress(config,lev+1,off,"Going to decode the RLE24 encoding");
839 if (!(*decoded = psiconv_list_new(sizeof(psiconv_u8))))
840 goto ERROR1;
841
842 for (i = 0; i < psiconv_list_length(encoded);) {
843 psiconv_progress(config,lev+2,off,"Going to read marker byte at %04x",i);
844 if (!(marker = psiconv_list_get(encoded,i)))
845 goto ERROR2;
846 psiconv_debug(config,lev+2,off,"Marker byte: %02x",*marker);
847 if (*marker < 0x80) {
848 psiconv_debug(config,lev+2,off,"Marker: repeat value byte triplet %02x times",
849 *marker+1);
850 psiconv_progress(config,lev+2,off,"Going to read value byte triplet at %04x",i+1);
851 if (!(value0 = psiconv_list_get(encoded,i+1)))
852 goto ERROR2;
853 if (!(value1 = psiconv_list_get(encoded,i+2)))
854 goto ERROR2;
855 if (!(value2 = psiconv_list_get(encoded,i+3)))
856 goto ERROR2;
857 value = *value0 + (*value1 << 8) + (*value2 << 16);
858 psiconv_debug(config,lev+2,off,"Value byte triplet: %06x",value);
859 psiconv_progress(config,lev+2,off,"Adding %02x pixels %06x",
860 *marker+1,value);
861 for (j = 0; j < *marker + 1; j++)
862 if ((res = psiconv_list_add(*decoded,&value)))
863 goto ERROR2;
864 i += 4;
865 } else {
866 psiconv_debug(config,lev+2,off,"Marker: %02x value byte triplets follow",
867 0x100 - *marker);
868 for (j = 0; j < (0x100 - *marker); j++) {
869 psiconv_progress(config,lev+2,off,"Going to read value byte triplets at %04x",
870 i+j*3+1);
871 if (!(value0 = psiconv_list_get(encoded,i+j*3+1)))
872 goto ERROR2;
873 if (!(value1 = psiconv_list_get(encoded,i+j*3+2)))
874 goto ERROR2;
875 if (!(value2 = psiconv_list_get(encoded,i+j*3+3)))
876 goto ERROR2;
877 value = *value0 + (*value1 << 8) + (*value2 << 16);
878 psiconv_debug(config,lev+2,off,"Value: %06x",value);
879 if ((res = psiconv_list_add(*decoded,&value)))
880 goto ERROR2;
881 }
882 i += (0x100 - *marker)*3 + 1;
883 }
884 }
885 psiconv_progress(config,lev,off,
886 "End of RLE24 decoding process");
887 return 0;
888
889ERROR2:
890 psiconv_list_free(*decoded);
891ERROR1:
892 psiconv_error(config,lev+1,off,"Decoding of RLE24 failed");
893 if (!res)
894 return -PSICONV_E_NOMEM;
895 else
896 return res;
897}
898
899int psiconv_bytes_to_pixel_data(const psiconv_config config,
900 int lev, psiconv_u32 off,
901 const psiconv_pixel_bytes bytes,
902 psiconv_pixel_ints *pixels,
903 int colordepth, int xsize, int ysize)
904{
905 int res=0;
906 int ibits,obits,x,y,bits;
907 psiconv_u8 input;
908 psiconv_u32 nr,output;
909 psiconv_u8 *ientry;
910
911 psiconv_progress(config,lev+1,off,"Going to convert the bytes to pixels");
912 if (!(*pixels = psiconv_list_new(sizeof(psiconv_u32))))
913 goto ERROR1;
914
915 nr = 0;
916 for (y = 0; y < ysize; y++) {
917 /* New lines will start at longs */
918 while (nr % 4)
919 nr ++;
920 input = 0;
921 ibits = 0;
922 for (x= 0; x < xsize; x++) {
923#ifdef LOUD
924 psiconv_progress(config,lev+2,off,
925 "Processing pixel at (x,y) = (%04x,%04x)",x,y);
926#endif
927 output = 0;
928 obits = 0;
929 while (obits < colordepth) {
930 if (ibits == 0) {
931#ifdef LOUD
932 psiconv_progress(config,lev+3,off,
933 "Going to read byte %08x",nr);
934#endif
935 if (!(ientry = psiconv_list_get(bytes,nr)))
936 goto ERROR2;
937#ifdef LOUD
938 psiconv_debug(config,lev+3,off,"Byte value: %02x",*ientry);
939#endif
940 input = *ientry;
941 ibits = 8;
942 nr ++;
943 }
944 bits = ibits + obits > colordepth?colordepth-obits:ibits;
945 output = output << bits;
946 output |= input & ((1 << bits) - 1);
947 input = input >> bits;
948 ibits -= bits;
949 obits += bits;
950 }
951#ifdef LOUD
952 psiconv_debug(config,lev+2,off,"Pixel value: %08x",output);
953#endif
954 if ((res = psiconv_list_add(*pixels,&output)))
955 goto ERROR2;
956 }
957 }
958
959 psiconv_progress(config,lev,off,
960 "Converting bytes to pixels completed");
961 return 0;
962
963
964ERROR2:
965 psiconv_list_free(*pixels);
966ERROR1:
967 psiconv_error(config,lev+1,off,"Converting bytes to pixels failed");
968 if (!res)
969 return -PSICONV_E_NOMEM;
970 else
971 return res;
972}
973
974int psiconv_pixel_data_to_floats (const psiconv_config config, int lev,
975 psiconv_u32 off,
976 const psiconv_pixel_ints pixels,
977 psiconv_pixel_floats_t *floats,
978 int colordepth, int color,
979 int redbits, int bluebits, int greenbits,
980 const psiconv_pixel_floats_t palet)
981{
982 int res = 0;
983 psiconv_u32 i;
984 psiconv_u32 *pixel;
985
986 psiconv_progress(config,lev+1,off,"Going to convert pixels to floats");
987 if (!((*floats).red = malloc(psiconv_list_length(pixels) *
988 sizeof(*(*floats).red))))
989 goto ERROR1;
990 if (!((*floats).green = malloc(psiconv_list_length(pixels) *
991 sizeof(*(*floats).green))))
992 goto ERROR2;
993 if (!((*floats).blue = malloc(psiconv_list_length(pixels) *
994 sizeof(*(*floats).blue))))
995 goto ERROR3;
996 (*floats).length = psiconv_list_length(pixels);
997
998 for (i = 0; i < psiconv_list_length(pixels); i++) {
999 if (!(pixel = psiconv_list_get(pixels,i)))
1000 goto ERROR4;
1001#ifdef LOUD
1002 psiconv_progress(config,lev+2,off, "Handling pixel %04x (%04x)",i,*pixel);
1003#endif
1004 if (!palet.length) {
1005 if (color) {
1006 (*floats).blue[i] = ((float) (*pixel & ((1 << bluebits) - 1))) /
1007 (1 << bluebits);
1008 (*floats).green[i] = ((float) ((*pixel >> bluebits) &
1009 ((1 << greenbits) - 1))) / (1 << greenbits);
1010 (*floats).red[i] = ((float) ((*pixel >> (bluebits+greenbits)) &
1011 ((1 << redbits) - 1))) / (1 << redbits);
1012 } else {
1013 (*floats).red[i] = (*floats).green[i] =
1014 (*floats).blue[i] = ((float) *pixel) /
1015 (1 << colordepth);
1016 }
1017 } else {
1018 if (*pixel >= palet.length) {
1019 psiconv_warn(config,lev+2,off,
1020 "Invalid palet color found (using color 0x00)");
1021 (*floats).red[i] = palet.red[0];
1022 (*floats).green[i] = palet.green[0];
1023 (*floats).blue[i] = palet.blue[0];
1024 } else {
1025 (*floats).red[i] = palet.red[*pixel];
1026 (*floats).green[i] = palet.green[*pixel];
1027 (*floats).blue[i] = palet.blue[*pixel];
1028 }
1029 }
1030#ifdef LOUD
1031 psiconv_debug(config,lev+2,off, "Pixel: Red (%f), green (%f), blue (%f)",
1032 (*floats).red[i],(*floats).green[i],(*floats).blue[i]);
1033#endif
1034 }
1035 psiconv_progress(config,lev+1,off,"Finished converting pixels to floats");
1036 return 0;
1037
1038ERROR4:
1039 free((*floats).blue);
1040ERROR3:
1041 free((*floats).green);
1042ERROR2:
1043 free((*floats).red);
1044ERROR1:
1045 psiconv_error(config,lev+1,off,"Converting pixels to floats failed");
1046 if (!res)
1047 return -PSICONV_E_NOMEM;
1048 else
1049 return res;
1050}
1051
1052
1053
Legend:
Removed from v.64  
changed lines
  Added in v.230
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26