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