… | |
… | |
194 | |
194 | |
195 | psiconv_progress(lev+2,off+len,"Going to read page dimensions id"); |
195 | psiconv_progress(lev+2,off+len,"Going to read page dimensions id"); |
196 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
196 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
197 | if (res) |
197 | if (res) |
198 | goto ERROR4; |
198 | goto ERROR4; |
199 | if (temp != PSICONV_ID_PAGE_DIMENSIONS) { |
199 | if ((temp != PSICONV_ID_PAGE_DIMENSIONS1) && |
|
|
200 | (temp != PSICONV_ID_PAGE_DIMENSIONS2)) { |
200 | psiconv_warn(lev+2,off+len, |
201 | psiconv_warn(lev+2,off+len, |
201 | "Page layout section page dimensions marker not found"); |
202 | "Page layout section page dimensions marker not found"); |
202 | psiconv_debug(lev+2,off+len, |
203 | psiconv_debug(lev+2,off+len, |
203 | "Page dimensions marker: read %08x, expected %08x",temp, |
204 | "Page dimensions marker: read %08x, expected %08x or %08x", |
|
|
205 | temp, PSICONV_ID_PAGE_DIMENSIONS1, |
204 | PSICONV_ID_PAGE_DIMENSIONS); |
206 | PSICONV_ID_PAGE_DIMENSIONS2); |
205 | } |
207 | } |
206 | len += 4; |
208 | len += 4; |
207 | |
209 | |
208 | psiconv_progress(lev+2,off+len,"Going to read the page width"); |
210 | psiconv_progress(lev+2,off+len,"Going to read the page width"); |
209 | (*result)->page_width = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
211 | (*result)->page_width = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
… | |
… | |
216 | (*result)->page_height = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
218 | (*result)->page_height = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
217 | if (res) |
219 | if (res) |
218 | goto ERROR4; |
220 | goto ERROR4; |
219 | psiconv_debug(lev+2,off+len,"Page height: %6.3f",(*result)->page_height); |
221 | psiconv_debug(lev+2,off+len,"Page height: %6.3f",(*result)->page_height); |
220 | len += leng; |
222 | len += leng; |
|
|
223 | |
|
|
224 | psiconv_progress(lev+2,off+len,"Going to read page portrait/landscape"); |
|
|
225 | if ((res = psiconv_parse_bool(buf,lev+2,off+len,&leng,&(*result)->landscape))) |
|
|
226 | goto ERROR4; |
|
|
227 | psiconv_debug(lev+2,off+len,"Landscape: %d",(*result)->landscape); |
|
|
228 | len += leng; |
|
|
229 | |
221 | |
230 | |
222 | if (length) |
231 | if (length) |
223 | *length = len; |
232 | *length = len; |
224 | |
233 | |
225 | psiconv_progress(lev,off+len-1,"End of page section (total length: %08x)", |
234 | psiconv_progress(lev,off+len-1,"End of page section (total length: %08x)", |