--- psiconv/trunk/lib/psiconv/parse_layout.c 2000/12/22 22:31:50 71 +++ psiconv/trunk/lib/psiconv/parse_layout.c 2000/12/28 00:24:58 84 @@ -165,6 +165,8 @@ (*result)->thickness = psiconv_read_size(buf,lev+2,off+len,&leng,&res); if (res) goto ERROR2; +#if 0 + /* This seems no longer necessary to test? */ if (((*result)->kind != psiconv_border_solid) && ((*result)->kind != psiconv_border_double) && ((*result)->thickness != 0.0) && @@ -172,6 +174,7 @@ psiconv_warn(lev+2,off, "Border thickness specified for unlikely border type"); } +#endif psiconv_debug(lev+2,off+len,"Thickness: %f",(*result)->thickness); len += leng; @@ -181,14 +184,14 @@ len += leng; psiconv_progress(lev+2,off+len,"Going to read the final unknown byte " - "(0x01 expected)"); + "(0x00 or 0x01 expected)"); temp = psiconv_read_u8(buf,lev+2,off + len,&res); if (res) goto ERROR3; - if (temp != 0x01) { + if ((temp != 0x01) && (temp != 0x00)) { psiconv_warn(lev+2,off,"Unknown last byte in border specification"); - psiconv_debug(lev+2,off+len, "Last byte: read %02x, expected %02x", - temp,0x01); + psiconv_debug(lev+2,off+len, "Last byte: read %02x, expected %02x or %02x", + temp,0x00,0x01); } len ++;