--- psiconv/trunk/lib/psiconv/parse_page.c 2000/12/24 17:26:24 75 +++ psiconv/trunk/lib/psiconv/parse_page.c 2000/12/25 00:26:53 76 @@ -196,12 +196,14 @@ temp = psiconv_read_u32(buf,lev+2,off+len,&res); if (res) goto ERROR4; - if (temp != PSICONV_ID_PAGE_DIMENSIONS) { + if ((temp != PSICONV_ID_PAGE_DIMENSIONS1) && + (temp != PSICONV_ID_PAGE_DIMENSIONS2)) { psiconv_warn(lev+2,off+len, "Page layout section page dimensions marker not found"); psiconv_debug(lev+2,off+len, - "Page dimensions marker: read %08x, expected %08x",temp, - PSICONV_ID_PAGE_DIMENSIONS); + "Page dimensions marker: read %08x, expected %08x or %08x", + temp, PSICONV_ID_PAGE_DIMENSIONS1, + PSICONV_ID_PAGE_DIMENSIONS2); } len += 4; @@ -219,6 +221,13 @@ psiconv_debug(lev+2,off+len,"Page height: %6.3f",(*result)->page_height); len += leng; + psiconv_progress(lev+2,off+len,"Going to read page portrait/landscape"); + if ((res = psiconv_parse_bool(buf,lev+2,off+len,&leng,&(*result)->landscape))) + goto ERROR4; + psiconv_debug(lev+2,off+len,"Landscape: %d",(*result)->landscape); + len += leng; + + if (length) *length = len;