/[public]/psiconv/tags/rel-0-9-9/lib/psiconv/parse_image.c
ViewVC logotype

Diff of /psiconv/tags/rel-0-9-9/lib/psiconv/parse_image.c

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

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