/[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 168 Revision 196
1/* 1/*
2 parse_image.c - Part of psiconv, a PSION 5 file formats converter 2 parse_image.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 1999-2004 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
22 22
23#include <stdlib.h> 23#include <stdlib.h>
24 24
25#include "parse_routines.h" 25#include "parse_routines.h"
26#include "error.h" 26#include "error.h"
27#include "image.h"
27 28
28#ifdef DMALLOC 29#ifdef DMALLOC
29#include <dmalloc.h> 30#include <dmalloc.h>
30#endif 31#endif
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
31 67
32 68
33int psiconv_parse_jumptable_section(const psiconv_config config, 69int psiconv_parse_jumptable_section(const psiconv_config config,
34 const psiconv_buffer buf,int lev, 70 const psiconv_buffer buf,int lev,
35 psiconv_u32 off, int *length, 71 psiconv_u32 off, int *length,
… …
71 return 0; 107 return 0;
72 108
73ERROR2: 109ERROR2:
74 psiconv_list_free(*result); 110 psiconv_list_free(*result);
75ERROR1: 111ERROR1:
76 psiconv_warn(config,lev+1,off,"Reading of Jumptable Section failed"); 112 psiconv_error(config,lev+1,off,"Reading of Jumptable Section failed");
77 if (length) 113 if (length)
78 *length = 0; 114 *length = 0;
79 if (!res) 115 if (!res)
80 return -PSICONV_E_NOMEM; 116 return -PSICONV_E_NOMEM;
81 else 117 else
82 return res; 118 return res;
83} 119}
84 120
85static int decode_byte(const psiconv_config config, int lev, psiconv_u32 off,
86 psiconv_paint_data_section data, psiconv_u32 *pixelnr,
87 psiconv_u8 byte, int bits_per_pixel, int linelen,
88 int *linepos,int picsize)
89{
90 int mask = (bits_per_pixel << 1) -1;
91 int i;
92 if (*linepos < (data->xsize + (8/bits_per_pixel) - 1) / (8/bits_per_pixel))
93 for (i = 0; i < 8/bits_per_pixel; i ++) {
94 if ((i != 0) && ((*pixelnr % (data->xsize)) == 0)) {
95 psiconv_debug(config,lev+1,off,"Skipping padding: %02x",byte);
96 i = 8;
97 } else if (*pixelnr >= picsize) {
98 psiconv_warn(config,lev+1,off,"Corrupted picture data!");
99 psiconv_debug(config,lev+1,off,"Trying to write a pixel too far");
100 return -1;
101 } else {
102 data->red[*pixelnr] = data->green[*pixelnr] = data->blue[*pixelnr] =
103 ((float) (byte & mask)) / ((1 << bits_per_pixel) -1);
104 psiconv_debug(config,lev+1,off,"Pixel %04x: (%04x,%04x) value %02x, color %f",
105 *pixelnr,*pixelnr % data->xsize,
106 *pixelnr / data->xsize, byte&mask, data->red[*pixelnr]);
107 byte = byte >> bits_per_pixel;
108 (*pixelnr) ++;
109 }
110 }
111 else
112 psiconv_debug(config,lev+1,off,"Skipping padding byte");
113 (*linepos) ++;
114 if (*linepos == linelen)
115 *linepos = 0;
116 return 0;
117}
118
119
120int psiconv_parse_paint_data_section(const psiconv_config config, 121int psiconv_parse_paint_data_section(const psiconv_config config,
121 const psiconv_buffer buf,int lev, 122 const psiconv_buffer buf,int lev,
122 psiconv_u32 off, int *length,int isclipart, 123 psiconv_u32 off, int *length,int isclipart,
123 psiconv_paint_data_section *result) 124 psiconv_paint_data_section *result)
124{ 125{
125 int res = 0; 126 int res = 0;
126 int len = 0; 127 int len = 0;
127 psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen; 128 psiconv_u32 size,offset,picsize,temp,datasize,color,
129 redbits,bluebits,greenbits;
128 psiconv_u8 marker; 130 psiconv_u8 byte;
129 int i,leng; 131 int leng,i;
130 psiconv_u32 bits_per_pixel,compression; 132 psiconv_u32 bits_per_pixel,compression;
131 int linepos = 0; 133 psiconv_pixel_bytes bytes,decoded;
134 psiconv_pixel_ints pixels;
135 psiconv_pixel_floats_t floats,palet;
132 136
133 psiconv_progress(config,lev+1,off,"Going to read a paint data section"); 137 psiconv_progress(config,lev+1,off,"Going to read a paint data section");
134 if (!((*result) = malloc(sizeof(**result)))) 138 if (!((*result) = malloc(sizeof(**result))))
135 goto ERROR1; 139 goto ERROR1;
136 140
141 if (!(bytes = psiconv_list_new(sizeof(psiconv_u8))))
142 goto ERROR2;
143
137 psiconv_progress(config,lev+2,off+len,"Going to read section size"); 144 psiconv_progress(config,lev+2,off+len,"Going to read section size");
138 size = psiconv_read_u32(config,buf,lev+2,off+len,&res); 145 size = psiconv_read_u32(config,buf,lev+2,off+len,&res);
139 if (res) 146 if (res)
140 goto ERROR2; 147 goto ERROR3;
141 psiconv_debug(config,lev+2,off+len,"Section size: %08x",size); 148 psiconv_debug(config,lev+2,off+len,"Section size: %08x",size);
142 len += 4; 149 len += 4;
143 150
144 psiconv_progress(config,lev+2,off+len,"Going to read pixel data offset"); 151 psiconv_progress(config,lev+2,off+len,"Going to read pixel data offset");
145 offset = psiconv_read_u32(config,buf,lev+2,off+len,&res); 152 offset = psiconv_read_u32(config,buf,lev+2,off+len,&res);
146 if (res) 153 if (res)
147 goto ERROR2; 154 goto ERROR3;
148 if (offset != 0x28) { 155 if (offset != 0x28) {
149 psiconv_warn(config,lev+2,off+len, 156 psiconv_error(config,lev+2,off+len,
150 "Paint data section data offset has unexpected value"); 157 "Paint data section data offset has unexpected value");
151 psiconv_debug(config,lev+2,off+len, 158 psiconv_debug(config,lev+2,off+len,
152 "Data offset: read %08x, expected %08x",offset,0x28); 159 "Data offset: read %08x, expected %08x",offset,0x28);
153 res = -1; 160 res = -1;
154 } 161 }
155 len += 4; 162 len += 4;
156 163
157 psiconv_progress(config,lev+2,off+len,"Going to read picture X size"); 164 psiconv_progress(config,lev+2,off+len,"Going to read picture X size");
158 (*result)->xsize = psiconv_read_u32(config,buf,lev+2,off+len,&res); 165 (*result)->xsize = psiconv_read_u32(config,buf,lev+2,off+len,&res);
159 if (res) 166 if (res)
160 goto ERROR2; 167 goto ERROR3;
161 psiconv_debug(config,lev+2,off+len,"Picture X size: %08x:",(*result)->xsize); 168 psiconv_debug(config,lev+2,off+len,"Picture X size: %08x:",(*result)->xsize);
162 len += 4; 169 len += 4;
163 170
164 psiconv_progress(config,lev+2,off+len,"Going to read picture Y size"); 171 psiconv_progress(config,lev+2,off+len,"Going to read picture Y size");
165 (*result)->ysize = psiconv_read_u32(config,buf,lev+2,off+len,&res); 172 (*result)->ysize = psiconv_read_u32(config,buf,lev+2,off+len,&res);
166 if (res) 173 if (res)
167 goto ERROR2; 174 goto ERROR3;
168 psiconv_debug(config,lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize); 175 psiconv_debug(config,lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize);
169 len += 4; 176 len += 4;
170 177
171 picsize = (*result)->ysize * (*result)->xsize; 178 picsize = (*result)->ysize * (*result)->xsize;
172 179
173 psiconv_progress(config,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");
174 (*result)->pic_xsize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); 181 (*result)->pic_xsize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
175 if (res) 182 if (res)
176 goto ERROR2; 183 goto ERROR3;
177 psiconv_debug(config,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);
178 len += leng; 185 len += leng;
179 186
180 psiconv_progress(config,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");
181 (*result)->pic_ysize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); 188 (*result)->pic_ysize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
182 if (res) 189 if (res)
183 goto ERROR2; 190 goto ERROR3;
184 psiconv_debug(config,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);
185 len += leng; 192 len += leng;
186 193
187 psiconv_progress(config,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");
188 bits_per_pixel=psiconv_read_u32(config,buf,lev+2,off+len,&res); 195 bits_per_pixel=psiconv_read_u32(config,buf,lev+2,off+len,&res);
189 if (res) 196 if (res)
190 goto ERROR2; 197 goto ERROR3;
191 if (bits_per_pixel > 8) {
192 psiconv_warn(config,lev+2,off+len,"Picture has too many colors");
193 psiconv_debug(config,lev+2,off+len,"Read %d colorbits",bits_per_pixel);
194 res = -PSICONV_E_PARSE;
195 goto ERROR2;
196 }
197 psiconv_debug(config,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);
198 len += 4; 199 len += 4;
199 200
200 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
201 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); 218 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
202 if (res) 219 if (res)
203 goto ERROR2; 220 goto ERROR3;
204 if (temp != 00) { 221 if (temp != 00) {
205 psiconv_warn(config,lev+2,off+len, 222 psiconv_warn(config,lev+2,off+len,
206 "Paint data section prologue has unknown values (ignored)"); 223 "Paint data section prologue has unknown values (ignored)");
207 psiconv_debug(config,lev+2,off+len, 224 psiconv_debug(config,lev+2,off+len,
208 "offset %02x: read %08x, expected %08x",i,temp, 0x00); 225 "read %08x, expected %08x",temp, 0x00);
209 } 226 }
210 len += 4; 227 len += 4;
211 }
212 228
213 psiconv_progress(config,lev+2,off+len, 229 psiconv_progress(config,lev+2,off+len,
214 "Going to read whether RLE compression is used"); 230 "Going to read whether RLE compression is used");
215 compression=psiconv_read_u32(config,buf,lev+2,off+len,&res); 231 compression=psiconv_read_u32(config,buf,lev+2,off+len,&res);
216 if (res) 232 if (res)
217 goto ERROR2; 233 goto ERROR3;
218 if (compression > 1) { 234 if (compression > 4) {
219 psiconv_warn(config,lev+2,off+len,"Paint data section has unknown " 235 psiconv_warn(config,lev+2,off+len,"Paint data section has unknown "
220 "compression type, assuming RLE"); 236 "compression type, assuming RLE");
221 psiconv_debug(config,lev+2,off+len,"Read compression type %d",compression); 237 psiconv_debug(config,lev+2,off+len,"Read compression type %d",compression);
222 compression = 1; 238 compression = 0;
223 } 239 }
224 psiconv_debug(config,lev+2,off+len,"Compression: %s",compression?"RLE":"none"); 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");
225 len += 4; 243 len += 4;
226 244
227 if (isclipart) { 245 if (isclipart) {
228 psiconv_progress(config,lev+2,off+len,"Going to read an unknown long"); 246 psiconv_progress(config,lev+2,off+len,"Going to read an unknown long");
229 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); 247 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
230 if (res) 248 if (res)
231 goto ERROR2; 249 goto ERROR3;
232 if (temp != 0xffffffff) { 250 if (temp != 0xffffffff) {
233 psiconv_warn(config,lev+2,off+len, 251 psiconv_warn(config,lev+2,off+len,
234 "Paint data section prologue has unknown values (ignoring)"); 252 "Paint data section prologue has unknown values (ignoring)");
235 psiconv_debug(config,lev+2,off+len, 253 psiconv_debug(config,lev+2,off+len,
236 "offset %02x: read %08x, expected %08x",i,temp, 0xffffffff); 254 "Read %08x, expected %08x",temp, 0xffffffff);
237 } 255 }
238 len += 4; 256 len += 4;
239 psiconv_progress(config,lev+2,off+len,"Going to read a second unknown long"); 257 psiconv_progress(config,lev+2,off+len,"Going to read a second unknown long");
240 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); 258 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
241 if (res) 259 if (res)
242 goto ERROR2; 260 goto ERROR3;
243 if (temp != 0x44) { 261 if (temp != 0x44) {
244 psiconv_warn(config,lev+2,off+len, 262 psiconv_warn(config,lev+2,off+len,
245 "Paint data section prologue has unknown values (ignoring)"); 263 "Paint data section prologue has unknown values (ignoring)");
246 psiconv_debug(config,lev+2,off+len, 264 psiconv_debug(config,lev+2,off+len,
247 "offset %02x: read %08x, expected %08x",i,temp, 0x44); 265 "read %08x, expected %08x",temp, 0x44);
248 } 266 }
249 len += 4; 267 len += 4;
250 } 268 }
251 269
252 if (!((*result)->red = malloc(sizeof(float) * picsize)))
253 goto ERROR2;
254 if (!((*result)->green = malloc(sizeof(float) * picsize)))
255 goto ERROR3;
256 if (!((*result)->blue = malloc(sizeof(float) * picsize)))
257 goto ERROR4;
258 len = offset; 270 len = offset;
259 datasize = size - len; 271 datasize = size - len;
260 if (isclipart) 272 if (isclipart)
261 len += 8; 273 len += 8;
262 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
263 psiconv_progress(config,lev+2,off+len,"Going to read the pixel data"); 279 psiconv_progress(config,lev+2,off+len,"Going to read the pixel data");
264 pixelnr = 0; 280 for (i = 0; i < datasize; i++) {
265 datanr = 0;
266 if (!compression) {
267 linelen = datasize / (*result)->ysize;
268 psiconv_debug(config,lev+3,off+len,"Line length: %04x bytes",linelen);
269 while((datanr < datasize)) {
270 temp = psiconv_read_u8(config,buf,lev+2,off+len+datanr,&res); 281 byte = psiconv_read_u8(config,buf,lev+2,off+len+i,&res);
282 psiconv_debug(config,lev+2,off+len+i,
283 "Pixel byte %04x of %04x has value %02x",
284 i,datasize,byte);
271 if (res) 285 if (res)
286 goto ERROR3;
287 psiconv_list_add(bytes,&byte);
288 }
289 len += datasize;
290
291 switch(compression) {
292 case 1:
293 if ((res = psiconv_decode_rle8(config,lev+2,off+len,bytes,&decoded)))
294 goto ERROR3;
295 psiconv_list_free(bytes);
296 bytes = decoded;
297 break;
298 case 2:
299 if ((psiconv_decode_rle12(config,lev+2,off+len,bytes,&decoded)))
300 goto ERROR3;
301 psiconv_list_free(bytes);
302 bytes = decoded;
303 break;
304 case 3:
305 if ((psiconv_decode_rle16(config,lev+2,off+len,bytes,&decoded)))
272 goto ERROR5; 306 goto ERROR3;
273 if (decode_byte(config,lev+3,off+len+datanr,*result,&pixelnr,temp,bits_per_pixel, 307 psiconv_list_free(bytes);
274 linelen,&linepos,picsize)) { 308 bytes = decoded;
275 res = -PSICONV_E_PARSE;
276 break; 309 break;
277 } 310 case 4:
278 datanr++; 311 if ((psiconv_decode_rle24(config,lev+2,off+len,bytes,&decoded)))
312 goto ERROR3;
313 psiconv_list_free(bytes);
314 bytes = decoded;
315 break;
316 }
317
318 if ((res = psiconv_bytes_to_pixel_data(config,lev+2,off+len,bytes,
319 &pixels,bits_per_pixel,
320 (*result)->xsize,(*result)->ysize)))
321 goto ERROR3;
322
323 /* Use some heuristics; things may get unexpected around here */
324 bluebits = redbits = greenbits = 0;
325 palet = psiconv_palet_none;
326 if (color) {
327 if (bits_per_pixel == 4)
328 palet = psiconv_palet_color_4;
329 else if (bits_per_pixel == 8)
330 palet = psiconv_palet_color_8;
331 else {
332 redbits = (bits_per_pixel+2) / 3;
333 greenbits = (bits_per_pixel+2) / 3;
334 bluebits = bits_per_pixel - redbits - greenbits;
279 } 335 }
280 } else {
281 psiconv_progress(config,lev+2,off+len,"First pass: determining line length");
282 datanr = 0;
283 i = 0;
284 while (datanr < datasize) {
285 marker = psiconv_read_u8(config,buf,lev+3,off+len+datanr,&res);
286 if (res)
287 goto ERROR5;
288 if (marker >= 0x80) {
289 datanr += 0x100 - marker + 1;
290 i += 0x100 - marker;
291 } else {
292 datanr += 2;
293 i += marker + 1;
294 }
295 } 336 }
296 linelen = i / (*result)->ysize; 337 if ((res = psiconv_pixel_data_to_floats(config,lev+2,off+len,pixels,
297 datanr=0; 338 &floats,bits_per_pixel,color,
298 psiconv_debug(config,lev+2,off+len,"Linelen: %04x bytes",linelen); 339 redbits,greenbits,bluebits,palet)))
299 while((datanr < datasize)) {
300 marker = psiconv_read_u8(config,buf,lev+3,off+len+datanr,&res);
301 if (res)
302 goto ERROR5;
303 psiconv_debug(config,lev+3,off+len+datanr,
304 "Pixelnr %08x, Datanr %08x: Read marker %02x",
305 pixelnr,datanr,marker);
306 datanr ++;
307 if (marker >= 0x80) {
308 /* 0x100 - marker bytes of data follow */
309 for (i = 0; i < 0x100-marker; i++,datanr++) {
310 if (datanr >= datasize) {
311 psiconv_warn(config,lev+3,off+len+datanr,"Corrupted picture data");
312 psiconv_debug(config,lev+3,off+len+datanr,
313 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
314 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
315 datanr,marker);
316 res = -PSICONV_E_PARSE;
317 break;
318 }
319 temp = psiconv_read_u8(config,buf,lev+2,off+len+datanr,&res);
320 if (res)
321 goto ERROR5;
322 if (decode_byte(config,lev+2,off+len+datanr,*result,&pixelnr,temp,
323 bits_per_pixel,linelen,&linepos,picsize)) {
324 res = -PSICONV_E_PARSE;
325 break;
326 }
327 }
328 } else {
329 if (datanr >= datasize) {
330 psiconv_warn(config,lev+3,off+len+datanr,"Corrupted picture data");
331 psiconv_debug(config,lev+3,off+len+datanr,
332 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
333 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
334 datanr,marker);
335 res = -PSICONV_E_PARSE;
336 } else {
337 temp = psiconv_read_u8(config,buf,lev+3,off+len+datanr,&res);
338 if (res)
339 goto ERROR5;
340 for (i = 0; i <= marker; i++) {
341 if (decode_byte(config,lev+2,off+len+datanr,*result,&pixelnr,temp,
342 bits_per_pixel,linelen,&linepos,picsize)) {
343 res = -PSICONV_E_PARSE;
344 break;
345 }
346 }
347 datanr ++;
348 }
349 }
350 }
351 }
352
353 if (linepos >= ((*result)->xsize + (8/bits_per_pixel) - 1) /
354 (8/bits_per_pixel))
355 datanr += (linelen - linepos);
356
357 if (res || (datanr != datasize) || (pixelnr != picsize)) {
358 psiconv_warn(config,lev+2,off+len,"Corrupted picture data!");
359 psiconv_debug(config,lev+3,off+len+datanr,
360 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
361 "Datanr: %08x",picsize,datasize,pixelnr,datanr);
362 goto ERROR5; 340 goto ERROR4;
363 } 341
342 (*result)->red = floats.red;
343 (*result)->green = floats.green;
344 (*result)->blue = floats.blue;
364 345
365 len += datanr; 346 psiconv_list_free(bytes);
347 psiconv_list_free(pixels);
348
366 349
367 if (length) 350 if (length)
368 *length = len; 351 *length = len;
369 352
370 psiconv_progress(config,lev+1,off+len-1,"End of paint data section " 353 psiconv_progress(config,lev,off+len-1,
371 "(total length: %08x)", len); 354 "End of Paint Data Section (total length: %08x)", len);
372 355
373 return res; 356 return 0;
374 357
375ERROR5:
376 free((*result)->blue);
377ERROR4: 358ERROR4:
378 free((*result)->green); 359 psiconv_list_free(pixels);
379ERROR3: 360ERROR3:
380 free((*result)->red); 361 psiconv_list_free(bytes);
381ERROR2: 362ERROR2:
382 free (*result); 363 free(*result);
383ERROR1: 364ERROR1:
384 psiconv_warn(config,lev+1,off,"Reading of Paint Data Section failed"); 365 psiconv_error(config,lev+1,off,"Reading of Paint Data Section failed");
385 if (length) 366 if (length)
386 *length = 0; 367 *length = 0;
387 if (!res) 368 if (!res)
388 return -PSICONV_E_NOMEM; 369 return -PSICONV_E_NOMEM;
389 else 370 else
… …
544ERROR3: 525ERROR3:
545 psiconv_free_paint_data_section((*result)->picture); 526 psiconv_free_paint_data_section((*result)->picture);
546ERROR2: 527ERROR2:
547 free (*result); 528 free (*result);
548ERROR1: 529ERROR1:
549 psiconv_warn(config,lev+1,off,"Reading of Sketch Section failed"); 530 psiconv_error(config,lev+1,off,"Reading of Sketch Section failed");
550 if (length) 531 if (length)
551 *length = 0; 532 *length = 0;
552 if (!res) 533 if (!res)
553 return -PSICONV_E_NOMEM; 534 return -PSICONV_E_NOMEM;
554 else 535 else
… …
647 return 0; 628 return 0;
648 629
649ERROR2: 630ERROR2:
650 free (*result); 631 free (*result);
651ERROR1: 632ERROR1:
652 psiconv_warn(config,lev+1,off,"Reading of Font failed"); 633 psiconv_error(config,lev+1,off,"Reading of Font failed");
653 if (length) 634 if (length)
654 *length = 0; 635 *length = 0;
655 if (!res) 636 if (!res)
656 return -PSICONV_E_NOMEM; 637 return -PSICONV_E_NOMEM;
657 else 638 else
658 return res; 639 return res;
659} 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.168  
changed lines
  Added in v.196
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26