/[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 13 Revision 15
98 len += 4; 98 len += 4;
99 99
100 picsize = (*result)->ysize * (*result)->xsize * 2; 100 picsize = (*result)->ysize * (*result)->xsize * 2;
101 linelen = (*result)->xsize; 101 linelen = (*result)->xsize;
102 102
103 psiconv_progress(lev+2,off+len,"Going to read 6 unused longs"); 103 psiconv_progress(lev+2,off+len,"Going to read 6 unknown longs");
104 for (i = 0 ; i < 6; i++) { 104 for (i = 0 ; i < 6; i++) {
105 temp = psiconv_read_u32(buf,lev+2,off+len); 105 temp = psiconv_read_u32(buf,lev+2,off+len);
106 if (temp != 0x00) { 106 if (temp != (i==2?0x02:i==5?0x01:0x00)) {
107 psiconv_warn(lev+2,off+len, 107 psiconv_warn(lev+2,off+len,
108 "Paint data section prologue has unknown values"); 108 "Paint data section prologue has unknown values");
109 psiconv_debug(lev+2,off+len, 109 psiconv_debug(lev+2,off+len,
110 "offset %02x: read %08x, expected %08x",i,temp,0x00); 110 "offset %02x: read %08x, expected %08x",i,temp,
111 i==2?0x02:i==5?0x01:0x00);
111 res = -1; 112 res = -1;
112 } 113 }
113 len += 4; 114 len += 4;
114 } 115 }
115 116
128 "Pixelnr %08x, Datanr %08x: Read marker %02x", 129 "Pixelnr %08x, Datanr %08x: Read marker %02x",
129 pixelnr,datanr,marker); 130 pixelnr,datanr,marker);
130 datanr ++; 131 datanr ++;
131 if (marker >= 0x80) { 132 if (marker >= 0x80) {
132 /* 0x100 - marker bytes of data follow */ 133 /* 0x100 - marker bytes of data follow */
133 if ((0x100 - marker + datanr > datasize) || 134 for (i = 0; i < 0x100-marker; i++,datanr++) {
134 ((0x100 - marker) * 4 + pixelnr > picsize)) { 135 if ((picsize == pixelnr) || (datasize == datanr)) {
136 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
137 psiconv_debug(lev+3,off+len+datanr,
138 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
139 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
140 datanr,marker);
141 read_err = 1;
142 res = -1;
143 break;
144 }
145 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) {
135 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); 174 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
136 psiconv_debug(lev+3,off+len+datanr, 175 psiconv_debug(lev+3,off+len+datanr,
137 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," 176 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
138 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, 177 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
139 datanr,marker); 178 datanr,marker);
179 read_err = 1;
140 res = -1; 180 res = -1;
141 read_err = 1;
142 } else { 181 } else {
143 for (i = 0; i < 0x100-marker; i++) {
144 temp = psiconv_read_u8(buf,lev+3,off+len+datanr+i); 182 temp = psiconv_read_u8(buf,lev+3,off+len+datanr);
183 for (i = 0; i <= marker; i++) {
184 if (picsize == pixelnr) {
185 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
186 psiconv_debug(lev+3,off+len+datanr,
187 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
188 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
189 datanr,marker);
190 read_err = 1;
191 res = -1;
192 break;
193 }
145 (*result)->red[pixelnr + i*4] = 194 (*result)->red[pixelnr] =
146 (*result)->green[pixelnr + i*4] = 195 (*result)->green[pixelnr] =
147 (*result)->blue[pixelnr + i*4] = 196 (*result)->blue[pixelnr] =
148 (temp & 0x03) * (1.0/3.0); 197 (temp & 0x03) * (1.0/3.0);
198 pixelnr ++;
199 if (pixelnr % linelen == 0)
200 continue;
149 (*result)->red[pixelnr + i*4 + 1] = 201 (*result)->red[pixelnr] =
150 (*result)->green[pixelnr + i*4 +1] = 202 (*result)->green[pixelnr] =
151 (*result)->blue[pixelnr + i*4 + 1] = 203 (*result)->blue[pixelnr] =
152 ((temp >> 2) & 0x03) * (1.0/3.0); 204 ((temp >> 2) & 0x03) * (1.0/3.0);
205 pixelnr ++;
206 if (pixelnr % linelen == 0)
207 continue;
153 (*result)->red[pixelnr + i*4 + 2] = 208 (*result)->red[pixelnr] =
154 (*result)->green[pixelnr + i*4 +2] = 209 (*result)->green[pixelnr] =
155 (*result)->blue[pixelnr + i*4 + 2] = 210 (*result)->blue[pixelnr] =
156 ((temp >> 4) & 0x03) * (1.0/3.0); 211 ((temp >> 4) & 0x03) * (1.0/3.0);
212 pixelnr ++;
213 if (pixelnr % linelen == 0)
214 continue;
157 (*result)->red[pixelnr + i*4 + 3] = 215 (*result)->red[pixelnr] =
158 (*result)->green[pixelnr + i*4 +3] = 216 (*result)->green[pixelnr] =
159 (*result)->blue[pixelnr + i*4 + 3] = 217 (*result)->blue[pixelnr] =
160 ((temp >> 6) & 0x03) * (1.0/3.0); 218 ((temp >> 6) & 0x03) * (1.0/3.0);
219 pixelnr ++;
161 } 220 }
162 } 221 }
163 pixelnr += (0x100 - marker) * 4;
164 datanr += (0x100 - marker);
165 } else { /* marker < 0x080 */
166 if ((datanr + 1 > datasize) ||
167 (marker * 4 + pixelnr > picsize)) {
168 psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data");
169 psiconv_debug(lev+3,off+len+datanr,
170 "Picsize: %08x, Datasize: %08x, Pixelnr: %08x,"
171 "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr,
172 datanr,marker);
173 res = -1;
174 read_err = 1;
175 } else {
176 temp = psiconv_read_u8(buf,lev+3,off+len+datanr);
177 for (i = 0; i < marker; i++) {
178 (*result)->red[pixelnr + i*4] =
179 (*result)->green[pixelnr + i*4] =
180 (*result)->blue[pixelnr + i*4] =
181 (temp & 0x03) * (1.0/3.0);
182 (*result)->red[pixelnr + i*4 + 1] =
183 (*result)->green[pixelnr + i*4 +1] =
184 (*result)->blue[pixelnr + i*4 + 1] =
185 ((temp >> 2) & 0x03) * (1.0/3.0);
186 (*result)->red[pixelnr + i*4 + 2] =
187 (*result)->green[pixelnr + i*4 +2] =
188 (*result)->blue[pixelnr + i*4 + 2] =
189 ((temp >> 4) & 0x03) * (1.0/3.0);
190 (*result)->red[pixelnr + i*4 + 3] =
191 (*result)->green[pixelnr + i*4 +3] =
192 (*result)->blue[pixelnr + i*4 + 3] =
193 ((temp >> 6) & 0x03) * (1.0/3.0);
194 }
195 }
196 pixelnr += marker * 4;
197 datanr += 1; 222 datanr += 1;
198 } 223 }
199 } 224 }
200 if (!read_err && ((datanr != datasize) || (pixelnr != picsize))) { 225 if (!read_err && ((datanr != datasize) || (pixelnr != picsize))) {
201 psiconv_warn(lev+2,off+len,"Corrupted picture data!"); 226 psiconv_warn(lev+2,off+len,"Corrupted picture data!");

Legend:
Removed from v.13  
changed lines
  Added in v.15

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