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