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