/[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 25 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
60static int decode_byte(int lev, psiconv_u32 off,
61 psiconv_paint_data_section data, int *pixelnr,
62 psiconv_u8 byte, int bits_per_pixel, int linelen,
63 int *linepos,int picsize)
64{
65 int mask = (bits_per_pixel << 1) -1;
66 int i;
67 if (*linepos < (data->xsize + (8/bits_per_pixel) - 1) / (8/bits_per_pixel))
68 for (i = 0; i < 8/bits_per_pixel; i ++) {
69 if ((i != 0) && ((*pixelnr % (data->xsize)) == 0)) {
70 psiconv_debug(lev+1,off,"Skipping padding: %02x",byte);
71 i = 8;
72 } else if (*pixelnr >= picsize) {
73 psiconv_warn(lev+1,off,"Corrupted picture data!");
74 psiconv_debug(lev+1,off,"Trying to write a pixel too far");
75 return -1;
76 } else {
77 data->red[*pixelnr] = data->green[*pixelnr] = data->blue[*pixelnr] =
78 ((float) (byte & mask)) / ((1 << bits_per_pixel) -1);
79 psiconv_debug(lev+1,off,"Pixel %04x: (%04x,%04x) value %02x, color %f",
80 *pixelnr,*pixelnr % data->xsize,*pixelnr / data->xsize, byte&mask, data->red[*pixelnr]);
81 byte = byte >> bits_per_pixel;
82 (*pixelnr) ++;
83 }
84 }
85 else
86 psiconv_debug(lev+1,off,"Skipping padding byte");
87 (*linepos) ++;
88 if (*linepos == linelen)
89 *linepos = 0;
90 return 0;
91}
92
93
94int 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,
95 psiconv_u32 off, int *length, 123 psiconv_u32 off, int *length,int isclipart,
96 psiconv_paint_data_section *result) 124 psiconv_paint_data_section *result)
97{ 125{
98 int res = 0; 126 int res = 0;
99 int len = 0; 127 int len = 0;
100 int read_err = 0;
101 psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen; 128 psiconv_u32 size,offset,picsize,temp,datasize,color,
129 redbits,bluebits,greenbits;
102 psiconv_u8 marker; 130 psiconv_u8 byte;
103 int i,leng; 131 int leng,i;
104 psiconv_u32 bits_per_pixel,compression; 132 psiconv_u32 bits_per_pixel,compression;
105 int linepos = 0; 133 psiconv_pixel_bytes bytes,decoded;
134 psiconv_pixel_ints pixels;
135 psiconv_pixel_floats_t floats,palet;
106 136
107 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");
108 (*result) = malloc(sizeof(**result)); 138 if (!((*result) = malloc(sizeof(**result))))
139 goto ERROR1;
109 140
141 if (!(bytes = psiconv_list_new(sizeof(psiconv_u8))))
142 goto ERROR2;
143
110 psiconv_progress(lev+2,off+len,"Going to read section size"); 144 psiconv_progress(config,lev+2,off+len,"Going to read section size");
111 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;
112 psiconv_debug(lev+2,off+len,"Section size: %08x",size); 148 psiconv_debug(config,lev+2,off+len,"Section size: %08x",size);
113 len += 4; 149 len += 4;
114 150
115 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");
116 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;
117 if (offset != 0x28) { 155 if (offset != 0x28) {
118 psiconv_warn(lev+2,off+len, 156 psiconv_error(config,lev+2,off+len,
119 "Paint data section data offset has unexpected value"); 157 "Paint data section data offset has unexpected value");
120 psiconv_debug(lev+2,off+len, 158 psiconv_debug(config,lev+2,off+len,
121 "Data offset: read %08x, expected %08x",offset,0x28); 159 "Data offset: read %08x, expected %08x",offset,0x28);
122 res = -1; 160 res = -1;
123 } 161 }
124 len += 4; 162 len += 4;
125 163
126 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");
127 (*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;
128 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);
129 len += 4; 169 len += 4;
130 170
131 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");
132 (*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;
133 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);
134 len += 4; 176 len += 4;
135 177
136 picsize = (*result)->ysize * (*result)->xsize; 178 picsize = (*result)->ysize * (*result)->xsize;
137 179
138 psiconv_progress(lev+2,off+len,"Going to read the real picture x size"); 180 psiconv_progress(config,lev+2,off+len,"Going to read the real picture x size");
139 (*result)->pic_xsize = psiconv_read_length(buf,lev+2,off+len,&leng); 181 (*result)->pic_xsize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
182 if (res)
183 goto ERROR3;
140 psiconv_debug(lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize); 184 psiconv_debug(config,lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize);
141 len += leng; 185 len += leng;
142 186
143 psiconv_progress(lev+2,off+len,"Going to read the real picture y size"); 187 psiconv_progress(config,lev+2,off+len,"Going to read the real picture y size");
144 (*result)->pic_ysize = psiconv_read_length(buf,lev+2,off+len,&leng); 188 (*result)->pic_ysize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
189 if (res)
190 goto ERROR3;
145 psiconv_debug(lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize); 191 psiconv_debug(config,lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize);
146 len += leng; 192 len += leng;
147 193
148 psiconv_progress(lev+2,off+len,"Going to read the number of bits per pixel"); 194 psiconv_progress(config,lev+2,off+len,"Going to read the number of bits per pixel");
149 bits_per_pixel=psiconv_read_u32(buf,lev+2,off+len); 195 bits_per_pixel=psiconv_read_u32(config,buf,lev+2,off+len,&res);
150 if (bits_per_pixel > 8) { 196 if (res)
151 psiconv_warn(lev+2,off+len,"Picture has too many colors"); 197 goto ERROR3;
152 psiconv_debug(lev+2,off+len,"Read %d colorbits",bits_per_pixel);
153 res = -1;
154 bits_per_pixel = 2;
155 }
156 psiconv_debug(lev+2,off+len,"Bits per pixel: %d",bits_per_pixel); 198 psiconv_debug(config,lev+2,off+len,"Bits per pixel: %d",bits_per_pixel);
157 len += 4; 199 len += 4;
158 200
159 for (i = 0 ; i < 2; i++) { 201 psiconv_progress(config,lev+2,off+len,
202 "Going to read whether this is a colour or greyscale picture");
203 color = psiconv_read_u32(config,buf,lev+2,off+len,&res);
204 if (res)
205 goto ERROR3;
206 if ((color != 0) && (color != 1)) {
207 psiconv_warn(config,lev+2,off+len,
208 "Paint data section unknown color type (ignored)");
209 psiconv_debug(config,lev+2,off+len,
210 "Color: read %08x, expected %08x or %08x",color,0,1);
211 color = 1;
212 } else {
213 psiconv_debug(config,lev+2,off+len,"Color: %08x (%s picture)",
214 color,(color?"color":"greyscale"));
215 }
216 len += 4;
217
160 temp = psiconv_read_u32(buf,lev+2,off+len); 218 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
219 if (res)
220 goto ERROR3;
161 if (temp != 00) { 221 if (temp != 00) {
222 psiconv_warn(config,lev+2,off+len,
223 "Paint data section prologue has unknown values (ignored)");
224 psiconv_debug(config,lev+2,off+len,
225 "read %08x, expected %08x",temp, 0x00);
226 }
227 len += 4;
228
229 psiconv_progress(config,lev+2,off+len,
230 "Going to read whether RLE compression is used");
231 compression=psiconv_read_u32(config,buf,lev+2,off+len,&res);
232 if (res)
233 goto ERROR3;
234 if (compression > 4) {
235 psiconv_warn(config,lev+2,off+len,"Paint data section has unknown "
236 "compression type, assuming RLE");
237 psiconv_debug(config,lev+2,off+len,"Read compression type %d",compression);
238 compression = 0;
239 }
240 psiconv_debug(config,lev+2,off+len,"Compression: %s",
241 compression == 4?"RLE24":compression == 3?"RLE16":
242 compression == 2?"RLE12":compression == 1?"RLE8":"none");
243 len += 4;
244
245 if (isclipart) {
246 psiconv_progress(config,lev+2,off+len,"Going to read an unknown long");
247 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
248 if (res)
249 goto ERROR3;
250 if (temp != 0xffffffff) {
162 psiconv_warn(lev+2,off+len, 251 psiconv_warn(config,lev+2,off+len,
163 "Paint data section prologue has unknown values"); 252 "Paint data section prologue has unknown values (ignoring)");
164 psiconv_debug(lev+2,off+len, 253 psiconv_debug(config,lev+2,off+len,
165 "offset %02x: read %08x, expected %08x",i,temp, 0x00); 254 "Read %08x, expected %08x",temp, 0xffffffff);
166 res = -1;
167 } 255 }
168 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);
169 } 266 }
267 len += 4;
170 268 }
171 psiconv_progress(lev+2,off+len,
172 "Going to read whether RLE compression is used");
173 compression=psiconv_read_u32(buf,lev+2,off+len);
174 if (compression > 1) {
175 psiconv_warn(lev+2,off+len,"Paint data section has unknown "
176 "compression type, assuming RLE");
177 psiconv_debug(lev+2,off+len,"Read compression type %d",compression);
178 compression = 1;
179 }
180 psiconv_debug(lev+2,off+len,"Compression: %s",compression?"RLE":"none");
181 269
182 (*result)->red = malloc(sizeof(float) * picsize);
183 (*result)->green = malloc(sizeof(float) * picsize);
184 (*result)->blue = malloc(sizeof(float) * picsize);
185 len = offset; 270 len = offset;
186 datasize = size - len; 271 datasize = size - len;
272 if (isclipart)
273 len += 8;
187 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
188 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");
189 pixelnr = 0; 280 for (i = 0; i < datasize; i++) {
190 datanr = 0; 281 byte = psiconv_read_u8(config,buf,lev+2,off+len+i,&res);
282 psiconv_debug(config,lev+2,off+len+i,
283 "Pixel byte %04x of %04x has value %02x",
284 i,datasize,byte);
285 if (res)
286 goto ERROR3;
287 psiconv_list_add(bytes,&byte);
288 }
289 len += datasize;
290
191 if (!compression) { 291 switch(compression) {
192 linelen = datasize / (*result)->ysize; 292 case 1:
193 psiconv_debug(lev+3,off+len,"Line length: %04x bytes",linelen); 293 if ((res = psiconv_decode_rle8(config,lev+2,off+len,bytes,&decoded)))
194 while((datanr < datasize)) { 294 goto ERROR3;
195 temp = psiconv_read_u8(buf,lev+2,off+len+datanr); 295 psiconv_list_free(bytes);
196 if (decode_byte(lev+3,off+len+datanr,*result,&pixelnr,temp,bits_per_pixel, 296 bytes = decoded;
197 linelen,&linepos,picsize)) {
198 read_err = 1;
199 res = -1;
200 break; 297 break;
201 } 298 case 2:
202 datanr++; 299 if ((psiconv_decode_rle12(config,lev+2,off+len,bytes,&decoded)))
300 goto ERROR3;
301 psiconv_list_free(bytes);
302 bytes = decoded;
303 break;
304 case 3:
305 if ((psiconv_decode_rle16(config,lev+2,off+len,bytes,&decoded)))
306 goto ERROR3;
307 psiconv_list_free(bytes);
308 bytes = decoded;
309 break;
310 case 4:
311 if ((psiconv_decode_rle24(config,lev+2,off+len,bytes,&decoded)))
312 goto ERROR3;
313 psiconv_list_free(bytes);
314 bytes = decoded;
315 break;
316 }
317
318 if ((res = psiconv_bytes_to_pixel_data(config,lev+2,off+len,bytes,
319 &pixels,bits_per_pixel,
320 (*result)->xsize,(*result)->ysize)))
321 goto ERROR3;
322
323 /* Use some heuristics; things may get unexpected around here */
324 bluebits = redbits = greenbits = 0;
325 palet = psiconv_palet_none;
326 if (color) {
327 if (bits_per_pixel == 4)
328 palet = psiconv_palet_color_4;
329 else if (bits_per_pixel == 8)
330 palet = psiconv_palet_color_8;
331 else {
332 redbits = (bits_per_pixel+2) / 3;
333 greenbits = (bits_per_pixel+2) / 3;
334 bluebits = bits_per_pixel - redbits - greenbits;
203 } 335 }
204 } else {
205 psiconv_progress(lev+2,off+len,"First pass: determining line length");
206 datanr = 0;
207 i = 0;
208 while (datanr < datasize) {
209 marker = psiconv_read_u8(buf,lev+3,off+len+datanr);
210 if (marker >= 0x80) {
211 datanr += 0x100 - marker + 1;
212 i += 0x100 - marker;
213 } else {
214 datanr += 2;
215 i += marker + 1;
216 }
217 } 336 }
218 linelen = i / (*result)->ysize; 337 if ((res = psiconv_pixel_data_to_floats(config,lev+2,off+len,pixels,
219 datanr=0; 338 &floats,bits_per_pixel,color,
220 psiconv_debug(lev+2,off+len,"Linelen: %04x bytes",linelen); 339 redbits,greenbits,bluebits,palet)))
221 while((datanr < datasize)) { 340 goto ERROR4;
222 marker = psiconv_read_u8(buf,lev+3,off+len+datanr);
223 psiconv_debug(lev+3,off+len+datanr,
224 "Pixelnr %08x, Datanr %08x: Read marker %02x",
225 pixelnr,datanr,marker);
226 datanr ++;
227 if (marker >= 0x80) {
228 /* 0x100 - marker bytes of data follow */
229 for (i = 0; i < 0x100-marker; i++,datanr++) {
230 if (datanr >= datasize) {
231 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
232 psiconv_debug(lev+3,off+len+datanr,
233 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
234 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
235 datanr,marker);
236 read_err = 1;
237 res = -1;
238 break;
239 }
240 temp = psiconv_read_u8(buf,lev+2,off+len+datanr);
241 if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp,
242 bits_per_pixel,linelen,&linepos,picsize)) {
243 res = -1;
244 read_err = 1;
245 break;
246 }
247 }
248 } else {
249 if (datanr >= datasize) {
250 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
251 psiconv_debug(lev+3,off+len+datanr,
252 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
253 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
254 datanr,marker);
255 read_err = 1;
256 res = -1;
257 } else {
258 temp = psiconv_read_u8(buf,lev+3,off+len+datanr);
259 for (i = 0; i <= marker; i++) {
260 if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp,
261 bits_per_pixel,linelen,&linepos,picsize)) {
262 read_err = 1;
263 res = -1;
264 break;
265 }
266 }
267 datanr ++;
268 }
269 }
270 }
271 } 341
342 (*result)->red = floats.red;
343 (*result)->green = floats.green;
344 (*result)->blue = floats.blue;
272 345
273 if (linepos >= ((*result)->xsize + (8/bits_per_pixel) - 1) / 346 psiconv_list_free(bytes);
274 (8/bits_per_pixel)) 347 psiconv_list_free(pixels);
275 datanr += (linelen - linepos);
276
277 if (!read_err && ((datanr != datasize) || (pixelnr != picsize))) {
278 psiconv_warn(lev+2,off+len,"Corrupted picture data!");
279 psiconv_debug(lev+3,off+len+datanr,
280 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
281 "Datanr: %08x",picsize,datasize,pixelnr,datanr);
282 res = -1;
283 }
284 348
285 len += datanr;
286 349
287 if (length) 350 if (length)
288 *length = len; 351 *length = len;
289 352
290 psiconv_progress(lev+1,off+len-1,"End of paint data section " 353 psiconv_progress(config,lev,off+len-1,
291 "(total length: %08x)", len); 354 "End of Paint Data Section (total length: %08x)", len);
292 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
293 return res; 371 return res;
294} 372}
295 373
296int 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,
297 psiconv_u32 off, int *length, int is_object, 376 psiconv_u32 off, int *length,
298 psiconv_sketch_section *result) 377 psiconv_sketch_section *result)
299{ 378{
300 int res=0; 379 int res=0;
301 int len=0; 380 int len=0;
302 psiconv_u32 temp; 381 psiconv_u32 temp;
303 int leng; 382 int leng;
304 int i;
305 383
306 psiconv_progress(lev+1,off,"Going to read the sketch section"); 384 psiconv_progress(config,lev+1,off,"Going to read the sketch section");
307 *result = malloc(sizeof(**result)); 385 if (!(*result = malloc(sizeof(**result))))
386 goto ERROR1;
308 387
309 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
310 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");
311 (*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;
312 psiconv_debug(lev+2,off+len,"Form hor. size: %04x", 441 psiconv_debug(config,lev+2,off+len,"Form hor. size: %04x",
313 (*result)->form_xsize); 442 (*result)->form_xsize);
314 len += 0x02; 443 len += 0x02;
315 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");
316 (*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;
317 psiconv_debug(lev+2,off+len,"Form ver. size: %04x", 448 psiconv_debug(config,lev+2,off+len,"Form ver. size: %04x",
318 (*result)->form_ysize); 449 (*result)->form_ysize);
319 len += 0x02; 450 len += 0x02;
320 psiconv_progress(lev+2,off+len,"Going to read the picture hor. offset"); 451
321 (*result)->picture_x_offset = psiconv_read_u16(buf,lev+2,off + len);
322 psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x",
323 (*result)->picture_x_offset);
324 len += 0x02;
325 psiconv_progress(lev+2,off+len,"Going to read the picture ver. offset");
326 (*result)->picture_y_offset = psiconv_read_u16(buf,lev+2,off + len);
327 psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x",
328 (*result)->picture_y_offset);
329 len += 0x02;
330 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");
331 for (i = 0; i < 5; i++) {
332 temp = psiconv_read_u16(buf,lev+2,off+len);
333 if (temp != 0) {
334 psiconv_warn(lev+2,off+len,
335 "Unexpected value in sketch section preamble");
336 psiconv_debug(lev+2,off+len,"Word %d: Read %04x, expected %04x",i,
337 temp,0);
338 res = -1;
339 }
340 off += 0x02;
341 }
342 } else {
343 psiconv_progress(lev+2,off+len,"Going to read the displayed hor. size");
344 (*result)->picture_xsize = psiconv_read_u16(buf,lev+2,off + len);
345 psiconv_debug(lev+2,off+len,"Displayed hor. size: %04x",
346 (*result)->picture_xsize);
347 len += 0x02;
348 psiconv_progress(lev+2,off+len,"Going to read the displayed ver. size");
349 (*result)->picture_ysize = psiconv_read_u16(buf,lev+2,off + len);
350 psiconv_debug(lev+2,off+len,"Displayed ver. size: %04x",
351 (*result)->picture_ysize);
352 len += 0x02;
353
354 psiconv_progress(lev+2,off+len,"Going to skip 2 words of zeros");
355 for (i = 0; i < 2; i++) {
356 temp = psiconv_read_u16(buf,lev+2,off+len);
357 if (temp != 0) {
358 psiconv_warn(lev+2,off+len,
359 "Unexpected value in sketch section preamble");
360 psiconv_debug(lev+2,off+len,"Word %d: Read %04x, expected %04x",i,
361 temp,0);
362 res = -1;
363 }
364 off += 0x02;
365 }
366 psiconv_progress(lev+2,off+len,"Going to read the picture hor. offset");
367 (*result)->picture_x_offset = psiconv_read_u16(buf,lev+2,off + len);
368 psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x",
369 (*result)->picture_x_offset);
370 len += 0x02;
371 psiconv_progress(lev+2,off+len,"Going to read the picture ver. offset");
372 (*result)->picture_y_offset = psiconv_read_u16(buf,lev+2,off + len);
373 psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x",
374 (*result)->picture_y_offset);
375 len += 0x02;
376 psiconv_progress(lev+2,off+len,"Going to read the form hor. size");
377 (*result)->form_xsize = psiconv_read_u16(buf,lev+2,off + len);
378 psiconv_debug(lev+2,off+len,"Form hor. size: %04x",
379 (*result)->form_xsize);
380 len += 0x02;
381 psiconv_progress(lev+2,off+len,"Going to read the form ver. size");
382 (*result)->form_ysize = psiconv_read_u16(buf,lev+2,off + len);
383 psiconv_debug(lev+2,off+len,"Form ver. size: %04x",
384 (*result)->form_ysize);
385 len += 0x02;
386 psiconv_progress(lev+2,off+len,"Going to skip 1 zero word");
387 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;
388 if (temp != 0) { 456 if (temp != 0) {
389 psiconv_warn(lev+2,off+len, 457 psiconv_warn(config,lev+2,off+len,
390 "Unexpected value in sketch section preamble"); 458 "Unexpected value in sketch section preamble (ignored)");
391 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",
392 res = -1; 460 temp,0);
393 } 461 }
394 off += 0x02; 462 off += 0x02;
395 }
396 463
397 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");
398 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,
399 &((*result)->picture)); 466 &((*result)->picture))))
467 goto ERROR2;
400 off += leng; 468 off += leng;
401 if (!is_object) {
402 (*result)->picture_xsize = (*result)->picture->xsize;
403 (*result)->picture_ysize = (*result)->picture->ysize;
404 }
405 469
406 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");
407 (*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;
408 psiconv_debug(lev+2,off+len,"Form hor. magnification: %f", 474 psiconv_debug(config,lev+2,off+len,"Form hor. magnification: %f",
409 (*result)->magnification_x); 475 (*result)->magnification_x);
410 len += 0x02; 476 len += 0x02;
411 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");
412 (*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;
413 psiconv_debug(lev+2,off+len,"Form ver. magnification: %f", 481 psiconv_debug(config,lev+2,off+len,"Form ver. magnification: %f",
414 (*result)->magnification_y); 482 (*result)->magnification_y);
415 len += 0x02; 483 len += 0x02;
416 484
417 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");
418 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;
419 (*result)->cut_left = (temp * 6.0) / (*result)->picture_xsize; 489 (*result)->cut_left = (temp * 6.0) / (*result)->displayed_xsize;
420 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",
421 temp,(*result)->cut_left); 491 temp,(*result)->cut_left);
422 len += 0x04; 492 len += 0x04;
423 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");
424 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;
425 (*result)->cut_right = (temp * 6.0) / (*result)->picture_xsize; 497 (*result)->cut_right = (temp * 6.0) / (*result)->displayed_xsize;
426 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",
427 temp,(*result)->cut_right); 499 temp,(*result)->cut_right);
428 len += 0x04; 500 len += 0x04;
429 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");
430 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;
431 (*result)->cut_top = (temp * 6.0) / (*result)->picture_ysize; 505 (*result)->cut_top = (temp * 6.0) / (*result)->displayed_ysize;
432 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",
433 temp,(*result)->cut_top); 507 temp,(*result)->cut_top);
434 len += 0x04; 508 len += 0x04;
435 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");
436 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;
437 (*result)->cut_bottom = (temp * 6.0) / (*result)->picture_ysize; 513 (*result)->cut_bottom = (temp * 6.0) / (*result)->displayed_ysize;
438 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",
439 temp,(*result)->cut_bottom); 515 temp,(*result)->cut_bottom);
440 len += 0x04; 516 len += 0x04;
441 517
442 if (length) 518 if (length)
443 *length = len; 519 *length = len;
444 520
445 psiconv_progress(lev,off+len-1, 521 psiconv_progress(config,lev,off+len-1,
446 "End of sketch section (total length: %08x)", len); 522 "End of sketch section (total length: %08x)", len);
447 523
448 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;
449} 537}
450 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.25  
changed lines
  Added in v.196
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26