diff options
| author | Tor Andersson <tor@ghostscript.com> | 2011-02-10 12:22:23 +0000 |
|---|---|---|
| committer | Tor Andersson <tor@ghostscript.com> | 2011-02-10 12:22:23 +0000 |
| commit | dcf3b543ecaa1ff1897901e13057fed13bc5f8bc (patch) | |
| tree | b5dc7c86a8990234d1e7b66b45b8a2c519de6601 | |
| parent | 70a7746f0b6fada890f668e1dc552b08ea2ec621 (diff) | |
| download | mupdf-dcf3b543ecaa1ff1897901e13057fed13bc5f8bc.tar.xz | |
Improve error messages in indirect object parser.
| -rw-r--r-- | mupdf/pdf_parse.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mupdf/pdf_parse.c b/mupdf/pdf_parse.c index 3e386cc8..b32f4d01 100644 --- a/mupdf/pdf_parse.c +++ b/mupdf/pdf_parse.c @@ -424,21 +424,21 @@ pdf_parseindobj(fz_obj **op, pdf_xref *xref, if (error) return fz_rethrow(error, "cannot parse indirect object (%d %d R)", num, gen); if (tok != PDF_TINT) - return fz_throw("cannot parse indirect object (%d %d R)", num, gen); + return fz_throw("expected object number (%d %d R)", num, gen); num = atoi(buf); error = pdf_lex(&tok, file, buf, cap, &len); if (error) return fz_rethrow(error, "cannot parse indirect object (%d %d R)", num, gen); if (tok != PDF_TINT) - return fz_throw("cannot parse indirect object (%d %d R)", num, gen); + return fz_throw("expected generation number (%d %d R)", num, gen); gen = atoi(buf); error = pdf_lex(&tok, file, buf, cap, &len); if (error) return fz_rethrow(error, "cannot parse indirect object (%d %d R)", num, gen); if (tok != PDF_TOBJ) - return fz_throw("cannot parse indirect object (%d %d R)", num, gen); + return fz_throw("expected 'obj' keyword (%d %d R)", num, gen); error = pdf_lex(&tok, file, buf, cap, &len); if (error) @@ -487,14 +487,14 @@ pdf_parseindobj(fz_obj **op, pdf_xref *xref, break; } } - return fz_throw("cannot parse indirect object (%d %d R)", num, gen); + return fz_throw("expected 'R' keyword (%d %d R)", num, gen); case PDF_TENDOBJ: obj = fz_newnull(); goto skip; default: - return fz_throw("cannot parse indirect object (%d %d R)", num, gen); + return fz_throw("syntax error in object (%d %d R)", num, gen); } error = pdf_lex(&tok, file, buf, cap, &len); @@ -526,7 +526,7 @@ skip: } else { - fz_warn("expected endobj or stream keyword (%d %d R)", num, gen); + fz_warn("expected 'endobj' or 'stream' keyword (%d %d R)", num, gen); stmofs = 0; } |