/[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 175 Revision 230
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
33/* Extreme debugging info */
34#undef LOUD
35
36static int psiconv_decode_rle8 (const psiconv_config config, int lev,
37 psiconv_u32 off,
38 const psiconv_pixel_bytes encoded,
39 psiconv_pixel_bytes *decoded);
40
41static int psiconv_decode_rle12 (const psiconv_config config, int lev,
42 psiconv_u32 off,
43 const psiconv_pixel_bytes encoded,
44 psiconv_pixel_bytes *decoded);
45
46static int psiconv_decode_rle16 (const psiconv_config config, int lev,
47 psiconv_u32 off,
48 const psiconv_pixel_bytes encoded,
49 psiconv_pixel_bytes *decoded);
50
51static int psiconv_decode_rle24 (const psiconv_config config, int lev,
52 psiconv_u32 off,
53 const psiconv_pixel_bytes encoded,
54 psiconv_pixel_bytes *decoded);
55
56static int psiconv_bytes_to_pixel_data(const psiconv_config config,
57 int lev, psiconv_u32 off,
58 const psiconv_pixel_bytes bytes,
59 psiconv_pixel_ints *pixels,
60 int colordepth, int xsize, int ysize);
61
62static int psiconv_pixel_data_to_floats (const psiconv_config config, int lev,
63 psiconv_u32 off,
64 const psiconv_pixel_ints pixels,
65 psiconv_pixel_floats_t *floats,
66 int colordepth, int color,
67 int redbits, int bluebits, int greenbits,
68 const psiconv_pixel_floats_t palet);
69
31 70
32 71
33int psiconv_parse_jumptable_section(const psiconv_config config, 72int psiconv_parse_jumptable_section(const psiconv_config config,
34 const psiconv_buffer buf,int lev, 73 const psiconv_buffer buf,int lev,
35 psiconv_u32 off, int *length, 74 psiconv_u32 off, int *length,
… …
71 return 0; 110 return 0;
72 111
73ERROR2: 112ERROR2:
74 psiconv_list_free(*result); 113 psiconv_list_free(*result);
75ERROR1: 114ERROR1:
76 psiconv_warn(config,lev+1,off,"Reading of Jumptable Section failed"); 115 psiconv_error(config,lev+1,off,"Reading of Jumptable Section failed");
77 if (length) 116 if (length)
78 *length = 0; 117 *length = 0;
79 if (!res) 118 if (!res)
80 return -PSICONV_E_NOMEM; 119 return -PSICONV_E_NOMEM;
81 else 120 else
82 return res; 121 return res;
83} 122}
84 123
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, 124int psiconv_parse_paint_data_section(const psiconv_config config,
121 const psiconv_buffer buf,int lev, 125 const psiconv_buffer buf,int lev,
122 psiconv_u32 off, int *length,int isclipart, 126 psiconv_u32 off, int *length,int isclipart,
123 psiconv_paint_data_section *result) 127 psiconv_paint_data_section *result)
124{ 128{
125 int res = 0; 129 int res = 0;
126 int len = 0; 130 int len = 0;
127 psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen; 131 psiconv_u32 size,offset,picsize,temp,datasize,color,
132 redbits,bluebits,greenbits;
128 psiconv_u8 marker; 133 psiconv_u8 byte;
129 int i,leng; 134 int leng,i;
130 psiconv_u32 bits_per_pixel,compression; 135 psiconv_u32 bits_per_pixel,compression;
131 int linepos = 0; 136 psiconv_pixel_bytes bytes,decoded;
137 psiconv_pixel_ints pixels;
138 psiconv_pixel_floats_t floats,palet;
132 139
133 psiconv_progress(config,lev+1,off,"Going to read a paint data section"); 140 psiconv_progress(config,lev+1,off,"Going to read a paint data section");
134 if (!((*result) = malloc(sizeof(**result)))) 141 if (!((*result) = malloc(sizeof(**result))))
135 goto ERROR1; 142 goto ERROR1;
136 143
144 if (!(bytes = psiconv_list_new(sizeof(psiconv_u8))))
145 goto ERROR2;
146
137 psiconv_progress(config,lev+2,off+len,"Going to read section size"); 147 psiconv_progress(config,lev+2,off+len,"Going to read section size");
138 size = psiconv_read_u32(config,buf,lev+2,off+len,&res); 148 size = psiconv_read_u32(config,buf,lev+2,off+len,&res);
139 if (res) 149 if (res)
140 goto ERROR2; 150 goto ERROR3;
141 psiconv_debug(config,lev+2,off+len,"Section size: %08x",size); 151 psiconv_debug(config,lev+2,off+len,"Section size: %08x",size);
142 len += 4; 152 len += 4;
143 153
144 psiconv_progress(config,lev+2,off+len,"Going to read pixel data offset"); 154 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); 155 offset = psiconv_read_u32(config,buf,lev+2,off+len,&res);
146 if (res) 156 if (res)
147 goto ERROR2; 157 goto ERROR3;
148 if (offset != 0x28) { 158 if (offset != 0x28) {
149 psiconv_warn(config,lev+2,off+len, 159 psiconv_error(config,lev+2,off+len,
150 "Paint data section data offset has unexpected value"); 160 "Paint data section data offset has unexpected value");
151 psiconv_debug(config,lev+2,off+len, 161 psiconv_debug(config,lev+2,off+len,
152 "Data offset: read %08x, expected %08x",offset,0x28); 162 "Data offset: read %08x, expected %08x",offset,0x28);
153 res = -1; 163 res = -1;
154 } 164 }
155 len += 4; 165 len += 4;
156 166
157 psiconv_progress(config,lev+2,off+len,"Going to read picture X size"); 167 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); 168 (*result)->xsize = psiconv_read_u32(config,buf,lev+2,off+len,&res);
159 if (res) 169 if (res)
160 goto ERROR2; 170 goto ERROR3;
161 psiconv_debug(config,lev+2,off+len,"Picture X size: %08x:",(*result)->xsize); 171 psiconv_debug(config,lev+2,off+len,"Picture X size: %08x:",(*result)->xsize);
162 len += 4; 172 len += 4;
163 173
164 psiconv_progress(config,lev+2,off+len,"Going to read picture Y size"); 174 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); 175 (*result)->ysize = psiconv_read_u32(config,buf,lev+2,off+len,&res);
166 if (res) 176 if (res)
167 goto ERROR2; 177 goto ERROR3;
168 psiconv_debug(config,lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize); 178 psiconv_debug(config,lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize);
169 len += 4; 179 len += 4;
170 180
171 picsize = (*result)->ysize * (*result)->xsize; 181 picsize = (*result)->ysize * (*result)->xsize;
172 182
173 psiconv_progress(config,lev+2,off+len,"Going to read the real picture x size"); 183 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); 184 (*result)->pic_xsize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
175 if (res) 185 if (res)
176 goto ERROR2; 186 goto ERROR3;
177 psiconv_debug(config,lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize); 187 psiconv_debug(config,lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize);
178 len += leng; 188 len += leng;
179 189
180 psiconv_progress(config,lev+2,off+len,"Going to read the real picture y size"); 190 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); 191 (*result)->pic_ysize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
182 if (res) 192 if (res)
183 goto ERROR2; 193 goto ERROR3;
184 psiconv_debug(config,lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize); 194 psiconv_debug(config,lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize);
185 len += leng; 195 len += leng;
186 196
187 psiconv_progress(config,lev+2,off+len,"Going to read the number of bits per pixel"); 197 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); 198 bits_per_pixel=psiconv_read_u32(config,buf,lev+2,off+len,&res);
189 if (res) 199 if (res)
190 goto ERROR2; 200 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); 201 psiconv_debug(config,lev+2,off+len,"Bits per pixel: %d",bits_per_pixel);
198 len += 4; 202 len += 4;
199 203
200 for (i = 0 ; i < 2; i++) { 204 psiconv_progress(config,lev+2,off+len,
205 "Going to read whether this is a colour or greyscale picture");
206 color = psiconv_read_u32(config,buf,lev+2,off+len,&res);
207 if (res)
208 goto ERROR3;
209 if ((color != 0) && (color != 1)) {
210 psiconv_warn(config,lev+2,off+len,
211 "Paint data section unknown color type (ignored)");
212 psiconv_debug(config,lev+2,off+len,
213 "Color: read %08x, expected %08x or %08x",color,0,1);
214 color = 1;
215 } else {
216 psiconv_debug(config,lev+2,off+len,"Color: %08x (%s picture)",
217 color,(color?"color":"greyscale"));
218 }
219 len += 4;
220
201 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); 221 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
202 if (res) 222 if (res)
203 goto ERROR2; 223 goto ERROR3;
204 if (temp != 00) { 224 if (temp != 00) {
205 psiconv_warn(config,lev+2,off+len, 225 psiconv_warn(config,lev+2,off+len,
206 "Paint data section prologue has unknown values (ignored)"); 226 "Paint data section prologue has unknown values (ignored)");
207 psiconv_debug(config,lev+2,off+len, 227 psiconv_debug(config,lev+2,off+len,
208 "offset %02x: read %08x, expected %08x",i,temp, 0x00); 228 "read %08x, expected %08x",temp, 0x00);
209 } 229 }
210 len += 4; 230 len += 4;
211 }
212 231
213 psiconv_progress(config,lev+2,off+len, 232 psiconv_progress(config,lev+2,off+len,
214 "Going to read whether RLE compression is used"); 233 "Going to read whether RLE compression is used");
215 compression=psiconv_read_u32(config,buf,lev+2,off+len,&res); 234 compression=psiconv_read_u32(config,buf,lev+2,off+len,&res);
216 if (res) 235 if (res)
217 goto ERROR2; 236 goto ERROR3;
218 if (compression > 1) { 237 if (compression > 4) {
219 psiconv_warn(config,lev+2,off+len,"Paint data section has unknown " 238 psiconv_warn(config,lev+2,off+len,"Paint data section has unknown "
220 "compression type, assuming RLE"); 239 "compression type, assuming RLE");
221 psiconv_debug(config,lev+2,off+len,"Read compression type %d",compression); 240 psiconv_debug(config,lev+2,off+len,"Read compression type %d",compression);
222 compression = 1; 241 compression = 0;
223 } 242 }
224 psiconv_debug(config,lev+2,off+len,"Compression: %s",compression?"RLE8":"none"); 243 psiconv_debug(config,lev+2,off+len,"Compression: %s",
244 compression == 4?"RLE24":compression == 3?"RLE16":
245 compression == 2?"RLE12":compression == 1?"RLE8":"none");
225 len += 4; 246 len += 4;
226 247
227 if (isclipart) { 248 if (isclipart) {
228 psiconv_progress(config,lev+2,off+len,"Going to read an unknown long"); 249 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); 250 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
230 if (res) 251 if (res)
231 goto ERROR2; 252 goto ERROR3;
232 if (temp != 0xffffffff) { 253 if (temp != 0xffffffff) {
233 psiconv_warn(config,lev+2,off+len, 254 psiconv_warn(config,lev+2,off+len,
234 "Paint data section prologue has unknown values (ignoring)"); 255 "Paint data section prologue has unknown values (ignoring)");
235 psiconv_debug(config,lev+2,off+len, 256 psiconv_debug(config,lev+2,off+len,
236 "offset %02x: read %08x, expected %08x",i,temp, 0xffffffff); 257 "Read %08x, expected %08x",temp, 0xffffffff);
237 } 258 }
238 len += 4; 259 len += 4;
239 psiconv_progress(config,lev+2,off+len,"Going to read a second unknown long"); 260 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); 261 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
241 if (res) 262 if (res)
242 goto ERROR2; 263 goto ERROR3;
243 if (temp != 0x44) { 264 if (temp != 0x44) {
244 psiconv_warn(config,lev+2,off+len, 265 psiconv_warn(config,lev+2,off+len,
245 "Paint data section prologue has unknown values (ignoring)"); 266 "Paint data section prologue has unknown values (ignoring)");
246 psiconv_debug(config,lev+2,off+len, 267 psiconv_debug(config,lev+2,off+len,
247 "offset %02x: read %08x, expected %08x",i,temp, 0x44); 268 "read %08x, expected %08x",temp, 0x44);
248 } 269 }
249 len += 4; 270 len += 4;
250 } 271 }
251 272
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; 273 len = offset;
259 datasize = size - len; 274 datasize = size - len;
260 if (isclipart) 275 if (isclipart)
261 len += 8; 276 len += 8;
262 277
278 if (color || (bits_per_pixel != 2))
279 psiconv_warn(config,lev+2,off+len,
280 "All image types except 2-bit greyscale are experimental!");
281
263 psiconv_progress(config,lev+2,off+len,"Going to read the pixel data"); 282 psiconv_progress(config,lev+2,off+len,"Going to read the pixel data");
264 pixelnr = 0; 283 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); 284 byte = psiconv_read_u8(config,buf,lev+2,off+len+i,&res);
285#ifdef LOUD
286 psiconv_debug(config,lev+2,off+len+i,
287 "Pixel byte %04x of %04x has value %02x",
288 i,datasize,byte);
289#endif
271 if (res) 290 if (res)
291 goto ERROR3;
292 psiconv_list_add(bytes,&byte);
293 }
294 len += datasize;
295
296 switch(compression) {
297 case 1:
298 if ((res = psiconv_decode_rle8(config,lev+2,off+len,bytes,&decoded)))
299 goto ERROR3;
300 psiconv_list_free(bytes);
301 bytes = decoded;
302 break;
303 case 2:
304 if ((psiconv_decode_rle12(config,lev+2,off+len,bytes,&decoded)))
305 goto ERROR3;
306 psiconv_list_free(bytes);
307 bytes = decoded;
308 break;
309 case 3:
310 if ((psiconv_decode_rle16(config,lev+2,off+len,bytes,&decoded)))
272 goto ERROR5; 311 goto ERROR3;
273 if (decode_byte(config,lev+3,off+len+datanr,*result,&pixelnr,temp,bits_per_pixel, 312 psiconv_list_free(bytes);
274 linelen,&linepos,picsize)) { 313 bytes = decoded;
275 res = -PSICONV_E_PARSE;
276 break; 314 break;
277 } 315 case 4:
278 datanr++; 316 if ((psiconv_decode_rle24(config,lev+2,off+len,bytes,&decoded)))
317 goto ERROR3;
318 psiconv_list_free(bytes);
319 bytes = decoded;
320 break;
321 }
322
323 if ((res = psiconv_bytes_to_pixel_data(config,lev+2,off+len,bytes,
324 &pixels,bits_per_pixel,
325 (*result)->xsize,(*result)->ysize)))
326 goto ERROR3;
327
328 /* Use some heuristics; things may get unexpected around here */
329 bluebits = redbits = greenbits = 0;
330 palet = psiconv_palet_none;
331 if (color) {
332 if (bits_per_pixel == 4)
333 palet = psiconv_palet_color_4;
334 else if (bits_per_pixel == 8)
335 palet = psiconv_palet_color_8;
336 else {
337 redbits = (bits_per_pixel+2) / 3;
338 greenbits = (bits_per_pixel+2) / 3;
339 bluebits = bits_per_pixel - redbits - greenbits;
279 } 340 }
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 } 341 }
296 linelen = i / (*result)->ysize; 342 if ((res = psiconv_pixel_data_to_floats(config,lev+2,off+len,pixels,
297 datanr=0; 343 &floats,bits_per_pixel,color,
298 psiconv_debug(config,lev+2,off+len,"Linelen: %04x bytes",linelen); 344 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; 345 goto ERROR4;
363 } 346
347 (*result)->red = floats.red;
348 (*result)->green = floats.green;
349 (*result)->blue = floats.blue;
364 350
365 len += datanr; 351 psiconv_list_free(bytes);
352 psiconv_list_free(pixels);
353
366 354
367 if (length) 355 if (length)
368 *length = len; 356 *length = len;
369 357
370 psiconv_progress(config,lev+1,off+len-1,"End of paint data section " 358 psiconv_progress(config,lev,off+len-1,
371 "(total length: %08x)", len); 359 "End of Paint Data Section (total length: %08x)", len);
372 360
373 return res; 361 return 0;
374 362
375ERROR5:
376 free((*result)->blue);
377ERROR4: 363ERROR4:
378 free((*result)->green); 364 psiconv_list_free(pixels);
379ERROR3: 365ERROR3:
380 free((*result)->red); 366 psiconv_list_free(bytes);
381ERROR2: 367ERROR2:
382 free (*result); 368 free(*result);
383ERROR1: 369ERROR1:
384 psiconv_warn(config,lev+1,off,"Reading of Paint Data Section failed"); 370 psiconv_error(config,lev+1,off,"Reading of Paint Data Section failed");
385 if (length) 371 if (length)
386 *length = 0; 372 *length = 0;
387 if (!res) 373 if (!res)
388 return -PSICONV_E_NOMEM; 374 return -PSICONV_E_NOMEM;
389 else 375 else
… …
544ERROR3: 530ERROR3:
545 psiconv_free_paint_data_section((*result)->picture); 531 psiconv_free_paint_data_section((*result)->picture);
546ERROR2: 532ERROR2:
547 free (*result); 533 free (*result);
548ERROR1: 534ERROR1:
549 psiconv_warn(config,lev+1,off,"Reading of Sketch Section failed"); 535 psiconv_error(config,lev+1,off,"Reading of Sketch Section failed");
550 if (length) 536 if (length)
551 *length = 0; 537 *length = 0;
552 if (!res) 538 if (!res)
553 return -PSICONV_E_NOMEM; 539 return -PSICONV_E_NOMEM;
554 else 540 else
… …
647 return 0; 633 return 0;
648 634
649ERROR2: 635ERROR2:
650 free (*result); 636 free (*result);
651ERROR1: 637ERROR1:
652 psiconv_warn(config,lev+1,off,"Reading of Font failed"); 638 psiconv_error(config,lev+1,off,"Reading of Font failed");
653 if (length) 639 if (length)
654 *length = 0; 640 *length = 0;
655 if (!res) 641 if (!res)
656 return -PSICONV_E_NOMEM; 642 return -PSICONV_E_NOMEM;
657 else 643 else
658 return res; 644 return res;
659} 645}
646
647int psiconv_decode_rle8 (const psiconv_config config, int lev, psiconv_u32 off,
648 const psiconv_pixel_bytes encoded,
649 psiconv_pixel_bytes *decoded)
650{
651 int res=0;
652 psiconv_u8 *marker,*value;
653 int i,j;
654
655 psiconv_progress(config,lev+1,off,"Going to decode the RLE8 encoding");
656 if (!(*decoded = psiconv_list_new(sizeof(psiconv_u8))))
657 goto ERROR1;
658
659 for (i = 0; i < psiconv_list_length(encoded);) {
660#ifdef LOUD
661 psiconv_progress(config,lev+2,off,"Going to read marker byte at %04x",i);
662#endif
663 if (!(marker = psiconv_list_get(encoded,i)))
664 goto ERROR2;
665#ifdef LOUD
666 psiconv_debug(config,lev+2,off,"Marker byte: %02x",*marker);
667#endif
668 if (*marker < 0x80) {
669#ifdef LOUD
670 psiconv_debug(config,lev+2,off,"Marker: repeat value byte %02x times",
671 *marker+1); */
672 psiconv_progress(config,lev+2,off,"Going to read value byte at %04x",i+1);
673#endif
674 if (!(value = psiconv_list_get(encoded,i+1)))
675 goto ERROR2;
676#ifdef LOUD
677 psiconv_debug(config,lev+2,off,"Value byte: %02x",*value);
678 psiconv_progress(config,lev+2,off,"Adding %02x pixels %02x",
679 *marker+1,*value);
680#endif
681 for (j = 0; j < *marker + 1; j++)
682 if ((res = psiconv_list_add(*decoded,value)))
683 goto ERROR2;
684 i += 2;
685 } else {
686#ifdef LOUD
687 psiconv_debug(config,lev+2,off,"Marker: %02x value bytes follow",
688 0x100 - *marker);
689#endif
690 for (j = 0; j < (0x100 - *marker); j++) {
691#ifdef LOUD
692 psiconv_progress(config,lev+2,off,"Going to read value byte at %04x",
693 i+j+1);
694#endif
695 if (!(value = psiconv_list_get(encoded,i+j+1)))
696 goto ERROR2;
697#ifdef LOUD
698 psiconv_debug(config,lev+2,off,"Value: %02x",*value);
699#endif
700 if ((res = psiconv_list_add(*decoded,value)))
701 goto ERROR2;
702 }
703 i += (0x100 - *marker) + 1;
704 }
705 }
706 psiconv_progress(config,lev,off,
707 "End of RLE8 decoding process");
708 return 0;
709
710ERROR2:
711 psiconv_list_free(*decoded);
712ERROR1:
713 psiconv_error(config,lev+1,off,"Decoding of RLE8 failed");
714 if (!res)
715 return -PSICONV_E_NOMEM;
716 else
717 return res;
718}
719
720int psiconv_decode_rle12 (const psiconv_config config, int lev, psiconv_u32 off,
721 const psiconv_pixel_bytes encoded,
722 psiconv_pixel_bytes *decoded)
723{
724 int res=0;
725 psiconv_u8 *value0,*value1;
726 psiconv_u32 value,repeat;
727 int i,j;
728
729 psiconv_progress(config,lev+1,off,"Going to decode the RLE12 encoding");
730 if (!(*decoded = psiconv_list_new(sizeof(psiconv_u8))))
731 goto ERROR1;
732
733 for (i = 0; i < psiconv_list_length(encoded);) {
734 psiconv_progress(config,lev+2,off,"Going to read data word at %04x",i);
735 if (!(value0 = psiconv_list_get(encoded,i)))
736 goto ERROR2;
737 if (!(value1 = psiconv_list_get(encoded,i+1)))
738 goto ERROR2;
739 psiconv_debug(config,lev+2,off,"Data Word: %04x",*value0 + (*value1 << 8));
740 value = *value0 + ((*value1 & 0x0f) << 8);
741 repeat = (*value1 >> 4) + 1;
742 psiconv_progress(config,lev+2,off,"Adding %02x pixels %03x",
743 repeat,value);
744 for (j = 0; j < repeat; j ++)
745 if ((res = psiconv_list_add(*decoded,&value)))
746 goto ERROR2;
747 i += 2;
748 }
749 psiconv_progress(config,lev,off,
750 "End of RLE12 decoding process");
751 return 0;
752
753ERROR2:
754 psiconv_list_free(*decoded);
755ERROR1:
756 psiconv_error(config,lev+1,off,"Decoding of RLE12 failed");
757 if (!res)
758 return -PSICONV_E_NOMEM;
759 else
760 return res;
761}
762
763int psiconv_decode_rle16 (const psiconv_config config, int lev, psiconv_u32 off,
764 const psiconv_pixel_bytes encoded,
765 psiconv_pixel_bytes *decoded)
766{
767 int res=0;
768 psiconv_u8 *marker,*value0,*value1;
769 psiconv_u32 value;
770 int i,j;
771
772 psiconv_progress(config,lev+1,off,"Going to decode the RLE16 encoding");
773 if (!(*decoded = psiconv_list_new(sizeof(psiconv_u8))))
774 goto ERROR1;
775
776 for (i = 0; i < psiconv_list_length(encoded);) {
777 psiconv_progress(config,lev+2,off,"Going to read marker byte at %04x",i);
778 if (!(marker = psiconv_list_get(encoded,i)))
779 goto ERROR2;
780 psiconv_debug(config,lev+2,off,"Marker byte: %02x",*marker);
781 if (*marker < 0x80) {
782 psiconv_debug(config,lev+2,off,"Marker: repeat value word %02x times",
783 *marker+1);
784 psiconv_progress(config,lev+2,off,"Going to read value word at %04x",i+1);
785 if (!(value0 = psiconv_list_get(encoded,i+1)))
786 goto ERROR2;
787 if (!(value1 = psiconv_list_get(encoded,i+2)))
788 goto ERROR2;
789 value = *value0 + (*value1 << 8);
790 psiconv_debug(config,lev+2,off,"Value word: %02x",value);
791 psiconv_progress(config,lev+2,off,"Adding %02x pixels %04x",
792 *marker+1,value);
793 for (j = 0; j < *marker + 1; j++)
794 if ((res = psiconv_list_add(*decoded,&value)))
795 goto ERROR2;
796 i += 3;
797 } else {
798 psiconv_debug(config,lev+2,off,"Marker: %02x value words follow",
799 0x100 - *marker);
800 for (j = 0; j < (0x100 - *marker); j++) {
801 psiconv_progress(config,lev+2,off,"Going to read value word at %04x",
802 i+j*2+1);
803 if (!(value0 = psiconv_list_get(encoded,i+j*2+1)))
804 goto ERROR2;
805 if (!(value1 = psiconv_list_get(encoded,i+j*2+2)))
806 goto ERROR2;
807 value = *value0 + (*value1 << 8);
808 psiconv_debug(config,lev+2,off,"Value: %04x",value);
809 if ((res = psiconv_list_add(*decoded,&value)))
810 goto ERROR2;
811 }
812 i += (0x100 - *marker)*2 + 1;
813 }
814 }
815 psiconv_progress(config,lev,off,
816 "End of RLE16 decoding process");
817 return 0;
818
819ERROR2:
820 psiconv_list_free(*decoded);
821ERROR1:
822 psiconv_error(config,lev+1,off,"Decoding of RLE16 failed");
823 if (!res)
824 return -PSICONV_E_NOMEM;
825 else
826 return res;
827}
828
829int psiconv_decode_rle24 (const psiconv_config config, int lev, psiconv_u32 off,
830 const psiconv_pixel_bytes encoded,
831 psiconv_pixel_bytes *decoded)
832{
833 int res=0;
834 psiconv_u8 *marker,*value0,*value1,*value2;
835 psiconv_u32 value;
836 int i,j;
837
838 psiconv_progress(config,lev+1,off,"Going to decode the RLE24 encoding");
839 if (!(*decoded = psiconv_list_new(sizeof(psiconv_u8))))
840 goto ERROR1;
841
842 for (i = 0; i < psiconv_list_length(encoded);) {
843 psiconv_progress(config,lev+2,off,"Going to read marker byte at %04x",i);
844 if (!(marker = psiconv_list_get(encoded,i)))
845 goto ERROR2;
846 psiconv_debug(config,lev+2,off,"Marker byte: %02x",*marker);
847 if (*marker < 0x80) {
848 psiconv_debug(config,lev+2,off,"Marker: repeat value byte triplet %02x times",
849 *marker+1);
850 psiconv_progress(config,lev+2,off,"Going to read value byte triplet at %04x",i+1);
851 if (!(value0 = psiconv_list_get(encoded,i+1)))
852 goto ERROR2;
853 if (!(value1 = psiconv_list_get(encoded,i+2)))
854 goto ERROR2;
855 if (!(value2 = psiconv_list_get(encoded,i+3)))
856 goto ERROR2;
857 value = *value0 + (*value1 << 8) + (*value2 << 16);
858 psiconv_debug(config,lev+2,off,"Value byte triplet: %06x",value);
859 psiconv_progress(config,lev+2,off,"Adding %02x pixels %06x",
860 *marker+1,value);
861 for (j = 0; j < *marker + 1; j++)
862 if ((res = psiconv_list_add(*decoded,&value)))
863 goto ERROR2;
864 i += 4;
865 } else {
866 psiconv_debug(config,lev+2,off,"Marker: %02x value byte triplets follow",
867 0x100 - *marker);
868 for (j = 0; j < (0x100 - *marker); j++) {
869 psiconv_progress(config,lev+2,off,"Going to read value byte triplets at %04x",
870 i+j*3+1);
871 if (!(value0 = psiconv_list_get(encoded,i+j*3+1)))
872 goto ERROR2;
873 if (!(value1 = psiconv_list_get(encoded,i+j*3+2)))
874 goto ERROR2;
875 if (!(value2 = psiconv_list_get(encoded,i+j*3+3)))
876 goto ERROR2;
877 value = *value0 + (*value1 << 8) + (*value2 << 16);
878 psiconv_debug(config,lev+2,off,"Value: %06x",value);
879 if ((res = psiconv_list_add(*decoded,&value)))
880 goto ERROR2;
881 }
882 i += (0x100 - *marker)*3 + 1;
883 }
884 }
885 psiconv_progress(config,lev,off,
886 "End of RLE24 decoding process");
887 return 0;
888
889ERROR2:
890 psiconv_list_free(*decoded);
891ERROR1:
892 psiconv_error(config,lev+1,off,"Decoding of RLE24 failed");
893 if (!res)
894 return -PSICONV_E_NOMEM;
895 else
896 return res;
897}
898
899int psiconv_bytes_to_pixel_data(const psiconv_config config,
900 int lev, psiconv_u32 off,
901 const psiconv_pixel_bytes bytes,
902 psiconv_pixel_ints *pixels,
903 int colordepth, int xsize, int ysize)
904{
905 int res=0;
906 int ibits,obits,x,y,bits;
907 psiconv_u8 input;
908 psiconv_u32 nr,output;
909 psiconv_u8 *ientry;
910
911 psiconv_progress(config,lev+1,off,"Going to convert the bytes to pixels");
912 if (!(*pixels = psiconv_list_new(sizeof(psiconv_u32))))
913 goto ERROR1;
914
915 nr = 0;
916 for (y = 0; y < ysize; y++) {
917 /* New lines will start at longs */
918 while (nr % 4)
919 nr ++;
920 input = 0;
921 ibits = 0;
922 for (x= 0; x < xsize; x++) {
923#ifdef LOUD
924 psiconv_progress(config,lev+2,off,
925 "Processing pixel at (x,y) = (%04x,%04x)",x,y);
926#endif
927 output = 0;
928 obits = 0;
929 while (obits < colordepth) {
930 if (ibits == 0) {
931#ifdef LOUD
932 psiconv_progress(config,lev+3,off,
933 "Going to read byte %08x",nr);
934#endif
935 if (!(ientry = psiconv_list_get(bytes,nr)))
936 goto ERROR2;
937#ifdef LOUD
938 psiconv_debug(config,lev+3,off,"Byte value: %02x",*ientry);
939#endif
940 input = *ientry;
941 ibits = 8;
942 nr ++;
943 }
944 bits = ibits + obits > colordepth?colordepth-obits:ibits;
945 output = output << bits;
946 output |= input & ((1 << bits) - 1);
947 input = input >> bits;
948 ibits -= bits;
949 obits += bits;
950 }
951#ifdef LOUD
952 psiconv_debug(config,lev+2,off,"Pixel value: %08x",output);
953#endif
954 if ((res = psiconv_list_add(*pixels,&output)))
955 goto ERROR2;
956 }
957 }
958
959 psiconv_progress(config,lev,off,
960 "Converting bytes to pixels completed");
961 return 0;
962
963
964ERROR2:
965 psiconv_list_free(*pixels);
966ERROR1:
967 psiconv_error(config,lev+1,off,"Converting bytes to pixels failed");
968 if (!res)
969 return -PSICONV_E_NOMEM;
970 else
971 return res;
972}
973
974int psiconv_pixel_data_to_floats (const psiconv_config config, int lev,
975 psiconv_u32 off,
976 const psiconv_pixel_ints pixels,
977 psiconv_pixel_floats_t *floats,
978 int colordepth, int color,
979 int redbits, int bluebits, int greenbits,
980 const psiconv_pixel_floats_t palet)
981{
982 int res = 0;
983 psiconv_u32 i;
984 psiconv_u32 *pixel;
985
986 psiconv_progress(config,lev+1,off,"Going to convert pixels to floats");
987 if (!((*floats).red = malloc(psiconv_list_length(pixels) *
988 sizeof(*(*floats).red))))
989 goto ERROR1;
990 if (!((*floats).green = malloc(psiconv_list_length(pixels) *
991 sizeof(*(*floats).green))))
992 goto ERROR2;
993 if (!((*floats).blue = malloc(psiconv_list_length(pixels) *
994 sizeof(*(*floats).blue))))
995 goto ERROR3;
996 (*floats).length = psiconv_list_length(pixels);
997
998 for (i = 0; i < psiconv_list_length(pixels); i++) {
999 if (!(pixel = psiconv_list_get(pixels,i)))
1000 goto ERROR4;
1001#ifdef LOUD
1002 psiconv_progress(config,lev+2,off, "Handling pixel %04x (%04x)",i,*pixel);
1003#endif
1004 if (!palet.length) {
1005 if (color) {
1006 (*floats).blue[i] = ((float) (*pixel & ((1 << bluebits) - 1))) /
1007 (1 << bluebits);
1008 (*floats).green[i] = ((float) ((*pixel >> bluebits) &
1009 ((1 << greenbits) - 1))) / (1 << greenbits);
1010 (*floats).red[i] = ((float) ((*pixel >> (bluebits+greenbits)) &
1011 ((1 << redbits) - 1))) / (1 << redbits);
1012 } else {
1013 (*floats).red[i] = (*floats).green[i] =
1014 (*floats).blue[i] = ((float) *pixel) /
1015 (1 << colordepth);
1016 }
1017 } else {
1018 if (*pixel >= palet.length) {
1019 psiconv_warn(config,lev+2,off,
1020 "Invalid palet color found (using color 0x00)");
1021 (*floats).red[i] = palet.red[0];
1022 (*floats).green[i] = palet.green[0];
1023 (*floats).blue[i] = palet.blue[0];
1024 } else {
1025 (*floats).red[i] = palet.red[*pixel];
1026 (*floats).green[i] = palet.green[*pixel];
1027 (*floats).blue[i] = palet.blue[*pixel];
1028 }
1029 }
1030#ifdef LOUD
1031 psiconv_debug(config,lev+2,off, "Pixel: Red (%f), green (%f), blue (%f)",
1032 (*floats).red[i],(*floats).green[i],(*floats).blue[i]);
1033#endif
1034 }
1035 psiconv_progress(config,lev+1,off,"Finished converting pixels to floats");
1036 return 0;
1037
1038ERROR4:
1039 free((*floats).blue);
1040ERROR3:
1041 free((*floats).green);
1042ERROR2:
1043 free((*floats).red);
1044ERROR1:
1045 psiconv_error(config,lev+1,off,"Converting pixels to floats failed");
1046 if (!res)
1047 return -PSICONV_E_NOMEM;
1048 else
1049 return res;
1050}
1051
1052
1053
Legend:
Removed from v.175  
changed lines
  Added in v.230
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26