… | |
… | |
50 | |
50 | |
51 | if (length) |
51 | if (length) |
52 | *length = len; |
52 | *length = len; |
53 | |
53 | |
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 | |
59 | |
60 | int psiconv_parse_paint_data_section(const psiconv_buffer buf,int lev, |
60 | int psiconv_parse_paint_data_section(const psiconv_buffer buf,int lev, |
… | |
… | |
62 | psiconv_paint_data_section *result) |
62 | psiconv_paint_data_section *result) |
63 | { |
63 | { |
64 | int res = 0; |
64 | int res = 0; |
65 | int len = 0; |
65 | int len = 0; |
66 | int read_err = 0; |
66 | int read_err = 0; |
67 | psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr; |
67 | psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen; |
68 | psiconv_u8 marker; |
68 | psiconv_u8 marker; |
69 | int i; |
69 | int i; |
70 | |
70 | |
71 | psiconv_progress(lev+1,off,"Going to read a paint data section"); |
71 | psiconv_progress(lev+1,off,"Going to read a paint data section"); |
72 | (*result) = malloc(sizeof(**result)); |
72 | (*result) = malloc(sizeof(**result)); |
… | |
… | |
76 | psiconv_debug(lev+2,off+len,"Section size: %08x",size); |
76 | psiconv_debug(lev+2,off+len,"Section size: %08x",size); |
77 | len += 4; |
77 | len += 4; |
78 | |
78 | |
79 | psiconv_progress(lev+2,off+len,"Going to read pixel data offset"); |
79 | psiconv_progress(lev+2,off+len,"Going to read pixel data offset"); |
80 | offset = psiconv_read_u32(buf,lev+2,off+len); |
80 | offset = psiconv_read_u32(buf,lev+2,off+len); |
81 | if (size != 0x28) { |
81 | if (offset != 0x28) { |
82 | psiconv_warn(lev+2,off+len, |
82 | psiconv_warn(lev+2,off+len, |
83 | "Paint data section data offset has unexpected value"); |
83 | "Paint data section data offset has unexpected value"); |
84 | psiconv_debug(lev+2,off+len, |
84 | psiconv_debug(lev+2,off+len, |
85 | "Data offset: read %08x, expected %08x",offset,0x28); |
85 | "Data offset: read %08x, expected %08x",offset,0x28); |
86 | res = -1; |
86 | res = -1; |
… | |
… | |
95 | psiconv_progress(lev+2,off+len,"Going to read picture Y size"); |
95 | psiconv_progress(lev+2,off+len,"Going to read picture Y size"); |
96 | (*result)->ysize = psiconv_read_u32(buf,lev+2,off+len); |
96 | (*result)->ysize = psiconv_read_u32(buf,lev+2,off+len); |
97 | psiconv_debug(lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize); |
97 | psiconv_debug(lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize); |
98 | len += 4; |
98 | len += 4; |
99 | |
99 | |
100 | picsize = (*result)->ysize * (*result)->xsize; |
100 | picsize = (*result)->ysize * (*result)->xsize * 2; |
|
|
101 | linelen = (*result)->xsize; |
101 | |
102 | |
102 | 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"); |
103 | for (i = 0 ; i < 6; i++) { |
104 | for (i = 0 ; i < 6; i++) { |
104 | temp = psiconv_read_u32(buf,lev+2,off+len); |
105 | temp = psiconv_read_u32(buf,lev+2,off+len); |
105 | if (temp != 0x00) { |
106 | if (temp != (i==2?0x02:i==5?0x01:0x00)) { |
106 | psiconv_warn(lev+2,off+len, |
107 | psiconv_warn(lev+2,off+len, |
107 | "Paint data section prologue has unknown values"); |
108 | "Paint data section prologue has unknown values"); |
108 | psiconv_debug(lev+2,off+len, |
109 | psiconv_debug(lev+2,off+len, |
109 | "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); |
110 | res = -1; |
112 | res = -1; |
111 | } |
113 | } |
112 | len += 4; |
114 | len += 4; |
113 | } |
115 | } |
114 | |
116 | |
… | |
… | |
127 | "Pixelnr %08x, Datanr %08x: Read marker %02x", |
129 | "Pixelnr %08x, Datanr %08x: Read marker %02x", |
128 | pixelnr,datanr,marker); |
130 | pixelnr,datanr,marker); |
129 | datanr ++; |
131 | datanr ++; |
130 | if (marker >= 0x80) { |
132 | if (marker >= 0x80) { |
131 | /* 0x100 - marker bytes of data follow */ |
133 | /* 0x100 - marker bytes of data follow */ |
132 | if ((0x100 - marker + datanr > datasize) || |
134 | for (i = 0; i < 0x100-marker; i++,datanr++) { |
133 | ((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) { |
134 | psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); |
174 | psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); |
135 | psiconv_debug(lev+3,off+len+datanr, |
175 | psiconv_debug(lev+3,off+len+datanr, |
136 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
176 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
137 | "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, |
177 | "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, |
138 | datanr,marker); |
178 | datanr,marker); |
|
|
179 | read_err = 1; |
139 | res = -1; |
180 | res = -1; |
140 | read_err = 1; |
|
|
141 | } else { |
181 | } else { |
142 | for (i = 0; i < 0x100-marker; i++) { |
|
|
143 | 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 | } |
144 | (*result)->red[pixelnr + i*4] = |
194 | (*result)->red[pixelnr] = |
145 | (*result)->green[pixelnr + i*4] = |
195 | (*result)->green[pixelnr] = |
146 | (*result)->blue[pixelnr + i*4] = |
196 | (*result)->blue[pixelnr] = |
147 | (temp & 0x03) * (1.0/3.0); |
197 | (temp & 0x03) * (1.0/3.0); |
|
|
198 | pixelnr ++; |
|
|
199 | if (pixelnr % linelen == 0) |
|
|
200 | continue; |
148 | (*result)->red[pixelnr + i*4 + 1] = |
201 | (*result)->red[pixelnr] = |
149 | (*result)->green[pixelnr + i*4 +1] = |
202 | (*result)->green[pixelnr] = |
150 | (*result)->blue[pixelnr + i*4 + 1] = |
203 | (*result)->blue[pixelnr] = |
151 | ((temp >> 2) & 0x03) * (1.0/3.0); |
204 | ((temp >> 2) & 0x03) * (1.0/3.0); |
|
|
205 | pixelnr ++; |
|
|
206 | if (pixelnr % linelen == 0) |
|
|
207 | continue; |
152 | (*result)->red[pixelnr + i*4 + 2] = |
208 | (*result)->red[pixelnr] = |
153 | (*result)->green[pixelnr + i*4 +2] = |
209 | (*result)->green[pixelnr] = |
154 | (*result)->blue[pixelnr + i*4 + 2] = |
210 | (*result)->blue[pixelnr] = |
155 | ((temp >> 4) & 0x03) * (1.0/3.0); |
211 | ((temp >> 4) & 0x03) * (1.0/3.0); |
|
|
212 | pixelnr ++; |
|
|
213 | if (pixelnr % linelen == 0) |
|
|
214 | continue; |
156 | (*result)->red[pixelnr + i*4 + 3] = |
215 | (*result)->red[pixelnr] = |
157 | (*result)->green[pixelnr + i*4 +3] = |
216 | (*result)->green[pixelnr] = |
158 | (*result)->blue[pixelnr + i*4 + 3] = |
217 | (*result)->blue[pixelnr] = |
159 | ((temp >> 6) & 0x03) * (1.0/3.0); |
218 | ((temp >> 6) & 0x03) * (1.0/3.0); |
|
|
219 | pixelnr ++; |
160 | } |
220 | } |
161 | } |
221 | } |
162 | pixelnr += (0x100 - marker) * 4; |
|
|
163 | datanr += (0x100 - marker); |
|
|
164 | } else { /* marker < 0x080 */ |
|
|
165 | if ((datanr + 1 > datasize) || |
|
|
166 | (marker * 4 + pixelnr > picsize)) { |
|
|
167 | psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); |
|
|
168 | psiconv_debug(lev+3,off+len+datanr, |
|
|
169 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
|
|
170 | "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, |
|
|
171 | datanr,marker); |
|
|
172 | res = -1; |
|
|
173 | read_err = 1; |
|
|
174 | } else { |
|
|
175 | temp = psiconv_read_u8(buf,lev+3,off+len+datanr); |
|
|
176 | for (i = 0; i < marker; i++) { |
|
|
177 | (*result)->red[pixelnr + i*4] = |
|
|
178 | (*result)->green[pixelnr + i*4] = |
|
|
179 | (*result)->blue[pixelnr + i*4] = |
|
|
180 | (temp & 0x03) * (1.0/3.0); |
|
|
181 | (*result)->red[pixelnr + i*4 + 1] = |
|
|
182 | (*result)->green[pixelnr + i*4 +1] = |
|
|
183 | (*result)->blue[pixelnr + i*4 + 1] = |
|
|
184 | ((temp >> 2) & 0x03) * (1.0/3.0); |
|
|
185 | (*result)->red[pixelnr + i*4 + 2] = |
|
|
186 | (*result)->green[pixelnr + i*4 +2] = |
|
|
187 | (*result)->blue[pixelnr + i*4 + 2] = |
|
|
188 | ((temp >> 4) & 0x03) * (1.0/3.0); |
|
|
189 | (*result)->red[pixelnr + i*4 + 3] = |
|
|
190 | (*result)->green[pixelnr + i*4 +3] = |
|
|
191 | (*result)->blue[pixelnr + i*4 + 3] = |
|
|
192 | ((temp >> 6) & 0x03) * (1.0/3.0); |
|
|
193 | } |
|
|
194 | } |
|
|
195 | pixelnr += marker * 4; |
|
|
196 | datanr += 1; |
222 | datanr += 1; |
197 | } |
223 | } |
198 | } |
224 | } |
199 | if (!read_err && ((datanr != datasize) || (pixelnr != picsize))) { |
225 | if (!read_err && ((datanr != datasize) || (pixelnr != picsize))) { |
200 | psiconv_warn(lev+2,off+len,"Corrupted picture data!"); |
226 | psiconv_warn(lev+2,off+len,"Corrupted picture data!"); |
… | |
… | |
208 | |
234 | |
209 | if (length) |
235 | if (length) |
210 | *length = len; |
236 | *length = len; |
211 | |
237 | |
212 | psiconv_progress(lev+1,off+len-1,"End of paint data section " |
238 | psiconv_progress(lev+1,off+len-1,"End of paint data section " |
213 | "(total length: %08x", len); |
239 | "(total length: %08x)", len); |
214 | |
240 | |
215 | return res; |
241 | return res; |
216 | } |
242 | } |
217 | |
243 | |
218 | |
244 | |