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