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

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

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

Revision 24 Revision 25
54 psiconv_progress(lev+1,off+len-1,"End of mbm jumptable section " 54 psiconv_progress(lev+1,off+len-1,"End of mbm jumptable section "
55 "(total length: %08x)", len); 55 "(total length: %08x)", len);
56 56
57 return res; 57 return res;
58} 58}
59
60static int decode_byte(int lev, psiconv_u32 off,
61 psiconv_paint_data_section data, int *pixelnr,
62 psiconv_u8 byte, int bits_per_pixel, int linelen,
63 int *linepos,int picsize)
64{
65 int mask = (bits_per_pixel << 1) -1;
66 int i;
67 if (*linepos < (data->xsize + (8/bits_per_pixel) - 1) / (8/bits_per_pixel))
68 for (i = 0; i < 8/bits_per_pixel; i ++) {
69 if ((i != 0) && ((*pixelnr % (data->xsize)) == 0)) {
70 psiconv_debug(lev+1,off,"Skipping padding: %02x",byte);
71 i = 8;
72 } else if (*pixelnr >= picsize) {
73 psiconv_warn(lev+1,off,"Corrupted picture data!");
74 psiconv_debug(lev+1,off,"Trying to write a pixel too far");
75 return -1;
76 } else {
77 data->red[*pixelnr] = data->green[*pixelnr] = data->blue[*pixelnr] =
78 ((float) (byte & mask)) / ((1 << bits_per_pixel) -1);
79 psiconv_debug(lev+1,off,"Pixel %04x: (%04x,%04x) value %02x, color %f",
80 *pixelnr,*pixelnr % data->xsize,*pixelnr / data->xsize, byte&mask, data->red[*pixelnr]);
81 byte = byte >> bits_per_pixel;
82 (*pixelnr) ++;
83 }
84 }
85 else
86 psiconv_debug(lev+1,off,"Skipping padding byte");
87 (*linepos) ++;
88 if (*linepos == linelen)
89 *linepos = 0;
90 return 0;
91}
92
59 93
60int psiconv_parse_paint_data_section(const psiconv_buffer buf,int lev, 94int psiconv_parse_paint_data_section(const psiconv_buffer buf,int lev,
61 psiconv_u32 off, int *length, 95 psiconv_u32 off, int *length,
62 psiconv_paint_data_section *result) 96 psiconv_paint_data_section *result)
63{ 97{
64 int res = 0; 98 int res = 0;
65 int len = 0; 99 int len = 0;
66 int read_err = 0; 100 int read_err = 0;
67 psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen; 101 psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen;
68 psiconv_u8 marker; 102 psiconv_u8 marker;
69 int i; 103 int i,leng;
104 psiconv_u32 bits_per_pixel,compression;
105 int linepos = 0;
70 106
71 psiconv_progress(lev+1,off,"Going to read a paint data section"); 107 psiconv_progress(lev+1,off,"Going to read a paint data section");
72 (*result) = malloc(sizeof(**result)); 108 (*result) = malloc(sizeof(**result));
73 109
74 psiconv_progress(lev+2,off+len,"Going to read section size"); 110 psiconv_progress(lev+2,off+len,"Going to read section size");
95 psiconv_progress(lev+2,off+len,"Going to read picture Y size"); 131 psiconv_progress(lev+2,off+len,"Going to read picture Y size");
96 (*result)->ysize = psiconv_read_u32(buf,lev+2,off+len); 132 (*result)->ysize = psiconv_read_u32(buf,lev+2,off+len);
97 psiconv_debug(lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize); 133 psiconv_debug(lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize);
98 len += 4; 134 len += 4;
99 135
100 picsize = (*result)->ysize * (*result)->xsize * 2; 136 picsize = (*result)->ysize * (*result)->xsize;
101 linelen = (*result)->xsize;
102 137
103 psiconv_progress(lev+2,off+len,"Going to read 6 unknown longs"); 138 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);
140 psiconv_debug(lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize);
141 len += leng;
142
143 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);
145 psiconv_debug(lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize);
146 len += leng;
147
148 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);
150 if (bits_per_pixel > 8) {
151 psiconv_warn(lev+2,off+len,"Picture has too many colors");
152 psiconv_debug(lev+2,off+len,"Read %d colorbits",bits_per_pixel);
153 res = -1;
154 bits_per_pixel = 2;
155 }
156 psiconv_debug(lev+2,off+len,"Bits per pixel: %d",bits_per_pixel);
157 len += 4;
158
104 for (i = 0 ; i < 6; i++) { 159 for (i = 0 ; i < 2; i++) {
105 temp = psiconv_read_u32(buf,lev+2,off+len); 160 temp = psiconv_read_u32(buf,lev+2,off+len);
106 if (temp != (i==2?0x02:i==5?0x01:0x00)) { 161 if (temp != 00) {
107 psiconv_warn(lev+2,off+len, 162 psiconv_warn(lev+2,off+len,
108 "Paint data section prologue has unknown values"); 163 "Paint data section prologue has unknown values");
109 psiconv_debug(lev+2,off+len, 164 psiconv_debug(lev+2,off+len,
110 "offset %02x: read %08x, expected %08x",i,temp, 165 "offset %02x: read %08x, expected %08x",i,temp, 0x00);
111 i==2?0x02:i==5?0x01:0x00);
112 res = -1; 166 res = -1;
113 } 167 }
114 len += 4; 168 len += 4;
115 } 169 }
170
171 psiconv_progress(lev+2,off+len,
172 "Going to read whether RLE compression is used");
173 compression=psiconv_read_u32(buf,lev+2,off+len);
174 if (compression > 1) {
175 psiconv_warn(lev+2,off+len,"Paint data section has unknown "
176 "compression type, assuming RLE");
177 psiconv_debug(lev+2,off+len,"Read compression type %d",compression);
178 compression = 1;
179 }
180 psiconv_debug(lev+2,off+len,"Compression: %s",compression?"RLE":"none");
116 181
117 (*result)->red = malloc(sizeof(float) * picsize); 182 (*result)->red = malloc(sizeof(float) * picsize);
118 (*result)->green = malloc(sizeof(float) * picsize); 183 (*result)->green = malloc(sizeof(float) * picsize);
119 (*result)->blue = malloc(sizeof(float) * picsize); 184 (*result)->blue = malloc(sizeof(float) * picsize);
120 len = offset; 185 len = offset;
121 datasize = size - len; 186 datasize = size - len;
122 187
123 psiconv_progress(lev+2,off+len,"Going to read the pixel data"); 188 psiconv_progress(lev+2,off+len,"Going to read the pixel data");
124 pixelnr = 0; 189 pixelnr = 0;
125 datanr = 0; 190 datanr = 0;
126 while ((datanr < datasize) && (pixelnr < picsize)) { 191 if (!compression) {
192 linelen = datasize / (*result)->ysize;
193 psiconv_debug(lev+3,off+len,"Line length: %04x bytes",linelen);
194 while((datanr < datasize)) {
195 temp = psiconv_read_u8(buf,lev+2,off+len+datanr);
196 if (decode_byte(lev+3,off+len+datanr,*result,&pixelnr,temp,bits_per_pixel,
197 linelen,&linepos,picsize)) {
198 read_err = 1;
199 res = -1;
200 break;
201 }
202 datanr++;
203 }
204 } else {
205 psiconv_progress(lev+2,off+len,"First pass: determining line length");
206 datanr = 0;
207 i = 0;
208 while (datanr < datasize) {
127 marker = psiconv_read_u8(buf,lev+3,off+len+datanr); 209 marker = psiconv_read_u8(buf,lev+3,off+len+datanr);
210 if (marker >= 0x80) {
211 datanr += 0x100 - marker + 1;
212 i += 0x100 - marker;
213 } else {
214 datanr += 2;
215 i += marker + 1;
216 }
217 }
218 linelen = i / (*result)->ysize;
219 datanr=0;
220 psiconv_debug(lev+2,off+len,"Linelen: %04x bytes",linelen);
221 while((datanr < datasize)) {
222 marker = psiconv_read_u8(buf,lev+3,off+len+datanr);
128 psiconv_debug(lev+3,off+len+datanr, 223 psiconv_debug(lev+3,off+len+datanr,
129 "Pixelnr %08x, Datanr %08x: Read marker %02x", 224 "Pixelnr %08x, Datanr %08x: Read marker %02x",
130 pixelnr,datanr,marker); 225 pixelnr,datanr,marker);
131 datanr ++; 226 datanr ++;
132 if (marker >= 0x80) { 227 if (marker >= 0x80) {
133 /* 0x100 - marker bytes of data follow */ 228 /* 0x100 - marker bytes of data follow */
134 for (i = 0; i < 0x100-marker; i++,datanr++) { 229 for (i = 0; i < 0x100-marker; i++,datanr++) {
135 if ((picsize == pixelnr) || (datasize == datanr)) { 230 if (datanr >= datasize) {
231 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
232 psiconv_debug(lev+3,off+len+datanr,
233 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
234 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
235 datanr,marker);
236 read_err = 1;
237 res = -1;
238 break;
239 }
240 temp = psiconv_read_u8(buf,lev+2,off+len+datanr);
241 if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp,
242 bits_per_pixel,linelen,&linepos,picsize)) {
243 res = -1;
244 read_err = 1;
245 break;
246 }
247 }
248 } else {
249 if (datanr >= datasize) {
136 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); 250 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
137 psiconv_debug(lev+3,off+len+datanr, 251 psiconv_debug(lev+3,off+len+datanr,
138 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," 252 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
139 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, 253 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
140 datanr,marker); 254 datanr,marker);
141 read_err = 1; 255 read_err = 1;
142 res = -1; 256 res = -1;
143 break; 257 } else {
144 }
145 temp = psiconv_read_u8(buf,lev+3,off+len+datanr); 258 temp = psiconv_read_u8(buf,lev+3,off+len+datanr);
146 (*result)->red[pixelnr] =
147 (*result)->green[pixelnr] =
148 (*result)->blue[pixelnr] =
149 (temp & 0x03) * (1.0/3.0);
150 pixelnr ++;
151 if (pixelnr % linelen == 0)
152 continue;
153 (*result)->red[pixelnr] =
154 (*result)->green[pixelnr] =
155 (*result)->blue[pixelnr] =
156 ((temp >> 2) & 0x03) * (1.0/3.0);
157 pixelnr ++;
158 if (pixelnr % linelen == 0)
159 continue;
160 (*result)->red[pixelnr] =
161 (*result)->green[pixelnr] =
162 (*result)->blue[pixelnr] =
163 ((temp >> 4) & 0x03) * (1.0/3.0);
164 pixelnr ++;
165 if (pixelnr % linelen == 0)
166 continue;
167 (*result)->red[pixelnr] =
168 (*result)->green[pixelnr] =
169 (*result)->blue[pixelnr] =
170 ((temp >> 6) & 0x03) * (1.0/3.0);
171 }
172 } else { /* marker < 0x080 */
173 if (datasize == datanr) {
174 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
175 psiconv_debug(lev+3,off+len+datanr,
176 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
177 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
178 datanr,marker);
179 read_err = 1;
180 res = -1;
181 } else {
182 temp = psiconv_read_u8(buf,lev+3,off+len+datanr);
183 for (i = 0; i <= marker; i++) { 259 for (i = 0; i <= marker; i++) {
184 if (picsize == pixelnr) { 260 if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp,
185 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); 261 bits_per_pixel,linelen,&linepos,picsize)) {
186 psiconv_debug(lev+3,off+len+datanr,
187 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
188 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
189 datanr,marker);
190 read_err = 1; 262 read_err = 1;
191 res = -1; 263 res = -1;
192 break; 264 break;
193 } 265 }
194 (*result)->red[pixelnr] = 266 }
195 (*result)->green[pixelnr] =
196 (*result)->blue[pixelnr] =
197 (temp & 0x03) * (1.0/3.0);
198 pixelnr ++; 267 datanr ++;
199 if (pixelnr % linelen == 0) 268 }
200 continue;
201 (*result)->red[pixelnr] =
202 (*result)->green[pixelnr] =
203 (*result)->blue[pixelnr] =
204 ((temp >> 2) & 0x03) * (1.0/3.0);
205 pixelnr ++;
206 if (pixelnr % linelen == 0)
207 continue;
208 (*result)->red[pixelnr] =
209 (*result)->green[pixelnr] =
210 (*result)->blue[pixelnr] =
211 ((temp >> 4) & 0x03) * (1.0/3.0);
212 pixelnr ++;
213 if (pixelnr % linelen == 0)
214 continue;
215 (*result)->red[pixelnr] =
216 (*result)->green[pixelnr] =
217 (*result)->blue[pixelnr] =
218 ((temp >> 6) & 0x03) * (1.0/3.0);
219 pixelnr ++;
220 } 269 }
221 } 270 }
222 datanr += 1; 271 }
272
273 if (linepos >= ((*result)->xsize + (8/bits_per_pixel) - 1) /
274 (8/bits_per_pixel))
275 datanr += (linelen - linepos);
223 } 276
224 }
225 if (!read_err && ((datanr != datasize) || (pixelnr != picsize))) { 277 if (!read_err && ((datanr != datasize) || (pixelnr != picsize))) {
226 psiconv_warn(lev+2,off+len,"Corrupted picture data!"); 278 psiconv_warn(lev+2,off+len,"Corrupted picture data!");
227 psiconv_debug(lev+3,off+len+datanr, 279 psiconv_debug(lev+3,off+len+datanr,
228 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," 280 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
229 "Datanr: %08x",picsize,datasize,pixelnr,datanr); 281 "Datanr: %08x",picsize,datasize,pixelnr,datanr);
238 psiconv_progress(lev+1,off+len-1,"End of paint data section " 290 psiconv_progress(lev+1,off+len-1,"End of paint data section "
239 "(total length: %08x)", len); 291 "(total length: %08x)", len);
240 292
241 return res; 293 return res;
242} 294}
243
244
245
246 295
247int psiconv_parse_sketch_section(const psiconv_buffer buf, int lev, 296int psiconv_parse_sketch_section(const psiconv_buffer buf, int lev,
248 psiconv_u32 off, int *length, int is_object, 297 psiconv_u32 off, int *length, int is_object,
249 psiconv_sketch_section *result) 298 psiconv_sketch_section *result)
250{ 299{

Legend:
Removed from v.24  
changed lines
  Added in v.25

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26