/[public]/psiconv/tags/rel-0-9-9/lib/psiconv/parse_image.c
ViewVC logotype

Diff of /psiconv/tags/rel-0-9-9/lib/psiconv/parse_image.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

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