/[public]/psiconv/trunk/lib/psiconv/parse_image.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/parse_image.c

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

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