/[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 45 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_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_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 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 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
60static int decode_byte(int lev, psiconv_u32 off, 106static int decode_byte(const psiconv_config config, int lev, psiconv_u32 off,
61 psiconv_paint_data_section data, int *pixelnr, 107 psiconv_paint_data_section data, psiconv_u32 *pixelnr,
62 psiconv_u8 byte, int bits_per_pixel, int linelen, 108 psiconv_u8 byte, int bits_per_pixel, int linelen,
63 int *linepos,int picsize) 109 int *linepos,int picsize)
64{ 110{
65 int mask = (bits_per_pixel << 1) -1; 111 int mask = (bits_per_pixel << 1) -1;
66 int i; 112 int i;
67 if (*linepos < (data->xsize + (8/bits_per_pixel) - 1) / (8/bits_per_pixel)) 113 if (*linepos < (data->xsize + (8/bits_per_pixel) - 1) / (8/bits_per_pixel))
68 for (i = 0; i < 8/bits_per_pixel; i ++) { 114 for (i = 0; i < 8/bits_per_pixel; i ++) {
69 if ((i != 0) && ((*pixelnr % (data->xsize)) == 0)) { 115 if ((i != 0) && ((*pixelnr % (data->xsize)) == 0)) {
70 psiconv_debug(lev+1,off,"Skipping padding: %02x",byte); 116 psiconv_debug(config,lev+1,off,"Skipping padding: %02x",byte);
71 i = 8; 117 i = 8;
72 } else if (*pixelnr >= picsize) { 118 } else if (*pixelnr >= picsize) {
73 psiconv_warn(lev+1,off,"Corrupted picture data!"); 119 psiconv_warn(config,lev+1,off,"Corrupted picture data!");
74 psiconv_debug(lev+1,off,"Trying to write a pixel too far"); 120 psiconv_debug(config,lev+1,off,"Trying to write a pixel too far");
75 return -1; 121 return -1;
76 } else { 122 } else {
77 data->red[*pixelnr] = data->green[*pixelnr] = data->blue[*pixelnr] = 123 data->red[*pixelnr] = data->green[*pixelnr] = data->blue[*pixelnr] =
78 ((float) (byte & mask)) / ((1 << bits_per_pixel) -1); 124 ((float) (byte & mask)) / ((1 << bits_per_pixel) -1);
79 psiconv_debug(lev+1,off,"Pixel %04x: (%04x,%04x) value %02x, color %f", 125 psiconv_debug(config,lev+1,off,"Pixel %04x: (%04x,%04x) value %02x, color %f",
126 *pixelnr,*pixelnr % data->xsize,
80 *pixelnr,*pixelnr % data->xsize,*pixelnr / data->xsize, byte&mask, data->red[*pixelnr]); 127 *pixelnr / data->xsize, byte&mask, data->red[*pixelnr]);
81 byte = byte >> bits_per_pixel; 128 byte = byte >> bits_per_pixel;
82 (*pixelnr) ++; 129 (*pixelnr) ++;
83 } 130 }
84 } 131 }
85 else 132 else
86 psiconv_debug(lev+1,off,"Skipping padding byte"); 133 psiconv_debug(config,lev+1,off,"Skipping padding byte");
87 (*linepos) ++; 134 (*linepos) ++;
88 if (*linepos == linelen) 135 if (*linepos == linelen)
89 *linepos = 0; 136 *linepos = 0;
90 return 0; 137 return 0;
91} 138}
92 139
93 140
94int 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,
95 psiconv_u32 off, int *length,int isclipart, 143 psiconv_u32 off, int *length,int isclipart,
96 psiconv_paint_data_section *result) 144 psiconv_paint_data_section *result)
97{ 145{
98 int res = 0; 146 int res = 0;
99 int len = 0; 147 int len = 0;
100 int read_err = 0;
101 psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen; 148 psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen;
102 psiconv_u8 marker; 149 psiconv_u8 marker;
103 int i,leng; 150 int i,leng;
104 psiconv_u32 bits_per_pixel,compression; 151 psiconv_u32 bits_per_pixel,compression;
105 int linepos = 0; 152 int linepos = 0;
106 153
107 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");
108 (*result) = malloc(sizeof(**result)); 155 if (!((*result) = malloc(sizeof(**result))))
156 goto ERROR1;
109 157
110 psiconv_progress(lev+2,off+len,"Going to read section size"); 158 psiconv_progress(config,lev+2,off+len,"Going to read section size");
111 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;
112 psiconv_debug(lev+2,off+len,"Section size: %08x",size); 162 psiconv_debug(config,lev+2,off+len,"Section size: %08x",size);
113 len += 4; 163 len += 4;
114 164
115 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");
116 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;
117 if (offset != 0x28) { 169 if (offset != 0x28) {
118 psiconv_warn(lev+2,off+len, 170 psiconv_warn(config,lev+2,off+len,
119 "Paint data section data offset has unexpected value"); 171 "Paint data section data offset has unexpected value");
120 psiconv_debug(lev+2,off+len, 172 psiconv_debug(config,lev+2,off+len,
121 "Data offset: read %08x, expected %08x",offset,0x28); 173 "Data offset: read %08x, expected %08x",offset,0x28);
122 res = -1; 174 res = -1;
123 } 175 }
124 len += 4; 176 len += 4;
125 177
126 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");
127 (*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;
128 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);
129 len += 4; 183 len += 4;
130 184
131 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");
132 (*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;
133 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);
134 len += 4; 190 len += 4;
135 191
136 picsize = (*result)->ysize * (*result)->xsize; 192 picsize = (*result)->ysize * (*result)->xsize;
137 193
138 psiconv_progress(lev+2,off+len,"Going to read the real picture x size"); 194 psiconv_progress(config,lev+2,off+len,"Going to read the real picture x size");
139 (*result)->pic_xsize = psiconv_read_length(buf,lev+2,off+len,&leng); 195 (*result)->pic_xsize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
196 if (res)
197 goto ERROR2;
140 psiconv_debug(lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize); 198 psiconv_debug(config,lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize);
141 len += leng; 199 len += leng;
142 200
143 psiconv_progress(lev+2,off+len,"Going to read the real picture y size"); 201 psiconv_progress(config,lev+2,off+len,"Going to read the real picture y size");
144 (*result)->pic_ysize = psiconv_read_length(buf,lev+2,off+len,&leng); 202 (*result)->pic_ysize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
203 if (res)
204 goto ERROR2;
145 psiconv_debug(lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize); 205 psiconv_debug(config,lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize);
146 len += leng; 206 len += leng;
147 207
148 psiconv_progress(lev+2,off+len,"Going to read the number of bits per pixel"); 208 psiconv_progress(config,lev+2,off+len,"Going to read the number of bits per pixel");
149 bits_per_pixel=psiconv_read_u32(buf,lev+2,off+len); 209 bits_per_pixel=psiconv_read_u32(config,buf,lev+2,off+len,&res);
210 if (res)
211 goto ERROR2;
150 if (bits_per_pixel > 8) { 212 if (bits_per_pixel > 8) {
151 psiconv_warn(lev+2,off+len,"Picture has too many colors"); 213 psiconv_warn(config,lev+2,off+len,"Picture has too many colors");
152 psiconv_debug(lev+2,off+len,"Read %d colorbits",bits_per_pixel); 214 psiconv_debug(config,lev+2,off+len,"Read %d colorbits",bits_per_pixel);
153 res = -1; 215 res = -PSICONV_E_PARSE;
154 bits_per_pixel = 2; 216 goto ERROR2;
155 } 217 }
156 psiconv_debug(lev+2,off+len,"Bits per pixel: %d",bits_per_pixel); 218 psiconv_debug(config,lev+2,off+len,"Bits per pixel: %d",bits_per_pixel);
157 len += 4; 219 len += 4;
158 220
159 for (i = 0 ; i < 2; i++) { 221 for (i = 0 ; i < 2; i++) {
160 temp = psiconv_read_u32(buf,lev+2,off+len); 222 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
223 if (res)
224 goto ERROR2;
161 if (temp != 00) { 225 if (temp != 00) {
162 psiconv_warn(lev+2,off+len, 226 psiconv_warn(config,lev+2,off+len,
163 "Paint data section prologue has unknown values"); 227 "Paint data section prologue has unknown values (ignored)");
164 psiconv_debug(lev+2,off+len, 228 psiconv_debug(config,lev+2,off+len,
165 "offset %02x: read %08x, expected %08x",i,temp, 0x00); 229 "offset %02x: read %08x, expected %08x",i,temp, 0x00);
166 res = -1;
167 } 230 }
168 len += 4; 231 len += 4;
169 } 232 }
170 233
171 psiconv_progress(lev+2,off+len, 234 psiconv_progress(config,lev+2,off+len,
172 "Going to read whether RLE compression is used"); 235 "Going to read whether RLE compression is used");
173 compression=psiconv_read_u32(buf,lev+2,off+len); 236 compression=psiconv_read_u32(config,buf,lev+2,off+len,&res);
237 if (res)
238 goto ERROR2;
174 if (compression > 1) { 239 if (compression > 1) {
175 psiconv_warn(lev+2,off+len,"Paint data section has unknown " 240 psiconv_warn(config,lev+2,off+len,"Paint data section has unknown "
176 "compression type, assuming RLE"); 241 "compression type, assuming RLE");
177 psiconv_debug(lev+2,off+len,"Read compression type %d",compression); 242 psiconv_debug(config,lev+2,off+len,"Read compression type %d",compression);
178 compression = 1; 243 compression = 1;
179 } 244 }
180 psiconv_debug(lev+2,off+len,"Compression: %s",compression?"RLE":"none"); 245 psiconv_debug(config,lev+2,off+len,"Compression: %s",compression?"RLE8":"none");
181 len += 4; 246 len += 4;
182 247
183 if (isclipart) { 248 if (isclipart) {
184 psiconv_progress(lev+2,off+len,"Going to read an unknown long"); 249 psiconv_progress(config,lev+2,off+len,"Going to read an unknown long");
185 temp = psiconv_read_u32(buf,lev+2,off+len); 250 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
251 if (res)
252 goto ERROR2;
186 if (temp != 0xffffffff) { 253 if (temp != 0xffffffff) {
187 psiconv_warn(lev+2,off+len, 254 psiconv_warn(config,lev+2,off+len,
188 "Paint data section prologue has unknown values"); 255 "Paint data section prologue has unknown values (ignoring)");
189 psiconv_debug(lev+2,off+len, 256 psiconv_debug(config,lev+2,off+len,
190 "offset %02x: read %08x, expected %08x",i,temp, 0xffffffff); 257 "offset %02x: read %08x, expected %08x",i,temp, 0xffffffff);
191 res = -1;
192 } 258 }
193 len += 4; 259 len += 4;
194 psiconv_progress(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");
195 temp = psiconv_read_u32(buf,lev+2,off+len); 261 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
262 if (res)
263 goto ERROR2;
196 if (temp != 0x44) { 264 if (temp != 0x44) {
197 psiconv_warn(lev+2,off+len, 265 psiconv_warn(config,lev+2,off+len,
198 "Paint data section prologue has unknown values"); 266 "Paint data section prologue has unknown values (ignoring)");
199 psiconv_debug(lev+2,off+len, 267 psiconv_debug(config,lev+2,off+len,
200 "offset %02x: read %08x, expected %08x",i,temp, 0x44); 268 "offset %02x: read %08x, expected %08x",i,temp, 0x44);
201 res = -1;
202 } 269 }
203 len += 4; 270 len += 4;
204 } 271 }
205 272
206 (*result)->red = malloc(sizeof(float) * picsize); 273 if (!((*result)->red = malloc(sizeof(float) * picsize)))
274 goto ERROR2;
207 (*result)->green = malloc(sizeof(float) * picsize); 275 if (!((*result)->green = malloc(sizeof(float) * picsize)))
276 goto ERROR3;
208 (*result)->blue = malloc(sizeof(float) * picsize); 277 if (!((*result)->blue = malloc(sizeof(float) * picsize)))
278 goto ERROR4;
209 len = offset; 279 len = offset;
210 datasize = size - len; 280 datasize = size - len;
211 if (isclipart) 281 if (isclipart)
212 len += 8; 282 len += 8;
213 283
214 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");
215 pixelnr = 0; 285 pixelnr = 0;
216 datanr = 0; 286 datanr = 0;
217 if (!compression) { 287 if (!compression) {
218 linelen = datasize / (*result)->ysize; 288 linelen = datasize / (*result)->ysize;
219 psiconv_debug(lev+3,off+len,"Line length: %04x bytes",linelen); 289 psiconv_debug(config,lev+3,off+len,"Line length: %04x bytes",linelen);
220 while((datanr < datasize)) { 290 while((datanr < datasize)) {
221 temp = psiconv_read_u8(buf,lev+2,off+len+datanr); 291 temp = psiconv_read_u8(config,buf,lev+2,off+len+datanr,&res);
292 if (res)
293 goto ERROR5;
222 if (decode_byte(lev+3,off+len+datanr,*result,&pixelnr,temp,bits_per_pixel, 294 if (decode_byte(config,lev+3,off+len+datanr,*result,&pixelnr,temp,bits_per_pixel,
223 linelen,&linepos,picsize)) { 295 linelen,&linepos,picsize)) {
224 read_err = 1; 296 res = -PSICONV_E_PARSE;
225 res = -1;
226 break; 297 break;
227 } 298 }
228 datanr++; 299 datanr++;
229 } 300 }
230 } else { 301 } else {
231 psiconv_progress(lev+2,off+len,"First pass: determining line length"); 302 psiconv_progress(config,lev+2,off+len,"First pass: determining line length");
232 datanr = 0; 303 datanr = 0;
233 i = 0; 304 i = 0;
234 while (datanr < datasize) { 305 while (datanr < datasize) {
235 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;
236 if (marker >= 0x80) { 309 if (marker >= 0x80) {
237 datanr += 0x100 - marker + 1; 310 datanr += 0x100 - marker + 1;
238 i += 0x100 - marker; 311 i += 0x100 - marker;
239 } else { 312 } else {
240 datanr += 2; 313 datanr += 2;
241 i += marker + 1; 314 i += marker + 1;
242 } 315 }
243 } 316 }
244 linelen = i / (*result)->ysize; 317 linelen = i / (*result)->ysize;
245 datanr=0; 318 datanr=0;
246 psiconv_debug(lev+2,off+len,"Linelen: %04x bytes",linelen); 319 psiconv_debug(config,lev+2,off+len,"Linelen: %04x bytes",linelen);
247 while((datanr < datasize)) { 320 while((datanr < datasize)) {
248 marker = psiconv_read_u8(buf,lev+3,off+len+datanr); 321 marker = psiconv_read_u8(config,buf,lev+3,off+len+datanr,&res);
322 if (res)
323 goto ERROR5;
249 psiconv_debug(lev+3,off+len+datanr, 324 psiconv_debug(config,lev+3,off+len+datanr,
250 "Pixelnr %08x, Datanr %08x: Read marker %02x", 325 "Pixelnr %08x, Datanr %08x: Read marker %02x",
251 pixelnr,datanr,marker); 326 pixelnr,datanr,marker);
252 datanr ++; 327 datanr ++;
253 if (marker >= 0x80) { 328 if (marker >= 0x80) {
254 /* 0x100 - marker bytes of data follow */ 329 /* 0x100 - marker bytes of data follow */
255 for (i = 0; i < 0x100-marker; i++,datanr++) { 330 for (i = 0; i < 0x100-marker; i++,datanr++) {
256 if (datanr >= datasize) { 331 if (datanr >= datasize) {
257 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); 332 psiconv_warn(config,lev+3,off+len+datanr,"Corrupted picture data");
258 psiconv_debug(lev+3,off+len+datanr, 333 psiconv_debug(config,lev+3,off+len+datanr,
259 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," 334 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
260 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, 335 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
261 datanr,marker); 336 datanr,marker);
262 read_err = 1; 337 res = -PSICONV_E_PARSE;
263 res = -1;
264 break; 338 break;
265 } 339 }
266 temp = psiconv_read_u8(buf,lev+2,off+len+datanr); 340 temp = psiconv_read_u8(config,buf,lev+2,off+len+datanr,&res);
341 if (res)
342 goto ERROR5;
267 if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp, 343 if (decode_byte(config,lev+2,off+len+datanr,*result,&pixelnr,temp,
268 bits_per_pixel,linelen,&linepos,picsize)) { 344 bits_per_pixel,linelen,&linepos,picsize)) {
269 res = -1; 345 res = -PSICONV_E_PARSE;
270 read_err = 1;
271 break; 346 break;
272 } 347 }
273 } 348 }
274 } else { 349 } else {
275 if (datanr >= datasize) { 350 if (datanr >= datasize) {
276 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); 351 psiconv_warn(config,lev+3,off+len+datanr,"Corrupted picture data");
277 psiconv_debug(lev+3,off+len+datanr, 352 psiconv_debug(config,lev+3,off+len+datanr,
278 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," 353 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
279 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, 354 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
280 datanr,marker); 355 datanr,marker);
281 read_err = 1; 356 res = -PSICONV_E_PARSE;
282 res = -1;
283 } else { 357 } else {
284 temp = psiconv_read_u8(buf,lev+3,off+len+datanr); 358 temp = psiconv_read_u8(config,buf,lev+3,off+len+datanr,&res);
359 if (res)
360 goto ERROR5;
285 for (i = 0; i <= marker; i++) { 361 for (i = 0; i <= marker; i++) {
286 if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp, 362 if (decode_byte(config,lev+2,off+len+datanr,*result,&pixelnr,temp,
287 bits_per_pixel,linelen,&linepos,picsize)) { 363 bits_per_pixel,linelen,&linepos,picsize)) {
288 read_err = 1; 364 res = -PSICONV_E_PARSE;
289 res = -1;
290 break; 365 break;
291 } 366 }
292 } 367 }
293 datanr ++; 368 datanr ++;
294 } 369 }
… …
298 373
299 if (linepos >= ((*result)->xsize + (8/bits_per_pixel) - 1) / 374 if (linepos >= ((*result)->xsize + (8/bits_per_pixel) - 1) /
300 (8/bits_per_pixel)) 375 (8/bits_per_pixel))
301 datanr += (linelen - linepos); 376 datanr += (linelen - linepos);
302 377
303 if (!read_err && ((datanr != datasize) || (pixelnr != picsize))) { 378 if (res || (datanr != datasize) || (pixelnr != picsize)) {
304 psiconv_warn(lev+2,off+len,"Corrupted picture data!"); 379 psiconv_warn(config,lev+2,off+len,"Corrupted picture data!");
305 psiconv_debug(lev+3,off+len+datanr, 380 psiconv_debug(config,lev+3,off+len+datanr,
306 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," 381 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
307 "Datanr: %08x",picsize,datasize,pixelnr,datanr); 382 "Datanr: %08x",picsize,datasize,pixelnr,datanr);
308 res = -1; 383 goto ERROR5;
309 } 384 }
310 385
311 len += datanr; 386 len += datanr;
312 387
313 if (length) 388 if (length)
314 *length = len; 389 *length = len;
315 390
316 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 "
317 "(total length: %08x)", len); 392 "(total length: %08x)", len);
318 393
319 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;
320} 412}
321 413
322int 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,
323 psiconv_u32 off, int *length, int is_object, 416 psiconv_u32 off, int *length,
324 psiconv_sketch_section *result) 417 psiconv_sketch_section *result)
325{ 418{
326 int res=0; 419 int res=0;
327 int len=0; 420 int len=0;
328 psiconv_u32 temp; 421 psiconv_u32 temp;
329 int leng; 422 int leng;
330 int i;
331 423
332 psiconv_progress(lev+1,off,"Going to read the sketch section"); 424 psiconv_progress(config,lev+1,off,"Going to read the sketch section");
333 *result = malloc(sizeof(**result)); 425 if (!(*result = malloc(sizeof(**result))))
426 goto ERROR1;
334 427
335 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
336 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");
337 (*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;
338 psiconv_debug(lev+2,off+len,"Form hor. size: %04x", 481 psiconv_debug(config,lev+2,off+len,"Form hor. size: %04x",
339 (*result)->form_xsize); 482 (*result)->form_xsize);
340 len += 0x02; 483 len += 0x02;
341 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");
342 (*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;
343 psiconv_debug(lev+2,off+len,"Form ver. size: %04x", 488 psiconv_debug(config,lev+2,off+len,"Form ver. size: %04x",
344 (*result)->form_ysize); 489 (*result)->form_ysize);
345 len += 0x02; 490 len += 0x02;
346 psiconv_progress(lev+2,off+len,"Going to read the picture hor. offset"); 491
347 (*result)->picture_x_offset = psiconv_read_u16(buf,lev+2,off + len);
348 psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x",
349 (*result)->picture_x_offset);
350 len += 0x02;
351 psiconv_progress(lev+2,off+len,"Going to read the picture ver. offset");
352 (*result)->picture_y_offset = psiconv_read_u16(buf,lev+2,off + len);
353 psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x",
354 (*result)->picture_y_offset);
355 len += 0x02;
356 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");
357 for (i = 0; i < 5; i++) {
358 temp = psiconv_read_u16(buf,lev+2,off+len);
359 if (temp != 0) {
360 psiconv_warn(lev+2,off+len,
361 "Unexpected value in sketch section preamble");
362 psiconv_debug(lev+2,off+len,"Word %d: Read %04x, expected %04x",i,
363 temp,0);
364 res = -1;
365 }
366 off += 0x02;
367 }
368 } else {
369 psiconv_progress(lev+2,off+len,"Going to read the displayed hor. size");
370 (*result)->picture_xsize = psiconv_read_u16(buf,lev+2,off + len);
371 psiconv_debug(lev+2,off+len,"Displayed hor. size: %04x",
372 (*result)->picture_xsize);
373 len += 0x02;
374 psiconv_progress(lev+2,off+len,"Going to read the displayed ver. size");
375 (*result)->picture_ysize = psiconv_read_u16(buf,lev+2,off + len);
376 psiconv_debug(lev+2,off+len,"Displayed ver. size: %04x",
377 (*result)->picture_ysize);
378 len += 0x02;
379
380 psiconv_progress(lev+2,off+len,"Going to skip 2 words of zeros");
381 for (i = 0; i < 2; i++) {
382 temp = psiconv_read_u16(buf,lev+2,off+len);
383 if (temp != 0) {
384 psiconv_warn(lev+2,off+len,
385 "Unexpected value in sketch section preamble");
386 psiconv_debug(lev+2,off+len,"Word %d: Read %04x, expected %04x",i,
387 temp,0);
388 res = -1;
389 }
390 off += 0x02;
391 }
392 psiconv_progress(lev+2,off+len,"Going to read the picture hor. offset");
393 (*result)->picture_x_offset = psiconv_read_u16(buf,lev+2,off + len);
394 psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x",
395 (*result)->picture_x_offset);
396 len += 0x02;
397 psiconv_progress(lev+2,off+len,"Going to read the picture ver. offset");
398 (*result)->picture_y_offset = psiconv_read_u16(buf,lev+2,off + len);
399 psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x",
400 (*result)->picture_y_offset);
401 len += 0x02;
402 psiconv_progress(lev+2,off+len,"Going to read the form hor. size");
403 (*result)->form_xsize = psiconv_read_u16(buf,lev+2,off + len);
404 psiconv_debug(lev+2,off+len,"Form hor. size: %04x",
405 (*result)->form_xsize);
406 len += 0x02;
407 psiconv_progress(lev+2,off+len,"Going to read the form ver. size");
408 (*result)->form_ysize = psiconv_read_u16(buf,lev+2,off + len);
409 psiconv_debug(lev+2,off+len,"Form ver. size: %04x",
410 (*result)->form_ysize);
411 len += 0x02;
412 psiconv_progress(lev+2,off+len,"Going to skip 1 zero word");
413 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;
414 if (temp != 0) { 496 if (temp != 0) {
415 psiconv_warn(lev+2,off+len, 497 psiconv_warn(config,lev+2,off+len,
416 "Unexpected value in sketch section preamble"); 498 "Unexpected value in sketch section preamble (ignored)");
417 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",
418 res = -1; 500 temp,0);
419 } 501 }
420 off += 0x02; 502 off += 0x02;
421 }
422 503
423 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");
424 res |= psiconv_parse_paint_data_section(buf,lev+2,off+len,&leng,0, 505 if ((res = psiconv_parse_paint_data_section(config,buf,lev+2,off+len,&leng,0,
425 &((*result)->picture)); 506 &((*result)->picture))))
507 goto ERROR2;
426 off += leng; 508 off += leng;
427 if (!is_object) {
428 (*result)->picture_xsize = (*result)->picture->xsize;
429 (*result)->picture_ysize = (*result)->picture->ysize;
430 }
431 509
432 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");
433 (*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;
434 psiconv_debug(lev+2,off+len,"Form hor. magnification: %f", 514 psiconv_debug(config,lev+2,off+len,"Form hor. magnification: %f",
435 (*result)->magnification_x); 515 (*result)->magnification_x);
436 len += 0x02; 516 len += 0x02;
437 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");
438 (*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;
439 psiconv_debug(lev+2,off+len,"Form ver. magnification: %f", 521 psiconv_debug(config,lev+2,off+len,"Form ver. magnification: %f",
440 (*result)->magnification_y); 522 (*result)->magnification_y);
441 len += 0x02; 523 len += 0x02;
442 524
443 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");
444 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;
445 (*result)->cut_left = (temp * 6.0) / (*result)->picture_xsize; 529 (*result)->cut_left = (temp * 6.0) / (*result)->displayed_xsize;
446 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",
447 temp,(*result)->cut_left); 531 temp,(*result)->cut_left);
448 len += 0x04; 532 len += 0x04;
449 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");
450 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;
451 (*result)->cut_right = (temp * 6.0) / (*result)->picture_xsize; 537 (*result)->cut_right = (temp * 6.0) / (*result)->displayed_xsize;
452 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",
453 temp,(*result)->cut_right); 539 temp,(*result)->cut_right);
454 len += 0x04; 540 len += 0x04;
455 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");
456 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;
457 (*result)->cut_top = (temp * 6.0) / (*result)->picture_ysize; 545 (*result)->cut_top = (temp * 6.0) / (*result)->displayed_ysize;
458 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",
459 temp,(*result)->cut_top); 547 temp,(*result)->cut_top);
460 len += 0x04; 548 len += 0x04;
461 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");
462 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;
463 (*result)->cut_bottom = (temp * 6.0) / (*result)->picture_ysize; 553 (*result)->cut_bottom = (temp * 6.0) / (*result)->displayed_ysize;
464 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",
465 temp,(*result)->cut_bottom); 555 temp,(*result)->cut_bottom);
466 len += 0x04; 556 len += 0x04;
467 557
468 if (length) 558 if (length)
469 *length = len; 559 *length = len;
470 560
471 psiconv_progress(lev,off+len-1, 561 psiconv_progress(config,lev,off+len-1,
472 "End of sketch section (total length: %08x)", len); 562 "End of sketch section (total length: %08x)", len);
473 563
474 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;
475} 577}
476 578
477 579
478int psiconv_parse_clipart_section(const psiconv_buffer buf,int lev, 580int psiconv_parse_clipart_section(const psiconv_config config,
581 const psiconv_buffer buf,int lev,
479 psiconv_u32 off, int *length, 582 psiconv_u32 off, int *length,
480 psiconv_clipart_section *result) 583 psiconv_clipart_section *result)
481{ 584{
482 int res=0; 585 int res=0;
483 int len=0; 586 int len=0;
484 int leng; 587 int leng;
485 psiconv_u32 temp; 588 psiconv_u32 temp;
486 589
487 psiconv_progress(lev+1,off+len,"Going to read the clipart section"); 590 psiconv_progress(config,lev+1,off+len,"Going to read the clipart section");
488 *result = malloc(sizeof(**result)); 591 if (!(*result = malloc(sizeof(**result))))
592 goto ERROR1;
489 593
490 psiconv_progress(lev+2,off+len,"Going to read the section ID"); 594 psiconv_progress(config,lev+2,off+len,"Going to read the section ID");
491 temp = psiconv_read_u32(buf,lev+2,off+len); 595 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
596 if (res)
597 goto ERROR2;
492 if (temp != PSICONV_ID_CLIPART_ITEM) { 598 if (temp != PSICONV_ID_CLIPART_ITEM) {
493 psiconv_warn(lev+2,off+len, 599 psiconv_warn(config,lev+2,off+len,
494 "Unexpected value in clipart section preamble"); 600 "Unexpected value in clipart section preamble (ignored)");
495 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, 601 psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x",temp,
496 PSICONV_ID_CLIPART_ITEM); 602 PSICONV_ID_CLIPART_ITEM);
497 res = -1;
498 } else 603 } else
499 psiconv_debug(lev+2,off+len,"Clipart ID: %08x", temp); 604 psiconv_debug(config,lev+2,off+len,"Clipart ID: %08x", temp);
500 off += 4; 605 off += 4;
501 606
502 psiconv_progress(lev+2,off+len,"Going to read an unknown long"); 607 psiconv_progress(config,lev+2,off+len,"Going to read an unknown long");
503 temp = psiconv_read_u32(buf,lev+2,off+len); 608 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
609 if (res)
610 goto ERROR2;
504 if (temp != 0x02) { 611 if (temp != 0x02) {
505 psiconv_warn(lev+2,off+len, 612 psiconv_warn(config,lev+2,off+len,
506 "Unexpected value in clipart section preamble"); 613 "Unexpected value in clipart section preamble (ignored)");
507 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, 614 psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x",temp,
508 0x02); 615 0x02);
509 res = -1;
510 } else 616 } else
511 psiconv_debug(lev+2,off+len,"First unknown long: %08x", temp); 617 psiconv_debug(config,lev+2,off+len,"First unknown long: %08x", temp);
512 off += 4; 618 off += 4;
513 619
514 psiconv_progress(lev+2,off+len,"Going to read a second unknown long"); 620 psiconv_progress(config,lev+2,off+len,"Going to read a second unknown long");
515 temp = psiconv_read_u32(buf,lev+2,off+len); 621 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
622 if (res)
623 goto ERROR2;
516 if (temp != 0) { 624 if (temp != 0) {
517 psiconv_warn(lev+2,off+len, 625 psiconv_warn(config,lev+2,off+len,
518 "Unexpected value in clipart section preamble"); 626 "Unexpected value in clipart section preamble (ignored)");
519 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, 0); 627 psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x",temp, 0);
520 res = -1;
521 } else 628 } else
522 psiconv_debug(lev+2,off+len,"Second unknown long: %08x", temp); 629 psiconv_debug(config,lev+2,off+len,"Second unknown long: %08x", temp);
523 off += 4; 630 off += 4;
524 631
525 psiconv_progress(lev+2,off+len,"Going to read a third unknown long"); 632 psiconv_progress(config,lev+2,off+len,"Going to read a third unknown long");
526 temp = psiconv_read_u32(buf,lev+2,off+len); 633 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
634 if (res)
635 goto ERROR2;
527 if (temp != 0) { 636 if (temp != 0) {
528 psiconv_warn(lev+2,off+len, 637 psiconv_warn(config,lev+2,off+len,
529 "Unexpected value in clipart section preamble"); 638 "Unexpected value in clipart section preamble (ignored)");
530 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, 0); 639 psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x",temp, 0);
531 res = -1;
532 } else 640 } else
533 psiconv_debug(lev+2,off+len,"Third unknown long: %08x", temp); 641 psiconv_debug(config,lev+2,off+len,"Third unknown long: %08x", temp);
534 off += 4; 642 off += 4;
535 643
536 psiconv_progress(lev+2,off+len,"Going to read a fourth unknown long"); 644 psiconv_progress(config,lev+2,off+len,"Going to read a fourth unknown long");
537 temp = psiconv_read_u32(buf,lev+2,off+len); 645 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
646 if (res)
647 goto ERROR2;
538 if ((temp != 0x0c) && (temp != 0x08)) { 648 if ((temp != 0x0c) && (temp != 0x08)) {
539 psiconv_warn(lev+2,off+len, 649 psiconv_warn(config,lev+2,off+len,
540 "Unexpected value in clipart section preamble"); 650 "Unexpected value in clipart section preamble (ignored)");
541 psiconv_debug(lev+2,off+len,"Read %08x, expected %08x or %08x",temp, 651 psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x or %08x",temp,
542 0x0c, 0x08); 652 0x0c, 0x08);
543 res = -1;
544 } else 653 } else
545 psiconv_debug(lev+2,off+len,"Fourth unknown long: %08x", temp); 654 psiconv_debug(config,lev+2,off+len,"Fourth unknown long: %08x", temp);
546 off += 4; 655 off += 4;
547 656
548 psiconv_progress(lev+2,off+len,"Going to read the Paint Data Section"); 657 psiconv_progress(config,lev+2,off+len,"Going to read the Paint Data Section");
549 res |= psiconv_parse_paint_data_section(buf,lev+2,off+len,&leng,1, 658 if ((res = psiconv_parse_paint_data_section(config,buf,lev+2,off+len,&leng,1,
550 &((*result)->picture)); 659 &((*result)->picture))))
660 goto ERROR2;
551 len += leng; 661 len += leng;
552 662
553 if (length) 663 if (length)
554 *length = len; 664 *length = len;
555 665
556 psiconv_progress(lev,off+len-1, 666 psiconv_progress(config,lev,off+len-1,
557 "End of clipart section (total length: %08x)", len); 667 "End of clipart section (total length: %08x)", len);
668 return 0;
558 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
559 return res; 679 return res;
560} 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.45  
changed lines
  Added in v.178
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26