aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--libqpdf/QPDFExc.cc2
-rw-r--r--qpdf/qtest/qpdf/bad-data.out4
-rw-r--r--qpdf/qtest/qpdf/bad-jpeg-check.out4
-rw-r--r--qpdf/qtest/qpdf/bad-jpeg-show.out2
-rw-r--r--qpdf/qtest/qpdf/bad-jpeg.out4
-rw-r--r--qpdf/qtest/qpdf/bad-xref-entry-corrected.out2
-rw-r--r--qpdf/qtest/qpdf/bad10-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad10.out2
-rw-r--r--qpdf/qtest/qpdf/bad11-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad11.out2
-rw-r--r--qpdf/qtest/qpdf/bad13-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad13.out2
-rw-r--r--qpdf/qtest/qpdf/bad14-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad14.out2
-rw-r--r--qpdf/qtest/qpdf/bad15-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad15.out2
-rw-r--r--qpdf/qtest/qpdf/bad16-recover.out16
-rw-r--r--qpdf/qtest/qpdf/bad16.out8
-rw-r--r--qpdf/qtest/qpdf/bad17-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad17.out2
-rw-r--r--qpdf/qtest/qpdf/bad18-recover.out4
-rw-r--r--qpdf/qtest/qpdf/bad18.out2
-rw-r--r--qpdf/qtest/qpdf/bad19-recover.out4
-rw-r--r--qpdf/qtest/qpdf/bad19.out2
-rw-r--r--qpdf/qtest/qpdf/bad20-recover.out4
-rw-r--r--qpdf/qtest/qpdf/bad20.out2
-rw-r--r--qpdf/qtest/qpdf/bad21-recover.out4
-rw-r--r--qpdf/qtest/qpdf/bad21.out2
-rw-r--r--qpdf/qtest/qpdf/bad22-recover.out6
-rw-r--r--qpdf/qtest/qpdf/bad22.out2
-rw-r--r--qpdf/qtest/qpdf/bad23-recover.out6
-rw-r--r--qpdf/qtest/qpdf/bad23.out2
-rw-r--r--qpdf/qtest/qpdf/bad24-recover.out6
-rw-r--r--qpdf/qtest/qpdf/bad24.out2
-rw-r--r--qpdf/qtest/qpdf/bad25-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad25.out2
-rw-r--r--qpdf/qtest/qpdf/bad26-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad26.out2
-rw-r--r--qpdf/qtest/qpdf/bad27-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad27.out2
-rw-r--r--qpdf/qtest/qpdf/bad28-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad28.out2
-rw-r--r--qpdf/qtest/qpdf/bad29-recover.out4
-rw-r--r--qpdf/qtest/qpdf/bad29.out2
-rw-r--r--qpdf/qtest/qpdf/bad3-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad3.out2
-rw-r--r--qpdf/qtest/qpdf/bad30-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad30.out2
-rw-r--r--qpdf/qtest/qpdf/bad32-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad32.out2
-rw-r--r--qpdf/qtest/qpdf/bad33-recover.out4
-rw-r--r--qpdf/qtest/qpdf/bad33.out2
-rw-r--r--qpdf/qtest/qpdf/bad34-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad34.out2
-rw-r--r--qpdf/qtest/qpdf/bad35-recover.out4
-rw-r--r--qpdf/qtest/qpdf/bad35.out4
-rw-r--r--qpdf/qtest/qpdf/bad36-recover.out6
-rw-r--r--qpdf/qtest/qpdf/bad36.out6
-rw-r--r--qpdf/qtest/qpdf/bad4-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad4.out2
-rw-r--r--qpdf/qtest/qpdf/bad5-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad5.out2
-rw-r--r--qpdf/qtest/qpdf/bad7-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad7.out2
-rw-r--r--qpdf/qtest/qpdf/bad8-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad8.out2
-rw-r--r--qpdf/qtest/qpdf/bad9-recover.out2
-rw-r--r--qpdf/qtest/qpdf/bad9.out2
-rw-r--r--qpdf/qtest/qpdf/c-no-recovery.out2
-rw-r--r--qpdf/qtest/qpdf/c-write-warnings.out4
-rw-r--r--qpdf/qtest/qpdf/content-stream-errors.out6
-rw-r--r--qpdf/qtest/qpdf/damaged-stream-c-check.out4
-rw-r--r--qpdf/qtest/qpdf/damaged-stream.out4
-rw-r--r--qpdf/qtest/qpdf/empty-object.out2
-rw-r--r--qpdf/qtest/qpdf/eof-in-inline-image.out2
-rw-r--r--qpdf/qtest/qpdf/eof-reading-token.out2
-rw-r--r--qpdf/qtest/qpdf/good14.out26
-rw-r--r--qpdf/qtest/qpdf/indirect-r-arg.out6
-rw-r--r--qpdf/qtest/qpdf/invalid-id-xref.out2
-rw-r--r--qpdf/qtest/qpdf/issue-100.out28
-rw-r--r--qpdf/qtest/qpdf/issue-101.out114
-rw-r--r--qpdf/qtest/qpdf/issue-106.out6
-rw-r--r--qpdf/qtest/qpdf/issue-117.out10
-rw-r--r--qpdf/qtest/qpdf/issue-118.out6
-rw-r--r--qpdf/qtest/qpdf/issue-119.out4
-rw-r--r--qpdf/qtest/qpdf/issue-120.out4
-rw-r--r--qpdf/qtest/qpdf/issue-141a.out8
-rw-r--r--qpdf/qtest/qpdf/issue-141b.out2
-rw-r--r--qpdf/qtest/qpdf/issue-143.out26
-rw-r--r--qpdf/qtest/qpdf/issue-146.out4
-rw-r--r--qpdf/qtest/qpdf/issue-147.out6
-rw-r--r--qpdf/qtest/qpdf/issue-148.out12
-rw-r--r--qpdf/qtest/qpdf/issue-51.out14
-rw-r--r--qpdf/qtest/qpdf/issue-99.out4
-rw-r--r--qpdf/qtest/qpdf/issue-99b.out4
-rw-r--r--qpdf/qtest/qpdf/linearization-bounds-1.out8
-rw-r--r--qpdf/qtest/qpdf/linearization-bounds-2.out8
-rw-r--r--qpdf/qtest/qpdf/linearization-large-vector-alloc.out6
-rw-r--r--qpdf/qtest/qpdf/linearized-and-warnings-1.out2
-rw-r--r--qpdf/qtest/qpdf/linearized-and-warnings-2.out2
-rw-r--r--qpdf/qtest/qpdf/normalize-warnings.out16
-rw-r--r--qpdf/qtest/qpdf/obj0-check.out2
-rw-r--r--qpdf/qtest/qpdf/split-content-stream-errors.out6
-rw-r--r--qpdf/qtest/qpdf/stream-line-enders.out6
-rw-r--r--qpdf/qtest/qpdf/xref-errors.out10
-rw-r--r--qpdf/qtest/qpdf/xref-with-short-size-recover.out2
-rw-r--r--qpdf/qtest/qpdf/xref-with-short-size.out2
108 files changed, 298 insertions, 290 deletions
diff --git a/ChangeLog b/ChangeLog
index b2efa056..0d6ab5ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2018-02-17 Jay Berkenbilt <ejb@ql.org>
+ * Error message fix: replace "file position" with "offset" in
+ error messages that report lexical or parsing errors. Sometimes
+ it's an offset in an object stream or a content stream rather than
+ a file position, so this makes the error message less confusing in
+ those cases. It still requires some knowledge to find the exact
+ position of the error, since when it's not a file offset, it's
+ probably an offset into a stream after uncompressing it.
+
* Error message fix: correct some cases in which the object that
contained a lexical error was omitted from the error message.
diff --git a/libqpdf/QPDFExc.cc b/libqpdf/QPDFExc.cc
index 8bbfb0b4..728d4ce8 100644
--- a/libqpdf/QPDFExc.cc
+++ b/libqpdf/QPDFExc.cc
@@ -43,7 +43,7 @@ QPDFExc::createWhat(std::string const& filename,
}
if (offset > 0)
{
- result += "file position " + QUtil::int_to_string(offset);
+ result += "offset " + QUtil::int_to_string(offset);
}
result += ")";
}
diff --git a/qpdf/qtest/qpdf/bad-data.out b/qpdf/qtest/qpdf/bad-data.out
index 2d463759..56931267 100644
--- a/qpdf/qtest/qpdf/bad-data.out
+++ b/qpdf/qtest/qpdf/bad-data.out
@@ -1,3 +1,3 @@
-WARNING: bad-data.pdf (file position 319): error decoding stream data for object 4 0: LZWDecoder: bad code received
-WARNING: bad-data.pdf (file position 319): stream will be re-processed without filtering to avoid data loss
+WARNING: bad-data.pdf (offset 319): error decoding stream data for object 4 0: LZWDecoder: bad code received
+WARNING: bad-data.pdf (offset 319): stream will be re-processed without filtering to avoid data loss
qpdf: operation succeeded with warnings; resulting file may have some problems
diff --git a/qpdf/qtest/qpdf/bad-jpeg-check.out b/qpdf/qtest/qpdf/bad-jpeg-check.out
index 3607d1c1..425c495e 100644
--- a/qpdf/qtest/qpdf/bad-jpeg-check.out
+++ b/qpdf/qtest/qpdf/bad-jpeg-check.out
@@ -2,5 +2,5 @@ checking bad-jpeg.pdf
PDF Version: 1.3
File is not encrypted
File is not linearized
-WARNING: bad-jpeg.pdf (file position 735): error decoding stream data for object 6 0: Not a JPEG file: starts with 0x77 0x77
-WARNING: bad-jpeg.pdf (file position 735): stream will be re-processed without filtering to avoid data loss
+WARNING: bad-jpeg.pdf (offset 735): error decoding stream data for object 6 0: Not a JPEG file: starts with 0x77 0x77
+WARNING: bad-jpeg.pdf (offset 735): stream will be re-processed without filtering to avoid data loss
diff --git a/qpdf/qtest/qpdf/bad-jpeg-show.out b/qpdf/qtest/qpdf/bad-jpeg-show.out
index 915060a4..f1b0bcc7 100644
--- a/qpdf/qtest/qpdf/bad-jpeg-show.out
+++ b/qpdf/qtest/qpdf/bad-jpeg-show.out
@@ -1,2 +1,2 @@
-WARNING: bad-jpeg.pdf (file position 735): error decoding stream data for object 6 0: Not a JPEG file: starts with 0x77 0x77
+WARNING: bad-jpeg.pdf (offset 735): error decoding stream data for object 6 0: Not a JPEG file: starts with 0x77 0x77
qpdf: operation succeeded with warnings; resulting file may have some problems
diff --git a/qpdf/qtest/qpdf/bad-jpeg.out b/qpdf/qtest/qpdf/bad-jpeg.out
index 4a7b6bd1..32478c2a 100644
--- a/qpdf/qtest/qpdf/bad-jpeg.out
+++ b/qpdf/qtest/qpdf/bad-jpeg.out
@@ -1,3 +1,3 @@
-WARNING: bad-jpeg.pdf (file position 735): error decoding stream data for object 6 0: Not a JPEG file: starts with 0x77 0x77
-WARNING: bad-jpeg.pdf (file position 735): stream will be re-processed without filtering to avoid data loss
+WARNING: bad-jpeg.pdf (offset 735): error decoding stream data for object 6 0: Not a JPEG file: starts with 0x77 0x77
+WARNING: bad-jpeg.pdf (offset 735): stream will be re-processed without filtering to avoid data loss
qpdf: operation succeeded with warnings; resulting file may have some problems
diff --git a/qpdf/qtest/qpdf/bad-xref-entry-corrected.out b/qpdf/qtest/qpdf/bad-xref-entry-corrected.out
index 258c18a7..0fbac406 100644
--- a/qpdf/qtest/qpdf/bad-xref-entry-corrected.out
+++ b/qpdf/qtest/qpdf/bad-xref-entry-corrected.out
@@ -3,7 +3,7 @@ PDF Version: 1.3
File is not encrypted
File is not linearized
WARNING: bad-xref-entry.pdf: file is damaged
-WARNING: bad-xref-entry.pdf (object 5 0, file position 580): expected n n obj
+WARNING: bad-xref-entry.pdf (object 5 0, offset 580): expected n n obj
WARNING: bad-xref-entry.pdf: Attempting to reconstruct cross-reference table
1/0: uncompressed; offset = 52
2/0: uncompressed; offset = 133
diff --git a/qpdf/qtest/qpdf/bad10-recover.out b/qpdf/qtest/qpdf/bad10-recover.out
index 32b12612..f503db34 100644
--- a/qpdf/qtest/qpdf/bad10-recover.out
+++ b/qpdf/qtest/qpdf/bad10-recover.out
@@ -1,5 +1,5 @@
WARNING: bad10.pdf: file is damaged
-WARNING: bad10.pdf (trailer, file position 712): /Size key in trailer dictionary is not an integer
+WARNING: bad10.pdf (trailer, offset 712): /Size key in trailer dictionary is not an integer
WARNING: bad10.pdf: Attempting to reconstruct cross-reference table
/QTest is implicit
/QTest is direct and has type null (2)
diff --git a/qpdf/qtest/qpdf/bad10.out b/qpdf/qtest/qpdf/bad10.out
index 2545a721..66168bc4 100644
--- a/qpdf/qtest/qpdf/bad10.out
+++ b/qpdf/qtest/qpdf/bad10.out
@@ -1 +1 @@
-bad10.pdf (trailer, file position 712): /Size key in trailer dictionary is not an integer
+bad10.pdf (trailer, offset 712): /Size key in trailer dictionary is not an integer
diff --git a/qpdf/qtest/qpdf/bad11-recover.out b/qpdf/qtest/qpdf/bad11-recover.out
index 82e891b0..05ed3eec 100644
--- a/qpdf/qtest/qpdf/bad11-recover.out
+++ b/qpdf/qtest/qpdf/bad11-recover.out
@@ -1,5 +1,5 @@
WARNING: bad11.pdf: file is damaged
-WARNING: bad11.pdf (trailer, file position 905): /Prev key in trailer dictionary is not an integer
+WARNING: bad11.pdf (trailer, offset 905): /Prev key in trailer dictionary is not an integer
WARNING: bad11.pdf: Attempting to reconstruct cross-reference table
/QTest is implicit
/QTest is direct and has type null (2)
diff --git a/qpdf/qtest/qpdf/bad11.out b/qpdf/qtest/qpdf/bad11.out
index 78ad060a..e06b8849 100644
--- a/qpdf/qtest/qpdf/bad11.out
+++ b/qpdf/qtest/qpdf/bad11.out
@@ -1 +1 @@
-bad11.pdf (trailer, file position 905): /Prev key in trailer dictionary is not an integer
+bad11.pdf (trailer, offset 905): /Prev key in trailer dictionary is not an integer
diff --git a/qpdf/qtest/qpdf/bad13-recover.out b/qpdf/qtest/qpdf/bad13-recover.out
index 862fac7b..d0ab5199 100644
--- a/qpdf/qtest/qpdf/bad13-recover.out
+++ b/qpdf/qtest/qpdf/bad13-recover.out
@@ -1,4 +1,4 @@
-WARNING: bad13.pdf (trailer, file position 753): treating unexpected brace token as null
+WARNING: bad13.pdf (trailer, offset 753): treating unexpected brace token as null
/QTest is implicit
/QTest is direct and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad13.out b/qpdf/qtest/qpdf/bad13.out
index da69c50c..0decaebb 100644
--- a/qpdf/qtest/qpdf/bad13.out
+++ b/qpdf/qtest/qpdf/bad13.out
@@ -1,4 +1,4 @@
-WARNING: bad13.pdf (trailer, file position 753): treating unexpected brace token as null
+WARNING: bad13.pdf (trailer, offset 753): treating unexpected brace token as null
/QTest is implicit
/QTest is direct and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad14-recover.out b/qpdf/qtest/qpdf/bad14-recover.out
index 7cc59a67..bc562d1d 100644
--- a/qpdf/qtest/qpdf/bad14-recover.out
+++ b/qpdf/qtest/qpdf/bad14-recover.out
@@ -1,4 +1,4 @@
-WARNING: bad14.pdf (trailer, file position 753): treating unexpected brace token as null
+WARNING: bad14.pdf (trailer, offset 753): treating unexpected brace token as null
/QTest is implicit
/QTest is direct and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad14.out b/qpdf/qtest/qpdf/bad14.out
index cbb403ba..114ba090 100644
--- a/qpdf/qtest/qpdf/bad14.out
+++ b/qpdf/qtest/qpdf/bad14.out
@@ -1,4 +1,4 @@
-WARNING: bad14.pdf (trailer, file position 753): treating unexpected brace token as null
+WARNING: bad14.pdf (trailer, offset 753): treating unexpected brace token as null
/QTest is implicit
/QTest is direct and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad15-recover.out b/qpdf/qtest/qpdf/bad15-recover.out
index d1ce2b90..0ea776b9 100644
--- a/qpdf/qtest/qpdf/bad15-recover.out
+++ b/qpdf/qtest/qpdf/bad15-recover.out
@@ -1,4 +1,4 @@
-WARNING: bad15.pdf (trailer, file position 753): treating unexpected array close token as null
+WARNING: bad15.pdf (trailer, offset 753): treating unexpected array close token as null
/QTest is implicit
/QTest is direct and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad15.out b/qpdf/qtest/qpdf/bad15.out
index 49de89c7..8a7506b2 100644
--- a/qpdf/qtest/qpdf/bad15.out
+++ b/qpdf/qtest/qpdf/bad15.out
@@ -1,4 +1,4 @@
-WARNING: bad15.pdf (trailer, file position 753): treating unexpected array close token as null
+WARNING: bad15.pdf (trailer, offset 753): treating unexpected array close token as null
/QTest is implicit
/QTest is direct and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad16-recover.out b/qpdf/qtest/qpdf/bad16-recover.out
index 6a1ac6ea..5ed231d8 100644
--- a/qpdf/qtest/qpdf/bad16-recover.out
+++ b/qpdf/qtest/qpdf/bad16-recover.out
@@ -1,10 +1,10 @@
-WARNING: bad16.pdf (trailer, file position 753): unexpected dictionary close token
-WARNING: bad16.pdf (trailer, file position 756): unexpected dictionary close token
-WARNING: bad16.pdf (trailer, file position 759): unknown token while reading object; treating as string
+WARNING: bad16.pdf (trailer, offset 753): unexpected dictionary close token
+WARNING: bad16.pdf (trailer, offset 756): unexpected dictionary close token
+WARNING: bad16.pdf (trailer, offset 759): unknown token while reading object; treating as string
WARNING: bad16.pdf: file is damaged
-WARNING: bad16.pdf (trailer, file position 779): unexpected EOF
+WARNING: bad16.pdf (trailer, offset 779): unexpected EOF
WARNING: bad16.pdf: Attempting to reconstruct cross-reference table
-WARNING: bad16.pdf (trailer, file position 753): unexpected dictionary close token
-WARNING: bad16.pdf (trailer, file position 756): unexpected dictionary close token
-WARNING: bad16.pdf (trailer, file position 759): unknown token while reading object; treating as string
-bad16.pdf (trailer, file position 779): unexpected EOF
+WARNING: bad16.pdf (trailer, offset 753): unexpected dictionary close token
+WARNING: bad16.pdf (trailer, offset 756): unexpected dictionary close token
+WARNING: bad16.pdf (trailer, offset 759): unknown token while reading object; treating as string
+bad16.pdf (trailer, offset 779): unexpected EOF
diff --git a/qpdf/qtest/qpdf/bad16.out b/qpdf/qtest/qpdf/bad16.out
index 7efc2b9b..1018bd7b 100644
--- a/qpdf/qtest/qpdf/bad16.out
+++ b/qpdf/qtest/qpdf/bad16.out
@@ -1,4 +1,4 @@
-WARNING: bad16.pdf (trailer, file position 753): unexpected dictionary close token
-WARNING: bad16.pdf (trailer, file position 756): unexpected dictionary close token
-WARNING: bad16.pdf (trailer, file position 759): unknown token while reading object; treating as string
-bad16.pdf (trailer, file position 779): unexpected EOF
+WARNING: bad16.pdf (trailer, offset 753): unexpected dictionary close token
+WARNING: bad16.pdf (trailer, offset 756): unexpected dictionary close token
+WARNING: bad16.pdf (trailer, offset 759): unknown token while reading object; treating as string
+bad16.pdf (trailer, offset 779): unexpected EOF
diff --git a/qpdf/qtest/qpdf/bad17-recover.out b/qpdf/qtest/qpdf/bad17-recover.out
index f6f4dfa0..8fed7e43 100644
--- a/qpdf/qtest/qpdf/bad17-recover.out
+++ b/qpdf/qtest/qpdf/bad17-recover.out
@@ -1,4 +1,4 @@
-WARNING: bad17.pdf (trailer, file position 715): dictionary ended prematurely; using null as value for last key
+WARNING: bad17.pdf (trailer, offset 715): dictionary ended prematurely; using null as value for last key
/QTest is implicit
/QTest is direct and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad17.out b/qpdf/qtest/qpdf/bad17.out
index 5744fc29..189daef2 100644
--- a/qpdf/qtest/qpdf/bad17.out
+++ b/qpdf/qtest/qpdf/bad17.out
@@ -1,4 +1,4 @@
-WARNING: bad17.pdf (trailer, file position 715): dictionary ended prematurely; using null as value for last key
+WARNING: bad17.pdf (trailer, offset 715): dictionary ended prematurely; using null as value for last key
/QTest is implicit
/QTest is direct and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad18-recover.out b/qpdf/qtest/qpdf/bad18-recover.out
index b3128041..c14bc1f3 100644
--- a/qpdf/qtest/qpdf/bad18-recover.out
+++ b/qpdf/qtest/qpdf/bad18-recover.out
@@ -1,4 +1,4 @@
WARNING: bad18.pdf: file is damaged
-WARNING: bad18.pdf (trailer, file position 753): unexpected )
+WARNING: bad18.pdf (trailer, offset 753): unexpected )
WARNING: bad18.pdf: Attempting to reconstruct cross-reference table
-bad18.pdf (trailer, file position 753): unexpected )
+bad18.pdf (trailer, offset 753): unexpected )
diff --git a/qpdf/qtest/qpdf/bad18.out b/qpdf/qtest/qpdf/bad18.out
index b5ea0907..b6bce222 100644
--- a/qpdf/qtest/qpdf/bad18.out
+++ b/qpdf/qtest/qpdf/bad18.out
@@ -1 +1 @@
-bad18.pdf (trailer, file position 753): unexpected )
+bad18.pdf (trailer, offset 753): unexpected )
diff --git a/qpdf/qtest/qpdf/bad19-recover.out b/qpdf/qtest/qpdf/bad19-recover.out
index 133dcb9a..ced8f51a 100644
--- a/qpdf/qtest/qpdf/bad19-recover.out
+++ b/qpdf/qtest/qpdf/bad19-recover.out
@@ -1,4 +1,4 @@
WARNING: bad19.pdf: file is damaged
-WARNING: bad19.pdf (trailer, file position 753): unexpected >
+WARNING: bad19.pdf (trailer, offset 753): unexpected >
WARNING: bad19.pdf: Attempting to reconstruct cross-reference table
-bad19.pdf (trailer, file position 753): unexpected >
+bad19.pdf (trailer, offset 753): unexpected >
diff --git a/qpdf/qtest/qpdf/bad19.out b/qpdf/qtest/qpdf/bad19.out
index 3ff479a1..36eda04f 100644
--- a/qpdf/qtest/qpdf/bad19.out
+++ b/qpdf/qtest/qpdf/bad19.out
@@ -1 +1 @@
-bad19.pdf (trailer, file position 753): unexpected >
+bad19.pdf (trailer, offset 753): unexpected >
diff --git a/qpdf/qtest/qpdf/bad20-recover.out b/qpdf/qtest/qpdf/bad20-recover.out
index d9e35664..8411d5a9 100644
--- a/qpdf/qtest/qpdf/bad20-recover.out
+++ b/qpdf/qtest/qpdf/bad20-recover.out
@@ -1,4 +1,4 @@
WARNING: bad20.pdf: file is damaged
-WARNING: bad20.pdf (trailer, file position 753): invalid character (q) in hexstring
+WARNING: bad20.pdf (trailer, offset 753): invalid character (q) in hexstring
WARNING: bad20.pdf: Attempting to reconstruct cross-reference table
-bad20.pdf (trailer, file position 753): invalid character (q) in hexstring
+bad20.pdf (trailer, offset 753): invalid character (q) in hexstring
diff --git a/qpdf/qtest/qpdf/bad20.out b/qpdf/qtest/qpdf/bad20.out
index 0b70ae18..8cdad1f1 100644
--- a/qpdf/qtest/qpdf/bad20.out
+++ b/qpdf/qtest/qpdf/bad20.out
@@ -1 +1 @@
-bad20.pdf (trailer, file position 753): invalid character (q) in hexstring
+bad20.pdf (trailer, offset 753): invalid character (q) in hexstring
diff --git a/qpdf/qtest/qpdf/bad21-recover.out b/qpdf/qtest/qpdf/bad21-recover.out
index 73d2e895..ff483eff 100644
--- a/qpdf/qtest/qpdf/bad21-recover.out
+++ b/qpdf/qtest/qpdf/bad21-recover.out
@@ -1,4 +1,4 @@
WARNING: bad21.pdf: file is damaged
-WARNING: bad21.pdf (trailer, file position 742): invalid name token
+WARNING: bad21.pdf (trailer, offset 742): invalid name token
WARNING: bad21.pdf: Attempting to reconstruct cross-reference table
-bad21.pdf (trailer, file position 742): invalid name token
+bad21.pdf (trailer, offset 742): invalid name token
diff --git a/qpdf/qtest/qpdf/bad21.out b/qpdf/qtest/qpdf/bad21.out
index 055484cf..b1a57fef 100644
--- a/qpdf/qtest/qpdf/bad21.out
+++ b/qpdf/qtest/qpdf/bad21.out
@@ -1 +1 @@
-bad21.pdf (trailer, file position 742): invalid name token
+bad21.pdf (trailer, offset 742): invalid name token
diff --git a/qpdf/qtest/qpdf/bad22-recover.out b/qpdf/qtest/qpdf/bad22-recover.out
index 366eb7cb..489cf19a 100644
--- a/qpdf/qtest/qpdf/bad22-recover.out
+++ b/qpdf/qtest/qpdf/bad22-recover.out
@@ -1,6 +1,6 @@
-WARNING: bad22.pdf (object 4 0, file position 314): stream dictionary lacks /Length key
-WARNING: bad22.pdf (object 4 0, file position 341): attempting to recover stream length
-WARNING: bad22.pdf (object 4 0, file position 341): recovered stream length: 44
+WARNING: bad22.pdf (object 4 0, offset 314): stream dictionary lacks /Length key
+WARNING: bad22.pdf (object 4 0, offset 341): attempting to recover stream length
+WARNING: bad22.pdf (object 4 0, offset 341): recovered stream length: 44
/QTest is indirect and has type stream (10)
/QTest is a stream. Dictionary: << /Qength 44 >>
Raw stream data:
diff --git a/qpdf/qtest/qpdf/bad22.out b/qpdf/qtest/qpdf/bad22.out
index 73d081e4..d52cea7e 100644
--- a/qpdf/qtest/qpdf/bad22.out
+++ b/qpdf/qtest/qpdf/bad22.out
@@ -1,4 +1,4 @@
-WARNING: bad22.pdf (object 4 0, file position 314): stream dictionary lacks /Length key
+WARNING: bad22.pdf (object 4 0, offset 314): stream dictionary lacks /Length key
/QTest is implicit
/QTest is indirect and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad23-recover.out b/qpdf/qtest/qpdf/bad23-recover.out
index 52fa2ee4..3becdd17 100644
--- a/qpdf/qtest/qpdf/bad23-recover.out
+++ b/qpdf/qtest/qpdf/bad23-recover.out
@@ -1,6 +1,6 @@
-WARNING: bad23.pdf (object 4 0, file position 314): /Length key in stream dictionary is not an integer
-WARNING: bad23.pdf (object 4 0, file position 341): attempting to recover stream length
-WARNING: bad23.pdf (object 4 0, file position 341): recovered stream length: 44
+WARNING: bad23.pdf (object 4 0, offset 314): /Length key in stream dictionary is not an integer
+WARNING: bad23.pdf (object 4 0, offset 341): attempting to recover stream length
+WARNING: bad23.pdf (object 4 0, offset 341): recovered stream length: 44
/QTest is indirect and has type stream (10)
/QTest is a stream. Dictionary: << /Length () >>
Raw stream data:
diff --git a/qpdf/qtest/qpdf/bad23.out b/qpdf/qtest/qpdf/bad23.out
index 9bc1bdc6..22ceae1a 100644
--- a/qpdf/qtest/qpdf/bad23.out
+++ b/qpdf/qtest/qpdf/bad23.out
@@ -1,4 +1,4 @@
-WARNING: bad23.pdf (object 4 0, file position 314): /Length key in stream dictionary is not an integer
+WARNING: bad23.pdf (object 4 0, offset 314): /Length key in stream dictionary is not an integer
/QTest is implicit
/QTest is indirect and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad24-recover.out b/qpdf/qtest/qpdf/bad24-recover.out
index 8d7fd87c..ef03d515 100644
--- a/qpdf/qtest/qpdf/bad24-recover.out
+++ b/qpdf/qtest/qpdf/bad24-recover.out
@@ -1,6 +1,6 @@
-WARNING: bad24.pdf (object 4 0, file position 385): expected endstream
-WARNING: bad24.pdf (object 4 0, file position 341): attempting to recover stream length
-WARNING: bad24.pdf (object 4 0, file position 341): recovered stream length: 54
+WARNING: bad24.pdf (object 4 0, offset 385): expected endstream
+WARNING: bad24.pdf (object 4 0, offset 341): attempting to recover stream length
+WARNING: bad24.pdf (object 4 0, offset 341): recovered stream length: 54
/QTest is indirect and has type stream (10)
/QTest is a stream. Dictionary: << /Length 44 >>
Raw stream data:
diff --git a/qpdf/qtest/qpdf/bad24.out b/qpdf/qtest/qpdf/bad24.out
index 0a4dc8e8..b54df295 100644
--- a/qpdf/qtest/qpdf/bad24.out
+++ b/qpdf/qtest/qpdf/bad24.out
@@ -1,4 +1,4 @@
-WARNING: bad24.pdf (object 4 0, file position 385): expected endstream
+WARNING: bad24.pdf (object 4 0, offset 385): expected endstream
/QTest is implicit
/QTest is indirect and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad25-recover.out b/qpdf/qtest/qpdf/bad25-recover.out
index 6e40c85b..1afa4371 100644
--- a/qpdf/qtest/qpdf/bad25-recover.out
+++ b/qpdf/qtest/qpdf/bad25-recover.out
@@ -1,5 +1,5 @@
WARNING: bad25.pdf: file is damaged
-WARNING: bad25.pdf (object 4 0, file position 307): expected n n obj
+WARNING: bad25.pdf (object 4 0, offset 307): expected n n obj
WARNING: bad25.pdf: Attempting to reconstruct cross-reference table
WARNING: bad25.pdf: object 4 0 not found in file after regenerating cross reference table
/QTest is implicit
diff --git a/qpdf/qtest/qpdf/bad25.out b/qpdf/qtest/qpdf/bad25.out
index d6b13e4a..e44a07d0 100644
--- a/qpdf/qtest/qpdf/bad25.out
+++ b/qpdf/qtest/qpdf/bad25.out
@@ -1,4 +1,4 @@
-WARNING: bad25.pdf (object 4 0, file position 307): expected n n obj
+WARNING: bad25.pdf (object 4 0, offset 307): expected n n obj
/QTest is implicit
/QTest is indirect and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad26-recover.out b/qpdf/qtest/qpdf/bad26-recover.out
index ef1c02eb..0423ff4a 100644
--- a/qpdf/qtest/qpdf/bad26-recover.out
+++ b/qpdf/qtest/qpdf/bad26-recover.out
@@ -1,5 +1,5 @@
WARNING: bad26.pdf: file is damaged
-WARNING: bad26.pdf (object 4 0, file position 307): expected n n obj
+WARNING: bad26.pdf (object 4 0, offset 307): expected n n obj
WARNING: bad26.pdf: Attempting to reconstruct cross-reference table
WARNING: bad26.pdf: object 4 0 not found in file after regenerating cross reference table
/QTest is implicit
diff --git a/qpdf/qtest/qpdf/bad26.out b/qpdf/qtest/qpdf/bad26.out
index 48263e57..c661f567 100644
--- a/qpdf/qtest/qpdf/bad26.out
+++ b/qpdf/qtest/qpdf/bad26.out
@@ -1,4 +1,4 @@
-WARNING: bad26.pdf (object 4 0, file position 307): expected n n obj
+WARNING: bad26.pdf (object 4 0, offset 307): expected n n obj
/QTest is implicit
/QTest is indirect and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad27-recover.out b/qpdf/qtest/qpdf/bad27-recover.out
index b0967b34..af07fa17 100644
--- a/qpdf/qtest/qpdf/bad27-recover.out
+++ b/qpdf/qtest/qpdf/bad27-recover.out
@@ -1,5 +1,5 @@
WARNING: bad27.pdf: file is damaged
-WARNING: bad27.pdf (object 4 0, file position 307): expected n n obj
+WARNING: bad27.pdf (object 4 0, offset 307): expected n n obj
WARNING: bad27.pdf: Attempting to reconstruct cross-reference table
WARNING: bad27.pdf: object 4 0 not found in file after regenerating cross reference table
/QTest is implicit
diff --git a/qpdf/qtest/qpdf/bad27.out b/qpdf/qtest/qpdf/bad27.out
index 4f38cca9..10633aad 100644
--- a/qpdf/qtest/qpdf/bad27.out
+++ b/qpdf/qtest/qpdf/bad27.out
@@ -1,4 +1,4 @@
-WARNING: bad27.pdf (object 4 0, file position 307): expected n n obj
+WARNING: bad27.pdf (object 4 0, offset 307): expected n n obj
/QTest is implicit
/QTest is indirect and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad28-recover.out b/qpdf/qtest/qpdf/bad28-recover.out
index ab152518..d3b6bfe4 100644
--- a/qpdf/qtest/qpdf/bad28-recover.out
+++ b/qpdf/qtest/qpdf/bad28-recover.out
@@ -1,4 +1,4 @@
-WARNING: bad28.pdf (object 4 0, file position 395): expected endobj
+WARNING: bad28.pdf (object 4 0, offset 395): expected endobj
/QTest is indirect and has type stream (10)
/QTest is a stream. Dictionary: << /Length 44 >>
Raw stream data:
diff --git a/qpdf/qtest/qpdf/bad28.out b/qpdf/qtest/qpdf/bad28.out
index fb02944e..67f26a98 100644
--- a/qpdf/qtest/qpdf/bad28.out
+++ b/qpdf/qtest/qpdf/bad28.out
@@ -1,4 +1,4 @@
-WARNING: bad28.pdf (object 4 0, file position 395): expected endobj
+WARNING: bad28.pdf (object 4 0, offset 395): expected endobj
/QTest is indirect and has type stream (10)
/QTest is a stream. Dictionary: << /Length 44 >>
Raw stream data:
diff --git a/qpdf/qtest/qpdf/bad29-recover.out b/qpdf/qtest/qpdf/bad29-recover.out
index e027db9e..bc6c9b09 100644
--- a/qpdf/qtest/qpdf/bad29-recover.out
+++ b/qpdf/qtest/qpdf/bad29-recover.out
@@ -1,4 +1,4 @@
WARNING: bad29.pdf: file is damaged
-WARNING: bad29.pdf (trailer, file position 742): null character not allowed in name token
+WARNING: bad29.pdf (trailer, offset 742): null character not allowed in name token
WARNING: bad29.pdf: Attempting to reconstruct cross-reference table
-bad29.pdf (trailer, file position 742): null character not allowed in name token
+bad29.pdf (trailer, offset 742): null character not allowed in name token
diff --git a/qpdf/qtest/qpdf/bad29.out b/qpdf/qtest/qpdf/bad29.out
index 7d4189ec..e9ded462 100644
--- a/qpdf/qtest/qpdf/bad29.out
+++ b/qpdf/qtest/qpdf/bad29.out
@@ -1 +1 @@
-bad29.pdf (trailer, file position 742): null character not allowed in name token
+bad29.pdf (trailer, offset 742): null character not allowed in name token
diff --git a/qpdf/qtest/qpdf/bad3-recover.out b/qpdf/qtest/qpdf/bad3-recover.out
index 9d6438fa..1e84bc17 100644
--- a/qpdf/qtest/qpdf/bad3-recover.out
+++ b/qpdf/qtest/qpdf/bad3-recover.out
@@ -1,5 +1,5 @@
WARNING: bad3.pdf: file is damaged
-WARNING: bad3.pdf (file position 542): xref not found
+WARNING: bad3.pdf (offset 542): xref not found
WARNING: bad3.pdf: Attempting to reconstruct cross-reference table
/QTest is implicit
/QTest is direct and has type null (2)
diff --git a/qpdf/qtest/qpdf/bad3.out b/qpdf/qtest/qpdf/bad3.out
index ef99562b..58f15ae7 100644
--- a/qpdf/qtest/qpdf/bad3.out
+++ b/qpdf/qtest/qpdf/bad3.out
@@ -1 +1 @@
-bad3.pdf (file position 542): xref not found
+bad3.pdf (offset 542): xref not found
diff --git a/qpdf/qtest/qpdf/bad30-recover.out b/qpdf/qtest/qpdf/bad30-recover.out
index dc59da20..77800f80 100644
--- a/qpdf/qtest/qpdf/bad30-recover.out
+++ b/qpdf/qtest/qpdf/bad30-recover.out
@@ -3,7 +3,7 @@
Raw stream data:
xœ%11 û¼b;tà4| wXIDì Øå÷8G·«Í>rQ¨uŠ OÒ êEŒ:©IWìÃPlíµII)Ãr´p4~;§ÎAs/òÒ…jcúú¾÷Žs§åözû»žT.?®uŽæ§<Ž¼…Ð*6ä
Uncompressed stream data:
-WARNING: bad30.pdf (file position 629): stream filter type is not name or array
+WARNING: bad30.pdf (offset 629): stream filter type is not name or array
Stream data is not filterable.
unparse: 7 0 R
unparseResolved: 7 0 R
diff --git a/qpdf/qtest/qpdf/bad30.out b/qpdf/qtest/qpdf/bad30.out
index fc0780c6..88bc6d59 100644
--- a/qpdf/qtest/qpdf/bad30.out
+++ b/qpdf/qtest/qpdf/bad30.out
@@ -3,7 +3,7 @@
Raw stream data:
xœ%11 û¼b;tà4| wXIDì Øå÷8G·«Í>rQ¨uŠ OÒ êEŒ:©IWìÃPlíµII)Ãr´p4~;§ÎAs/òÒ…jcúú¾÷Žs§åözû»žT.?®uŽæ§<Ž¼…Ð*6ä
Uncompressed stream data:
-WARNING: bad30.pdf (file position 629): stream filter type is not name or array
+WARNING: bad30.pdf (offset 629): stream filter type is not name or array
Stream data is not filterable.
unparse: 7 0 R
unparseResolved: 7 0 R
diff --git a/qpdf/qtest/qpdf/bad32-recover.out b/qpdf/qtest/qpdf/bad32-recover.out
index 4f8d5257..dda02f7c 100644
--- a/qpdf/qtest/qpdf/bad32-recover.out
+++ b/qpdf/qtest/qpdf/bad32-recover.out
@@ -1,5 +1,5 @@
WARNING: bad32.pdf: file is damaged
-WARNING: bad32.pdf (object 4 0, file position 307): expected 4 0 obj
+WARNING: bad32.pdf (object 4 0, offset 307): expected 4 0 obj
WARNING: bad32.pdf: Attempting to reconstruct cross-reference table
WARNING: bad32.pdf: object 4 0 not found in file after regenerating cross reference table
/QTest is implicit
diff --git a/qpdf/qtest/qpdf/bad32.out b/qpdf/qtest/qpdf/bad32.out
index 9b37770f..23ecccc8 100644
--- a/qpdf/qtest/qpdf/bad32.out
+++ b/qpdf/qtest/qpdf/bad32.out
@@ -1,4 +1,4 @@
-WARNING: bad32.pdf (object 4 0, file position 307): expected 4 0 obj
+WARNING: bad32.pdf (object 4 0, offset 307): expected 4 0 obj
/QTest is implicit
/QTest is indirect and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad33-recover.out b/qpdf/qtest/qpdf/bad33-recover.out
index 2269cd41..92e5a5cf 100644
--- a/qpdf/qtest/qpdf/bad33-recover.out
+++ b/qpdf/qtest/qpdf/bad33-recover.out
@@ -1,12 +1,12 @@
WARNING: bad33.pdf: file is damaged
-WARNING: bad33.pdf (file position 1771): xref not found
+WARNING: bad33.pdf (offset 1771): xref not found
WARNING: bad33.pdf: Attempting to reconstruct cross-reference table
/QTest is indirect and has type stream (10)
/QTest is a stream. Dictionary: << /Filter (FlateDecode) /Length 123 >>
Raw stream data:
xœ%11 û¼b;tà4| wXIDì Øå÷8G·«Í>rQ¨uŠ OÒ êEŒ:©IWìÃPlíµII)Ãr´p4~;§ÎAs/òÒ…jcúú¾÷Žs§åözû»žT.?®uŽæ§<Ž¼…Ð*6ä
Uncompressed stream data:
-WARNING: bad33.pdf (file position 629): stream filter type is not name or array
+WARNING: bad33.pdf (offset 629): stream filter type is not name or array
Stream data is not filterable.
unparse: 7 0 R
unparseResolved: 7 0 R
diff --git a/qpdf/qtest/qpdf/bad33.out b/qpdf/qtest/qpdf/bad33.out
index 9057b06c..ca2c07e1 100644
--- a/qpdf/qtest/qpdf/bad33.out
+++ b/qpdf/qtest/qpdf/bad33.out
@@ -1 +1 @@
-bad33.pdf (file position 1771): xref not found
+bad33.pdf (offset 1771): xref not found
diff --git a/qpdf/qtest/qpdf/bad34-recover.out b/qpdf/qtest/qpdf/bad34-recover.out
index 3343be70..4cee51be 100644
--- a/qpdf/qtest/qpdf/bad34-recover.out
+++ b/qpdf/qtest/qpdf/bad34-recover.out
@@ -1,5 +1,5 @@
WARNING: bad34.pdf: file is damaged
-WARNING: bad34.pdf (object 4 0, file position 322): expected n n obj
+WARNING: bad34.pdf (object 4 0, offset 322): expected n n obj
WARNING: bad34.pdf: Attempting to reconstruct cross-reference table
/QTest is indirect and has type stream (10)
/QTest is a stream. Dictionary: << /Length 44 /Quack 9 0 R >>
diff --git a/qpdf/qtest/qpdf/bad34.out b/qpdf/qtest/qpdf/bad34.out
index 7ba79167..4252efb0 100644
--- a/qpdf/qtest/qpdf/bad34.out
+++ b/qpdf/qtest/qpdf/bad34.out
@@ -1,4 +1,4 @@
-WARNING: bad34.pdf (object 4 0, file position 322): expected n n obj
+WARNING: bad34.pdf (object 4 0, offset 322): expected n n obj
/QTest is implicit
/QTest is indirect and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad35-recover.out b/qpdf/qtest/qpdf/bad35-recover.out
index dec903ec..42336118 100644
--- a/qpdf/qtest/qpdf/bad35-recover.out
+++ b/qpdf/qtest/qpdf/bad35-recover.out
@@ -1,2 +1,2 @@
-WARNING: bad35.pdf (object 1 0, file position 521): supposed object stream 1 has wrong type
-bad35.pdf (file position 521): unable to find /Root dictionary
+WARNING: bad35.pdf (object 1 0, offset 521): supposed object stream 1 has wrong type
+bad35.pdf (offset 521): unable to find /Root dictionary
diff --git a/qpdf/qtest/qpdf/bad35.out b/qpdf/qtest/qpdf/bad35.out
index dec903ec..42336118 100644
--- a/qpdf/qtest/qpdf/bad35.out
+++ b/qpdf/qtest/qpdf/bad35.out
@@ -1,2 +1,2 @@
-WARNING: bad35.pdf (object 1 0, file position 521): supposed object stream 1 has wrong type
-bad35.pdf (file position 521): unable to find /Root dictionary
+WARNING: bad35.pdf (object 1 0, offset 521): supposed object stream 1 has wrong type
+bad35.pdf (offset 521): unable to find /Root dictionary
diff --git a/qpdf/qtest/qpdf/bad36-recover.out b/qpdf/qtest/qpdf/bad36-recover.out
index 59669a8a..ac05acd9 100644
--- a/qpdf/qtest/qpdf/bad36-recover.out
+++ b/qpdf/qtest/qpdf/bad36-recover.out
@@ -1,6 +1,6 @@
-WARNING: bad36.pdf (trailer, file position 764): unknown token while reading object; treating as string
-WARNING: bad36.pdf (trailer, file position 715): expected dictionary key but found non-name object; inserting key /QPDFFake2
-WARNING: bad36.pdf (trailer, file position 715): dictionary ended prematurely; using null as value for last key
+WARNING: bad36.pdf (trailer, offset 764): unknown token while reading object; treating as string
+WARNING: bad36.pdf (trailer, offset 715): expected dictionary key but found non-name object; inserting key /QPDFFake2
+WARNING: bad36.pdf (trailer, offset 715): dictionary ended prematurely; using null as value for last key
/QTest is implicit
/QTest is direct and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad36.out b/qpdf/qtest/qpdf/bad36.out
index f137afd9..cee3c286 100644
--- a/qpdf/qtest/qpdf/bad36.out
+++ b/qpdf/qtest/qpdf/bad36.out
@@ -1,6 +1,6 @@
-WARNING: bad36.pdf (trailer, file position 764): unknown token while reading object; treating as string
-WARNING: bad36.pdf (trailer, file position 715): expected dictionary key but found non-name object; inserting key /QPDFFake2
-WARNING: bad36.pdf (trailer, file position 715): dictionary ended prematurely; using null as value for last key
+WARNING: bad36.pdf (trailer, offset 764): unknown token while reading object; treating as string
+WARNING: bad36.pdf (trailer, offset 715): expected dictionary key but found non-name object; inserting key /QPDFFake2
+WARNING: bad36.pdf (trailer, offset 715): dictionary ended prematurely; using null as value for last key
/QTest is implicit
/QTest is direct and has type null (2)
/QTest is null
diff --git a/qpdf/qtest/qpdf/bad4-recover.out b/qpdf/qtest/qpdf/bad4-recover.out
index 2aa06fbe..54d106c6 100644
--- a/qpdf/qtest/qpdf/bad4-recover.out
+++ b/qpdf/qtest/qpdf/bad4-recover.out
@@ -1,5 +1,5 @@
WARNING: bad4.pdf: file is damaged
-WARNING: bad4.pdf (xref table, file position 547): xref syntax invalid
+WARNING: bad4.pdf (xref table, offset 547): xref syntax invalid
WARNING: bad4.pdf: Attempting to reconstruct cross-reference table
/QTest is implicit
/QTest is direct and has type null (2)
diff --git a/qpdf/qtest/qpdf/bad4.out b/qpdf/qtest/qpdf/bad4.out
index fbfde227..d5590e0c 100644
--- a/qpdf/qtest/qpdf/bad4.out
+++ b/qpdf/qtest/qpdf/bad4.out
@@ -1 +1 @@
-bad4.pdf (xref table, file position 547): xref syntax invalid
+bad4.pdf (xref table, offset 547): xref syntax invalid
diff --git a/qpdf/qtest/qpdf/bad5-recover.out b/qpdf/qtest/qpdf/bad5-recover.out
index 7a0fd69d..f01fe4d4 100644
--- a/qpdf/qtest/qpdf/bad5-recover.out
+++ b/qpdf/qtest/qpdf/bad5-recover.out
@@ -1,5 +1,5 @@
WARNING: bad5.pdf: file is damaged
-WARNING: bad5.pdf (xref table, file position 591): invalid xref entry (obj=2)
+WARNING: bad5.pdf (xref table, offset 591): invalid xref entry (obj=2)
WARNING: bad5.pdf: Attempting to reconstruct cross-reference table
/QTest is implicit
/QTest is direct and has type null (2)
diff --git a/qpdf/qtest/qpdf/bad5.out b/qpdf/qtest/qpdf/bad5.out
index 29556195..6f1e6b24 100644
--- a/qpdf/qtest/qpdf/bad5.out
+++ b/qpdf/qtest/qpdf/bad5.out
@@ -1 +1 @@
-bad5.pdf (xref table, file position 591): invalid xref entry (obj=2)
+bad5.pdf (xref table, offset 591): invalid xref entry (obj=2)
diff --git a/qpdf/qtest/qpdf/bad7-recover.out b/qpdf/qtest/qpdf/bad7-recover.out
index fbf93ce5..1b39acd9 100644
--- a/qpdf/qtest/qpdf/bad7-recover.out
+++ b/qpdf/qtest/qpdf/bad7-recover.out
@@ -1,4 +1,4 @@
WARNING: bad7.pdf: file is damaged
-WARNING: bad7.pdf (file position 698): expected trailer dictionary
+WARNING: bad7.pdf (offset 698): expected trailer dictionary
WARNING: bad7.pdf: Attempting to reconstruct cross-reference table
bad7.pdf: unable to find trailer dictionary while recovering damaged file
diff --git a/qpdf/qtest/qpdf/bad7.out b/qpdf/qtest/qpdf/bad7.out
index ae3da54a..6a9630ba 100644
--- a/qpdf/qtest/qpdf/bad7.out
+++ b/qpdf/qtest/qpdf/bad7.out
@@ -1 +1 @@
-bad7.pdf (file position 698): expected trailer dictionary
+bad7.pdf (offset 698): expected trailer dictionary
diff --git a/qpdf/qtest/qpdf/bad8-recover.out b/qpdf/qtest/qpdf/bad8-recover.out
index 59b3b8c8..2cd5daf3 100644
--- a/qpdf/qtest/qpdf/bad8-recover.out
+++ b/qpdf/qtest/qpdf/bad8-recover.out
@@ -1,5 +1,5 @@
WARNING: bad8.pdf: file is damaged
-WARNING: bad8.pdf (file position 543): xref not found
+WARNING: bad8.pdf (offset 543): xref not found
WARNING: bad8.pdf: Attempting to reconstruct cross-reference table
/QTest is implicit
/QTest is direct and has type null (2)
diff --git a/qpdf/qtest/qpdf/bad8.out b/qpdf/qtest/qpdf/bad8.out
index ace464d4..eece39c7 100644
--- a/qpdf/qtest/qpdf/bad8.out
+++ b/qpdf/qtest/qpdf/bad8.out
@@ -1 +1 @@
-bad8.pdf (file position 543): xref not found
+bad8.pdf (offset 543): xref not found
diff --git a/qpdf/qtest/qpdf/bad9-recover.out b/qpdf/qtest/qpdf/bad9-recover.out
index b9608d1b..c5f876e7 100644
--- a/qpdf/qtest/qpdf/bad9-recover.out
+++ b/qpdf/qtest/qpdf/bad9-recover.out
@@ -1,5 +1,5 @@
WARNING: bad9.pdf: file is damaged
-WARNING: bad9.pdf (trailer, file position 712): trailer dictionary lacks /Size key
+WARNING: bad9.pdf (trailer, offset 712): trailer dictionary lacks /Size key
WARNING: bad9.pdf: Attempting to reconstruct cross-reference table
/QTest is implicit
/QTest is direct and has type null (2)
diff --git a/qpdf/qtest/qpdf/bad9.out b/qpdf/qtest/qpdf/bad9.out
index 45524ff2..5023998b 100644
--- a/qpdf/qtest/qpdf/bad9.out
+++ b/qpdf/qtest/qpdf/bad9.out
@@ -1 +1 @@
-bad9.pdf (trailer, file position 712): trailer dictionary lacks /Size key
+bad9.pdf (trailer, offset 712): trailer dictionary lacks /Size key
diff --git a/qpdf/qtest/qpdf/c-no-recovery.out b/qpdf/qtest/qpdf/c-no-recovery.out
index 2db03a71..a5f1560d 100644
--- a/qpdf/qtest/qpdf/c-no-recovery.out
+++ b/qpdf/qtest/qpdf/c-no-recovery.out
@@ -1,4 +1,4 @@
-error: bad33.pdf (file position 1771): xref not found
+error: bad33.pdf (offset 1771): xref not found
code: 5
file: bad33.pdf
pos : 1771
diff --git a/qpdf/qtest/qpdf/c-write-warnings.out b/qpdf/qtest/qpdf/c-write-warnings.out
index cc964f3b..23d03d41 100644
--- a/qpdf/qtest/qpdf/c-write-warnings.out
+++ b/qpdf/qtest/qpdf/c-write-warnings.out
@@ -3,7 +3,7 @@ warning: bad33.pdf: file is damaged
file: bad33.pdf
pos : 0
text: file is damaged
-warning: bad33.pdf (file position 1771): xref not found
+warning: bad33.pdf (offset 1771): xref not found
code: 5
file: bad33.pdf
pos : 1771
@@ -13,7 +13,7 @@ warning: bad33.pdf: Attempting to reconstruct cross-reference table
file: bad33.pdf
pos : 0
text: Attempting to reconstruct cross-reference table
-warning: bad33.pdf (file position 629): stream filter type is not name or array
+warning: bad33.pdf (offset 629): stream filter type is not name or array
code: 5
file: bad33.pdf
pos : 629
diff --git a/qpdf/qtest/qpdf/content-stream-errors.out b/qpdf/qtest/qpdf/content-stream-errors.out
index 7a4dc944..7d721de0 100644
--- a/qpdf/qtest/qpdf/content-stream-errors.out
+++ b/qpdf/qtest/qpdf/content-stream-errors.out
@@ -2,6 +2,6 @@ checking content-stream-errors.pdf
PDF Version: 1.3
File is not encrypted
File is not linearized
-page 1: page object 3 0 stream 7 0 (content, file position 52): parse error while reading object
-page 3: page object 5 0 stream 15 0 (stream data, file position 117): EOF found while reading inline image
-page 4: page object 6 0 stream 19 0 (content, file position 53): parse error while reading object
+page 1: page object 3 0 stream 7 0 (content, offset 52): parse error while reading object
+page 3: page object 5 0 stream 15 0 (stream data, offset 117): EOF found while reading inline image
+page 4: page object 6 0 stream 19 0 (content, offset 53): parse error while reading object
diff --git a/qpdf/qtest/qpdf/damaged-stream-c-check.out b/qpdf/qtest/qpdf/damaged-stream-c-check.out
index d3d01493..2648e725 100644
--- a/qpdf/qtest/qpdf/damaged-stream-c-check.out
+++ b/qpdf/qtest/qpdf/damaged-stream-c-check.out
@@ -1,9 +1,9 @@
-warning: damaged-stream.pdf (file position 426): error decoding stream data for object 5 0: LZWDecoder: bad code received
+warning: damaged-stream.pdf (offset 426): error decoding stream data for object 5 0: LZWDecoder: bad code received
code: 5
file: damaged-stream.pdf
pos : 426
text: error decoding stream data for object 5 0: LZWDecoder: bad code received
-warning: damaged-stream.pdf (file position 426): stream will be re-processed without filtering to avoid data loss
+warning: damaged-stream.pdf (offset 426): stream will be re-processed without filtering to avoid data loss
code: 5
file: damaged-stream.pdf
pos : 426
diff --git a/qpdf/qtest/qpdf/damaged-stream.out b/qpdf/qtest/qpdf/damaged-stream.out
index 9ab30730..3ef6df62 100644
--- a/qpdf/qtest/qpdf/damaged-stream.out
+++ b/qpdf/qtest/qpdf/damaged-stream.out
@@ -2,5 +2,5 @@ checking damaged-stream.pdf
PDF Version: 1.3
File is not encrypted
File is not linearized
-WARNING: damaged-stream.pdf (file position 426): error decoding stream data for object 5 0: LZWDecoder: bad code received
-WARNING: damaged-stream.pdf (file position 426): stream will be re-processed without filtering to avoid data loss
+WARNING: damaged-stream.pdf (offset 426): error decoding stream data for object 5 0: LZWDecoder: bad code received
+WARNING: damaged-stream.pdf (offset 426): stream will be re-processed without filtering to avoid data loss
diff --git a/qpdf/qtest/qpdf/empty-object.out b/qpdf/qtest/qpdf/empty-object.out
index 78274f8a..7ebfe52c 100644
--- a/qpdf/qtest/qpdf/empty-object.out
+++ b/qpdf/qtest/qpdf/empty-object.out
@@ -1,3 +1,3 @@
-WARNING: empty-object.pdf (object 7 0, file position 575): empty object treated as null
+WARNING: empty-object.pdf (object 7 0, offset 575): empty object treated as null
null
qpdf: operation succeeded with warnings; resulting file may have some problems
diff --git a/qpdf/qtest/qpdf/eof-in-inline-image.out b/qpdf/qtest/qpdf/eof-in-inline-image.out
index a79406fc..445ed858 100644
--- a/qpdf/qtest/qpdf/eof-in-inline-image.out
+++ b/qpdf/qtest/qpdf/eof-in-inline-image.out
@@ -22,4 +22,4 @@ name: /Fl
name: /DP
dictionary: << /Columns 1 /Predictor 15 >>
operator: ID
-page object 3 0 stream 4 0 (stream data, file position 139): EOF found while reading inline image
+page object 3 0 stream 4 0 (stream data, offset 139): EOF found while reading inline image
diff --git a/qpdf/qtest/qpdf/eof-reading-token.out b/qpdf/qtest/qpdf/eof-reading-token.out
index 7686803d..596907c7 100644
--- a/qpdf/qtest/qpdf/eof-reading-token.out
+++ b/qpdf/qtest/qpdf/eof-reading-token.out
@@ -2,4 +2,4 @@ checking eof-reading-token.pdf
PDF Version: 1.3
File is not encrypted
File is not linearized
-WARNING: eof-reading-token.pdf object stream 12 (object 13 0, file position 5): EOF while reading token
+WARNING: eof-reading-token.pdf object stream 12 (object 13 0, offset 5): EOF while reading token
diff --git a/qpdf/qtest/qpdf/good14.out b/qpdf/qtest/qpdf/good14.out
index 84bf7133..73181721 100644
--- a/qpdf/qtest/qpdf/good14.out
+++ b/qpdf/qtest/qpdf/good14.out
@@ -13,8 +13,8 @@ three lines
<8a8b>
(ab)
<8c><dd> ) >
-<610062> (MOO)WARNING: good14.pdf (file position 628): content normalization encountered bad tokens
-WARNING: good14.pdf (file position 628): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
+<610062> (MOO)WARNING: good14.pdf (offset 628): content normalization encountered bad tokens
+WARNING: good14.pdf (offset 628): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
-- stream 1 --
This stream does end with a newline.
// tests:
@@ -33,17 +33,17 @@ This stream does end with a newline.
/good name
/bad#00name
-WARNING: good14.pdf (file position 860): content normalization encountered bad tokens
-WARNING: good14.pdf (file position 860): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
+WARNING: good14.pdf (offset 860): content normalization encountered bad tokens
+WARNING: good14.pdf (offset 860): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
-- stream 2 --
(This stream ends with a \001 bad token
-WARNING: good14.pdf (file position 1316): content normalization encountered bad tokens
-WARNING: good14.pdf (file position 1316): normalized content ended with a bad token; you may be able to resolve this by coalescing content streams in combination with normalizing content. From the command line, specify --coalesce-contents
-WARNING: good14.pdf (file position 1316): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
+WARNING: good14.pdf (offset 1316): content normalization encountered bad tokens
+WARNING: good14.pdf (offset 1316): normalized content ended with a bad token; you may be able to resolve this by coalescing content streams in combination with normalizing content. From the command line, specify --coalesce-contents
+WARNING: good14.pdf (offset 1316): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
-- stream 3 --
-<AB XWARNING: good14.pdf (file position 1406): content normalization encountered bad tokens
-WARNING: good14.pdf (file position 1406): normalized content ended with a bad token; you may be able to resolve this by coalescing content streams in combination with normalizing content. From the command line, specify --coalesce-contents
-WARNING: good14.pdf (file position 1406): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
+<AB XWARNING: good14.pdf (offset 1406): content normalization encountered bad tokens
+WARNING: good14.pdf (offset 1406): normalized content ended with a bad token; you may be able to resolve this by coalescing content streams in combination with normalizing content. From the command line, specify --coalesce-contents
+WARNING: good14.pdf (offset 1406): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
-- stream 4 --
(ends with a name)
/ThisMustBeLast-- stream 5 --
@@ -54,7 +54,7 @@ BI
ID
<506f7
461746f>
-WARNING: good14.pdf (file position 1549): content normalization encountered bad tokens
-WARNING: good14.pdf (file position 1549): normalized content ended with a bad token; you may be able to resolve this by coalescing content streams in combination with normalizing content. From the command line, specify --coalesce-contents
-WARNING: good14.pdf (file position 1549): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
+WARNING: good14.pdf (offset 1549): content normalization encountered bad tokens
+WARNING: good14.pdf (offset 1549): normalized content ended with a bad token; you may be able to resolve this by coalescing content streams in combination with normalizing content. From the command line, specify --coalesce-contents
+WARNING: good14.pdf (offset 1549): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
test 3 done
diff --git a/qpdf/qtest/qpdf/indirect-r-arg.out b/qpdf/qtest/qpdf/indirect-r-arg.out
index 9e33ca52..00a7175d 100644
--- a/qpdf/qtest/qpdf/indirect-r-arg.out
+++ b/qpdf/qtest/qpdf/indirect-r-arg.out
@@ -1,6 +1,6 @@
-WARNING: indirect-r-arg.pdf (object 1 0, file position 76): unknown token while reading object; treating as string
-WARNING: indirect-r-arg.pdf (object 1 0, file position 62): expected dictionary key but found non-name object; inserting key /QPDFFake1
-WARNING: indirect-r-arg.pdf (object 1 0, file position 62): expected dictionary key but found non-name object; inserting key /QPDFFake2
+WARNING: indirect-r-arg.pdf (object 1 0, offset 76): unknown token while reading object; treating as string
+WARNING: indirect-r-arg.pdf (object 1 0, offset 62): expected dictionary key but found non-name object; inserting key /QPDFFake1
+WARNING: indirect-r-arg.pdf (object 1 0, offset 62): expected dictionary key but found non-name object; inserting key /QPDFFake2
checking indirect-r-arg.pdf
PDF Version: 1.3
File is not encrypted
diff --git a/qpdf/qtest/qpdf/invalid-id-xref.out b/qpdf/qtest/qpdf/invalid-id-xref.out
index 9ae4405d..63aa2660 100644
--- a/qpdf/qtest/qpdf/invalid-id-xref.out
+++ b/qpdf/qtest/qpdf/invalid-id-xref.out
@@ -1,4 +1,4 @@
-WARNING: invalid-id-xref.pdf (trailer, file position 731): invalid /ID in trailer dictionary
+WARNING: invalid-id-xref.pdf (trailer, offset 731): invalid /ID in trailer dictionary
checking invalid-id-xref.pdf
PDF Version: 1.4
R = 3
diff --git a/qpdf/qtest/qpdf/issue-100.out b/qpdf/qtest/qpdf/issue-100.out
index baa2dccc..e5007541 100644
--- a/qpdf/qtest/qpdf/issue-100.out
+++ b/qpdf/qtest/qpdf/issue-100.out
@@ -1,16 +1,16 @@
WARNING: issue-100.pdf: file is damaged
-WARNING: issue-100.pdf (file position 736): xref not found
+WARNING: issue-100.pdf (offset 736): xref not found
WARNING: issue-100.pdf: Attempting to reconstruct cross-reference table
-WARNING: issue-100.pdf (object 5 0, file position 268): unknown token while reading object; treating as string
-WARNING: issue-100.pdf (object 5 0, file position 286): unknown token while reading object; treating as string
-WARNING: issue-100.pdf (object 5 0, file position 289): unknown token while reading object; treating as string
-WARNING: issue-100.pdf (object 5 0, file position 294): unknown token while reading object; treating as string
-WARNING: issue-100.pdf (object 5 0, file position 297): unknown token while reading object; treating as string
-WARNING: issue-100.pdf (object 5 0, file position 304): unknown token while reading object; treating as string
-WARNING: issue-100.pdf (object 5 0, file position 308): unexpected )
-WARNING: issue-100.pdf (object 5 0, file position 418): /Length key in stream dictionary is not an integer
-WARNING: issue-100.pdf (object 5 0, file position 489): attempting to recover stream length
-WARNING: issue-100.pdf (object 5 0, file position 489): recovered stream length: 12
-WARNING: issue-100.pdf (trailer, file position 953): expected dictionary key but found non-name object; inserting key /QPDFFake1
-WARNING: issue-100.pdf (trailer, file position 953): dictionary ended prematurely; using null as value for last key
-issue-100.pdf (file position 1144): unable to find /Root dictionary
+WARNING: issue-100.pdf (object 5 0, offset 268): unknown token while reading object; treating as string
+WARNING: issue-100.pdf (object 5 0, offset 286): unknown token while reading object; treating as string
+WARNING: issue-100.pdf (object 5 0, offset 289): unknown token while reading object; treating as string
+WARNING: issue-100.pdf (object 5 0, offset 294): unknown token while reading object; treating as string
+WARNING: issue-100.pdf (object 5 0, offset 297): unknown token while reading object; treating as string
+WARNING: issue-100.pdf (object 5 0, offset 304): unknown token while reading object; treating as string
+WARNING: issue-100.pdf (object 5 0, offset 308): unexpected )
+WARNING: issue-100.pdf (object 5 0, offset 418): /Length key in stream dictionary is not an integer
+WARNING: issue-100.pdf (object 5 0, offset 489): attempting to recover stream length
+WARNING: issue-100.pdf (object 5 0, offset 489): recovered stream length: 12
+WARNING: issue-100.pdf (trailer, offset 953): expected dictionary key but found non-name object; inserting key /QPDFFake1
+WARNING: issue-100.pdf (trailer, offset 953): dictionary ended prematurely; using null as value for last key
+issue-100.pdf (offset 1144): unable to find /Root dictionary
diff --git a/qpdf/qtest/qpdf/issue-101.out b/qpdf/qtest/qpdf/issue-101.out
index 238d5d5f..29ccbfb7 100644
--- a/qpdf/qtest/qpdf/issue-101.out
+++ b/qpdf/qtest/qpdf/issue-101.out
@@ -1,59 +1,59 @@
WARNING: issue-101.pdf: file is damaged
-WARNING: issue-101.pdf (file position 3526): xref not found
+WARNING: issue-101.pdf (offset 3526): xref not found
WARNING: issue-101.pdf: Attempting to reconstruct cross-reference table
-WARNING: issue-101.pdf (object 5 0, file position 1242): expected dictionary key but found non-name object; inserting key /QPDFFake1
-WARNING: issue-101.pdf (object 5 0, file position 1242): dictionary ended prematurely; using null as value for last key
-WARNING: issue-101.pdf (object 5 0, file position 1438): /Length key in stream dictionary is not an integer
-WARNING: issue-101.pdf (object 5 0, file position 1509): attempting to recover stream length
-WARNING: issue-101.pdf (object 5 0, file position 1509): recovered stream length: 8
-WARNING: issue-101.pdf (trailer, file position 1631): /Length key in stream dictionary is not an integer
-WARNING: issue-101.pdf (trailer, file position 1702): attempting to recover stream length
-WARNING: issue-101.pdf (trailer, file position 1702): recovered stream length: 12
-WARNING: issue-101.pdf (trailer, file position 2026): /Length key in stream dictionary is not an integer
-WARNING: issue-101.pdf (trailer, file position 2097): attempting to recover stream length
-WARNING: issue-101.pdf (trailer, file position 2097): recovered stream length: 257
-WARNING: issue-101.pdf (trailer, file position 2613): /Length key in stream dictionary is not an integer
-WARNING: issue-101.pdf (trailer, file position 2684): attempting to recover stream length
-WARNING: issue-101.pdf (trailer, file position 2684): recovered stream length: 74
-WARNING: issue-101.pdf (trailer, file position 2928): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (trailer, file position 2930): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (trailer, file position 2928): expected dictionary key but found non-name object; inserting key /QPDFFake1
-WARNING: issue-101.pdf (trailer, file position 2928): expected dictionary key but found non-name object; inserting key /QPDFFake2
-WARNING: issue-101.pdf (trailer, file position 2928): expected dictionary key but found non-name object; inserting key /QPDFFake3
-WARNING: issue-101.pdf (trailer, file position 2925): /Length key in stream dictionary is not an integer
-WARNING: issue-101.pdf (trailer, file position 2996): attempting to recover stream length
-WARNING: issue-101.pdf (trailer, file position 2996): recovered stream length: 12
-WARNING: issue-101.pdf (trailer, file position 3339): /Length key in stream dictionary is not an integer
-WARNING: issue-101.pdf (trailer, file position 3410): attempting to recover stream length
-WARNING: issue-101.pdf (trailer, file position 3410): recovered stream length: 12
-WARNING: issue-101.pdf (trailer, file position 3560): /Length key in stream dictionary is not an integer
-WARNING: issue-101.pdf (trailer, file position 3631): attempting to recover stream length
-WARNING: issue-101.pdf (trailer, file position 3631): recovered stream length: 8
-WARNING: issue-101.pdf (trailer, file position 4113): /Length key in stream dictionary is not an integer
-WARNING: issue-101.pdf (trailer, file position 4184): attempting to recover stream length
-WARNING: issue-101.pdf (trailer, file position 4184): recovered stream length: 8
-WARNING: issue-101.pdf (object 11 0, file position 591): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 625): treating unexpected brace token as null
-WARNING: issue-101.pdf (object 11 0, file position 626): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 637): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 639): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 644): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 647): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 687): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 691): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 696): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 698): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 701): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 711): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 743): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 745): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 747): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 777): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 790): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 800): treating unexpected brace token as null
-WARNING: issue-101.pdf (object 11 0, file position 801): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 811): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 819): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 832): unknown token while reading object; treating as string
-WARNING: issue-101.pdf (object 11 0, file position 856): unexpected >
-issue-101.pdf (file position 856): unable to find /Root dictionary
+WARNING: issue-101.pdf (object 5 0, offset 1242): expected dictionary key but found non-name object; inserting key /QPDFFake1
+WARNING: issue-101.pdf (object 5 0, offset 1242): dictionary ended prematurely; using null as value for last key
+WARNING: issue-101.pdf (object 5 0, offset 1438): /Length key in stream dictionary is not an integer
+WARNING: issue-101.pdf (object 5 0, offset 1509): attempting to recover stream length
+WARNING: issue-101.pdf (object 5 0, offset 1509): recovered stream length: 8
+WARNING: issue-101.pdf (trailer, offset 1631): /Length key in stream dictionary is not an integer
+WARNING: issue-101.pdf (trailer, offset 1702): attempting to recover stream length
+WARNING: issue-101.pdf (trailer, offset 1702): recovered stream length: 12
+WARNING: issue-101.pdf (trailer, offset 2026): /Length key in stream dictionary is not an integer
+WARNING: issue-101.pdf (trailer, offset 2097): attempting to recover stream length
+WARNING: issue-101.pdf (trailer, offset 2097): recovered stream length: 257
+WARNING: issue-101.pdf (trailer, offset 2613): /Length key in stream dictionary is not an integer
+WARNING: issue-101.pdf (trailer, offset 2684): attempting to recover stream length
+WARNING: issue-101.pdf (trailer, offset 2684): recovered stream length: 74
+WARNING: issue-101.pdf (trailer, offset 2928): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (trailer, offset 2930): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (trailer, offset 2928): expected dictionary key but found non-name object; inserting key /QPDFFake1
+WARNING: issue-101.pdf (trailer, offset 2928): expected dictionary key but found non-name object; inserting key /QPDFFake2
+WARNING: issue-101.pdf (trailer, offset 2928): expected dictionary key but found non-name object; inserting key /QPDFFake3
+WARNING: issue-101.pdf (trailer, offset 2925): /Length key in stream dictionary is not an integer
+WARNING: issue-101.pdf (trailer, offset 2996): attempting to recover stream length
+WARNING: issue-101.pdf (trailer, offset 2996): recovered stream length: 12
+WARNING: issue-101.pdf (trailer, offset 3339): /Length key in stream dictionary is not an integer
+WARNING: issue-101.pdf (trailer, offset 3410): attempting to recover stream length
+WARNING: issue-101.pdf (trailer, offset 3410): recovered stream length: 12
+WARNING: issue-101.pdf (trailer, offset 3560): /Length key in stream dictionary is not an integer
+WARNING: issue-101.pdf (trailer, offset 3631): attempting to recover stream length
+WARNING: issue-101.pdf (trailer, offset 3631): recovered stream length: 8
+WARNING: issue-101.pdf (trailer, offset 4113): /Length key in stream dictionary is not an integer
+WARNING: issue-101.pdf (trailer, offset 4184): attempting to recover stream length
+WARNING: issue-101.pdf (trailer, offset 4184): recovered stream length: 8
+WARNING: issue-101.pdf (object 11 0, offset 591): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 625): treating unexpected brace token as null
+WARNING: issue-101.pdf (object 11 0, offset 626): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 637): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 639): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 644): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 647): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 687): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 691): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 696): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 698): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 701): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 711): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 743): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 745): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 747): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 777): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 790): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 800): treating unexpected brace token as null
+WARNING: issue-101.pdf (object 11 0, offset 801): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 811): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 819): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 832): unknown token while reading object; treating as string
+WARNING: issue-101.pdf (object 11 0, offset 856): unexpected >
+issue-101.pdf (offset 856): unable to find /Root dictionary
diff --git a/qpdf/qtest/qpdf/issue-106.out b/qpdf/qtest/qpdf/issue-106.out
index 8766a31f..4af06209 100644
--- a/qpdf/qtest/qpdf/issue-106.out
+++ b/qpdf/qtest/qpdf/issue-106.out
@@ -1,6 +1,6 @@
WARNING: issue-106.pdf: file is damaged
-WARNING: issue-106.pdf (file position 809): xref not found
+WARNING: issue-106.pdf (offset 809): xref not found
WARNING: issue-106.pdf: Attempting to reconstruct cross-reference table
-WARNING: issue-106.pdf (file position 965): error decoding stream data for object 8 0: stream inflate: inflate: data: incorrect data check
-WARNING: issue-106.pdf (file position 965): stream will be re-processed without filtering to avoid data loss
+WARNING: issue-106.pdf (offset 965): error decoding stream data for object 8 0: stream inflate: inflate: data: incorrect data check
+WARNING: issue-106.pdf (offset 965): stream will be re-processed without filtering to avoid data loss
qpdf: operation succeeded with warnings; resulting file may have some problems
diff --git a/qpdf/qtest/qpdf/issue-117.out b/qpdf/qtest/qpdf/issue-117.out
index 45625631..e831f289 100644
--- a/qpdf/qtest/qpdf/issue-117.out
+++ b/qpdf/qtest/qpdf/issue-117.out
@@ -1,8 +1,8 @@
WARNING: issue-117.pdf: file is damaged
-WARNING: issue-117.pdf (file position 3526): xref not found
+WARNING: issue-117.pdf (offset 3526): xref not found
WARNING: issue-117.pdf: Attempting to reconstruct cross-reference table
-WARNING: issue-117.pdf (file position 66): loop detected resolving object 2 0
-WARNING: issue-117.pdf (object 2 0, file position 22): /Length key in stream dictionary is not an integer
-WARNING: issue-117.pdf (object 2 0, file position 67): attempting to recover stream length
-WARNING: issue-117.pdf (object 2 0, file position 67): recovered stream length: 91
+WARNING: issue-117.pdf (offset 66): loop detected resolving object 2 0
+WARNING: issue-117.pdf (object 2 0, offset 22): /Length key in stream dictionary is not an integer
+WARNING: issue-117.pdf (object 2 0, offset 67): attempting to recover stream length
+WARNING: issue-117.pdf (object 2 0, offset 67): recovered stream length: 91
attempt to make a stream into a direct object
diff --git a/qpdf/qtest/qpdf/issue-118.out b/qpdf/qtest/qpdf/issue-118.out
index 18c20b20..fee0f2d4 100644
--- a/qpdf/qtest/qpdf/issue-118.out
+++ b/qpdf/qtest/qpdf/issue-118.out
@@ -1,4 +1,4 @@
WARNING: issue-118.pdf: can't find PDF header
-WARNING: issue-118.pdf (file position 732): loop detected resolving object 2 0
-WARNING: issue-118.pdf (xref stream: object 8 0, file position 732): supposed object stream 2 is not a stream
-issue-118.pdf (file position 732): unable to find /Root dictionary
+WARNING: issue-118.pdf (offset 732): loop detected resolving object 2 0
+WARNING: issue-118.pdf (xref stream: object 8 0, offset 732): supposed object stream 2 is not a stream
+issue-118.pdf (offset 732): unable to find /Root dictionary
diff --git a/qpdf/qtest/qpdf/issue-119.out b/qpdf/qtest/qpdf/issue-119.out
index 37fa4dfb..45b92fed 100644
--- a/qpdf/qtest/qpdf/issue-119.out
+++ b/qpdf/qtest/qpdf/issue-119.out
@@ -1,3 +1,3 @@
-WARNING: issue-119.pdf (object 4 0, file position 298): expected dictionary key but found non-name object; inserting key /QPDFFake1
-WARNING: issue-119.pdf (object 4 0, file position 298): expected dictionary key but found non-name object; inserting key /QPDFFake2
+WARNING: issue-119.pdf (object 4 0, offset 298): expected dictionary key but found non-name object; inserting key /QPDFFake1
+WARNING: issue-119.pdf (object 4 0, offset 298): expected dictionary key but found non-name object; inserting key /QPDFFake2
qpdf: operation succeeded with warnings; resulting file may have some problems
diff --git a/qpdf/qtest/qpdf/issue-120.out b/qpdf/qtest/qpdf/issue-120.out
index c087b451..a54bae5b 100644
--- a/qpdf/qtest/qpdf/issue-120.out
+++ b/qpdf/qtest/qpdf/issue-120.out
@@ -1,3 +1,3 @@
-WARNING: issue-120.pdf (file position 85): loop detected resolving object 3 0
-WARNING: issue-120.pdf (object 6 0, file position 85): supposed object stream 3 is not a stream
+WARNING: issue-120.pdf (offset 85): loop detected resolving object 3 0
+WARNING: issue-120.pdf (object 6 0, offset 85): supposed object stream 3 is not a stream
qpdf: operation succeeded with warnings; resulting file may have some problems
diff --git a/qpdf/qtest/qpdf/issue-141a.out b/qpdf/qtest/qpdf/issue-141a.out
index 6182d90b..029ca271 100644
--- a/qpdf/qtest/qpdf/issue-141a.out
+++ b/qpdf/qtest/qpdf/issue-141a.out
@@ -1,8 +1,8 @@
WARNING: issue-141a.pdf: can't find PDF header
-WARNING: issue-141a.pdf (xref stream: object 9 0, file position 10): stream dictionary lacks /Length key
-WARNING: issue-141a.pdf (xref stream: object 9 0, file position 47): attempting to recover stream length
-WARNING: issue-141a.pdf (xref stream: object 9 0, file position 47): unable to recover stream data; treating stream as empty
+WARNING: issue-141a.pdf (xref stream: object 9 0, offset 10): stream dictionary lacks /Length key
+WARNING: issue-141a.pdf (xref stream: object 9 0, offset 47): attempting to recover stream length
+WARNING: issue-141a.pdf (xref stream: object 9 0, offset 47): unable to recover stream data; treating stream as empty
WARNING: issue-141a.pdf: file is damaged
-WARNING: issue-141a.pdf (xref stream, file position 3): Cross-reference stream's /W indicates entry size of 0
+WARNING: issue-141a.pdf (xref stream, offset 3): Cross-reference stream's /W indicates entry size of 0
WARNING: issue-141a.pdf: Attempting to reconstruct cross-reference table
issue-141a.pdf: unable to find trailer dictionary while recovering damaged file
diff --git a/qpdf/qtest/qpdf/issue-141b.out b/qpdf/qtest/qpdf/issue-141b.out
index bf591243..95ae4aa0 100644
--- a/qpdf/qtest/qpdf/issue-141b.out
+++ b/qpdf/qtest/qpdf/issue-141b.out
@@ -1,5 +1,5 @@
WARNING: issue-141b.pdf: can't find PDF header
WARNING: issue-141b.pdf: file is damaged
-WARNING: issue-141b.pdf (file position 7): xref not found
+WARNING: issue-141b.pdf (offset 7): xref not found
WARNING: issue-141b.pdf: Attempting to reconstruct cross-reference table
issue-141b.pdf: unable to find trailer dictionary while recovering damaged file
diff --git a/qpdf/qtest/qpdf/issue-143.out b/qpdf/qtest/qpdf/issue-143.out
index c7811191..307a726e 100644
--- a/qpdf/qtest/qpdf/issue-143.out
+++ b/qpdf/qtest/qpdf/issue-143.out
@@ -1,17 +1,17 @@
WARNING: issue-143.pdf: can't find PDF header
-WARNING: issue-143.pdf (xref stream: object 3 0, file position 654): stream keyword not followed by proper line terminator
-WARNING: issue-143.pdf (xref stream: object 3 0, file position 607): stream dictionary lacks /Length key
-WARNING: issue-143.pdf (xref stream: object 3 0, file position 654): attempting to recover stream length
-WARNING: issue-143.pdf (xref stream: object 3 0, file position 654): recovered stream length: 36
+WARNING: issue-143.pdf (xref stream: object 3 0, offset 654): stream keyword not followed by proper line terminator
+WARNING: issue-143.pdf (xref stream: object 3 0, offset 607): stream dictionary lacks /Length key
+WARNING: issue-143.pdf (xref stream: object 3 0, offset 654): attempting to recover stream length
+WARNING: issue-143.pdf (xref stream: object 3 0, offset 654): recovered stream length: 36
WARNING: issue-143.pdf: file is damaged
-WARNING: issue-143.pdf (object 1 0, file position 48): expected n n obj
+WARNING: issue-143.pdf (object 1 0, offset 48): expected n n obj
WARNING: issue-143.pdf: Attempting to reconstruct cross-reference table
-WARNING: issue-143.pdf (object 1 0, file position 24): expected dictionary key but found non-name object; inserting key /QPDFFake1
-WARNING: issue-143.pdf (object 1 0, file position 24): expected dictionary key but found non-name object; inserting key /QPDFFake2
-WARNING: issue-143.pdf (object 1 0, file position 24): expected dictionary key but found non-name object; inserting key /QPDFFake3
-WARNING: issue-143.pdf (object 1 0, file position 24): expected dictionary key but found non-name object; inserting key /QPDFFake4
-WARNING: issue-143.pdf (object 1 0, file position 21): stream dictionary lacks /Length key
-WARNING: issue-143.pdf (object 1 0, file position 84): attempting to recover stream length
-WARNING: issue-143.pdf (object 1 0, file position 84): recovered stream length: 606
-WARNING: issue-143.pdf object stream 1 (object 2 0, file position 33): expected dictionary key but found non-name object; inserting key /QPDFFake1
+WARNING: issue-143.pdf (object 1 0, offset 24): expected dictionary key but found non-name object; inserting key /QPDFFake1
+WARNING: issue-143.pdf (object 1 0, offset 24): expected dictionary key but found non-name object; inserting key /QPDFFake2
+WARNING: issue-143.pdf (object 1 0, offset 24): expected dictionary key but found non-name object; inserting key /QPDFFake3
+WARNING: issue-143.pdf (object 1 0, offset 24): expected dictionary key but found non-name object; inserting key /QPDFFake4
+WARNING: issue-143.pdf (object 1 0, offset 21): stream dictionary lacks /Length key
+WARNING: issue-143.pdf (object 1 0, offset 84): attempting to recover stream length
+WARNING: issue-143.pdf (object 1 0, offset 84): recovered stream length: 606
+WARNING: issue-143.pdf object stream 1 (object 2 0, offset 33): expected dictionary key but found non-name object; inserting key /QPDFFake1
qpdf: operation succeeded with warnings; resulting file may have some problems
diff --git a/qpdf/qtest/qpdf/issue-146.out b/qpdf/qtest/qpdf/issue-146.out
index d515c344..fc92ab65 100644
--- a/qpdf/qtest/qpdf/issue-146.out
+++ b/qpdf/qtest/qpdf/issue-146.out
@@ -1,5 +1,5 @@
WARNING: issue-146.pdf: file is damaged
WARNING: issue-146.pdf: can't find startxref
WARNING: issue-146.pdf: Attempting to reconstruct cross-reference table
-WARNING: issue-146.pdf (trailer, file position 20728): unknown token while reading object; treating as string
-issue-146.pdf (trailer, file position 20732): unexpected EOF
+WARNING: issue-146.pdf (trailer, offset 20728): unknown token while reading object; treating as string
+issue-146.pdf (trailer, offset 20732): unexpected EOF
diff --git a/qpdf/qtest/qpdf/issue-147.out b/qpdf/qtest/qpdf/issue-147.out
index d64fbd3a..e5c2edb8 100644
--- a/qpdf/qtest/qpdf/issue-147.out
+++ b/qpdf/qtest/qpdf/issue-147.out
@@ -2,7 +2,7 @@ WARNING: issue-147.pdf: can't find PDF header
WARNING: issue-147.pdf: file is damaged
WARNING: issue-147.pdf: can't find startxref
WARNING: issue-147.pdf: Attempting to reconstruct cross-reference table
-WARNING: issue-147.pdf (trailer, file position 9): expected dictionary key but found non-name object; inserting key /QPDFFake1
-WARNING: issue-147.pdf (object 62 0, file position 88): expected endobj
-WARNING: issue-147.pdf (trailer, file position 90): invalid /ID in trailer dictionary
+WARNING: issue-147.pdf (trailer, offset 9): expected dictionary key but found non-name object; inserting key /QPDFFake1
+WARNING: issue-147.pdf (object 62 0, offset 88): expected endobj
+WARNING: issue-147.pdf (trailer, offset 90): invalid /ID in trailer dictionary
issue-147.pdf: invalid password
diff --git a/qpdf/qtest/qpdf/issue-148.out b/qpdf/qtest/qpdf/issue-148.out
index cde322d6..1239433c 100644
--- a/qpdf/qtest/qpdf/issue-148.out
+++ b/qpdf/qtest/qpdf/issue-148.out
@@ -1,10 +1,10 @@
WARNING: issue-148.pdf: can't find PDF header
-WARNING: issue-148.pdf (xref stream: object 8 0, file position 26): stream dictionary lacks /Length key
-WARNING: issue-148.pdf (xref stream: object 8 0, file position 73): attempting to recover stream length
-WARNING: issue-148.pdf (xref stream: object 8 0, file position 73): recovered stream length: 2
-WARNING: issue-148.pdf (xref stream: object 8 0, file position 85): expected endobj
-WARNING: issue-148.pdf (file position 73): error decoding stream data for object 8 0: stream inflate: inflate: data: incorrect header check
+WARNING: issue-148.pdf (xref stream: object 8 0, offset 26): stream dictionary lacks /Length key
+WARNING: issue-148.pdf (xref stream: object 8 0, offset 73): attempting to recover stream length
+WARNING: issue-148.pdf (xref stream: object 8 0, offset 73): recovered stream length: 2
+WARNING: issue-148.pdf (xref stream: object 8 0, offset 85): expected endobj
+WARNING: issue-148.pdf (offset 73): error decoding stream data for object 8 0: stream inflate: inflate: data: incorrect header check
WARNING: issue-148.pdf: file is damaged
-WARNING: issue-148.pdf (file position 73): getStreamData called on unfilterable stream
+WARNING: issue-148.pdf (offset 73): getStreamData called on unfilterable stream
WARNING: issue-148.pdf: Attempting to reconstruct cross-reference table
issue-148.pdf: unable to find trailer dictionary while recovering damaged file
diff --git a/qpdf/qtest/qpdf/issue-51.out b/qpdf/qtest/qpdf/issue-51.out
index 1eeadebd..7873886b 100644
--- a/qpdf/qtest/qpdf/issue-51.out
+++ b/qpdf/qtest/qpdf/issue-51.out
@@ -1,10 +1,10 @@
WARNING: issue-51.pdf: can't find PDF header
WARNING: issue-51.pdf: reported number of objects (0) inconsistent with actual number of objects (9)
-WARNING: issue-51.pdf (object 7 0, file position 553): expected endobj
-WARNING: issue-51.pdf (object 1 0, file position 359): expected endobj
-WARNING: issue-51.pdf (file position 70): loop detected resolving object 2 0
-WARNING: issue-51.pdf (object 2 0, file position 26): /Length key in stream dictionary is not an integer
-WARNING: issue-51.pdf (object 2 0, file position 71): attempting to recover stream length
-WARNING: issue-51.pdf (object 2 0, file position 71): unable to recover stream data; treating stream as empty
-WARNING: issue-51.pdf (object 2 0, file position 977): unexpected EOF
+WARNING: issue-51.pdf (object 7 0, offset 553): expected endobj
+WARNING: issue-51.pdf (object 1 0, offset 359): expected endobj
+WARNING: issue-51.pdf (offset 70): loop detected resolving object 2 0
+WARNING: issue-51.pdf (object 2 0, offset 26): /Length key in stream dictionary is not an integer
+WARNING: issue-51.pdf (object 2 0, offset 71): attempting to recover stream length
+WARNING: issue-51.pdf (object 2 0, offset 71): unable to recover stream data; treating stream as empty
+WARNING: issue-51.pdf (object 2 0, offset 977): unexpected EOF
qpdf: operation succeeded with warnings; resulting file may have some problems
diff --git a/qpdf/qtest/qpdf/issue-99.out b/qpdf/qtest/qpdf/issue-99.out
index 644d4a13..b0ca83b0 100644
--- a/qpdf/qtest/qpdf/issue-99.out
+++ b/qpdf/qtest/qpdf/issue-99.out
@@ -1,4 +1,4 @@
WARNING: issue-99.pdf: file is damaged
-WARNING: issue-99.pdf (file position 3526): xref not found
+WARNING: issue-99.pdf (offset 3526): xref not found
WARNING: issue-99.pdf: Attempting to reconstruct cross-reference table
-issue-99.pdf (file position 4798): unable to find /Root dictionary
+issue-99.pdf (offset 4798): unable to find /Root dictionary
diff --git a/qpdf/qtest/qpdf/issue-99b.out b/qpdf/qtest/qpdf/issue-99b.out
index 95a51a89..0615c33f 100644
--- a/qpdf/qtest/qpdf/issue-99b.out
+++ b/qpdf/qtest/qpdf/issue-99b.out
@@ -1,5 +1,5 @@
WARNING: issue-99b.pdf: file is damaged
-WARNING: issue-99b.pdf (object 1 0, file position 9): object with ID 0
+WARNING: issue-99b.pdf (object 1 0, offset 9): object with ID 0
WARNING: issue-99b.pdf: Attempting to reconstruct cross-reference table
WARNING: issue-99b.pdf: object 1 0 not found in file after regenerating cross reference table
-issue-99b.pdf (file position 763): unable to find /Root dictionary
+issue-99b.pdf (offset 763): unable to find /Root dictionary
diff --git a/qpdf/qtest/qpdf/linearization-bounds-1.out b/qpdf/qtest/qpdf/linearization-bounds-1.out
index bca3fb0a..066dc883 100644
--- a/qpdf/qtest/qpdf/linearization-bounds-1.out
+++ b/qpdf/qtest/qpdf/linearization-bounds-1.out
@@ -2,7 +2,7 @@ checking linearization-bounds-1.pdf
PDF Version: 1.3
File is not encrypted
File is linearized
-WARNING: linearization-bounds-1.pdf (linearization hint stream: object 62 0, file position 12302): unexpected EOF
-WARNING: linearization-bounds-1.pdf (linearization hint stream: object 62 0, file position 1183): attempting to recover stream length
-WARNING: linearization-bounds-1.pdf (linearization hint stream: object 62 0, file position 1183): recovered stream length: 106
-linearization-bounds-1.pdf (linearization hint table, file position 1183): /S (shared object) offset is out of bounds
+WARNING: linearization-bounds-1.pdf (linearization hint stream: object 62 0, offset 12302): unexpected EOF
+WARNING: linearization-bounds-1.pdf (linearization hint stream: object 62 0, offset 1183): attempting to recover stream length
+WARNING: linearization-bounds-1.pdf (linearization hint stream: object 62 0, offset 1183): recovered stream length: 106
+linearization-bounds-1.pdf (linearization hint table, offset 1183): /S (shared object) offset is out of bounds
diff --git a/qpdf/qtest/qpdf/linearization-bounds-2.out b/qpdf/qtest/qpdf/linearization-bounds-2.out
index f7516fff..b7958aa3 100644
--- a/qpdf/qtest/qpdf/linearization-bounds-2.out
+++ b/qpdf/qtest/qpdf/linearization-bounds-2.out
@@ -2,7 +2,7 @@ checking linearization-bounds-2.pdf
PDF Version: 1.3
File is not encrypted
File is linearized
-WARNING: linearization-bounds-2.pdf (linearization hint stream: object 62 0, file position 1282): expected endstream
-WARNING: linearization-bounds-2.pdf (linearization hint stream: object 62 0, file position 1183): attempting to recover stream length
-WARNING: linearization-bounds-2.pdf (linearization hint stream: object 62 0, file position 1183): recovered stream length: 106
-linearization-bounds-2.pdf (linearization hint table, file position 1183): /S (shared object) offset is out of bounds
+WARNING: linearization-bounds-2.pdf (linearization hint stream: object 62 0, offset 1282): expected endstream
+WARNING: linearization-bounds-2.pdf (linearization hint stream: object 62 0, offset 1183): attempting to recover stream length
+WARNING: linearization-bounds-2.pdf (linearization hint stream: object 62 0, offset 1183): recovered stream length: 106
+linearization-bounds-2.pdf (linearization hint table, offset 1183): /S (shared object) offset is out of bounds
diff --git a/qpdf/qtest/qpdf/linearization-large-vector-alloc.out b/qpdf/qtest/qpdf/linearization-large-vector-alloc.out
index ddb49d62..b4a16822 100644
--- a/qpdf/qtest/qpdf/linearization-large-vector-alloc.out
+++ b/qpdf/qtest/qpdf/linearization-large-vector-alloc.out
@@ -2,7 +2,7 @@ checking linearization-large-vector-alloc.pdf
PDF Version: 1.3
File is not encrypted
File is linearized
-WARNING: linearization-large-vector-alloc.pdf (linearization hint stream: object 62 0, file position 1282): expected endstream
-WARNING: linearization-large-vector-alloc.pdf (linearization hint stream: object 62 0, file position 1183): attempting to recover stream length
-WARNING: linearization-large-vector-alloc.pdf (linearization hint stream: object 62 0, file position 1183): recovered stream length: 106
+WARNING: linearization-large-vector-alloc.pdf (linearization hint stream: object 62 0, offset 1282): expected endstream
+WARNING: linearization-large-vector-alloc.pdf (linearization hint stream: object 62 0, offset 1183): attempting to recover stream length
+WARNING: linearization-large-vector-alloc.pdf (linearization hint stream: object 62 0, offset 1183): recovered stream length: 106
overflow reading bit stream
diff --git a/qpdf/qtest/qpdf/linearized-and-warnings-1.out b/qpdf/qtest/qpdf/linearized-and-warnings-1.out
index 954181f6..90c6c70e 100644
--- a/qpdf/qtest/qpdf/linearized-and-warnings-1.out
+++ b/qpdf/qtest/qpdf/linearized-and-warnings-1.out
@@ -1,4 +1,4 @@
-WARNING: linearized-and-warnings.pdf (object 2 0, file position 1117): empty object treated as null
+WARNING: linearized-and-warnings.pdf (object 2 0, offset 1117): empty object treated as null
linearized-and-warnings.pdf: linearization data:
file_size: 1310
diff --git a/qpdf/qtest/qpdf/linearized-and-warnings-2.out b/qpdf/qtest/qpdf/linearized-and-warnings-2.out
index d8d17b7c..68423574 100644
--- a/qpdf/qtest/qpdf/linearized-and-warnings-2.out
+++ b/qpdf/qtest/qpdf/linearized-and-warnings-2.out
@@ -50,5 +50,5 @@ Shared Object 2:
Shared Object 3:
group length: 107
---error---
-WARNING: linearized-and-warnings.pdf (object 2 0, file position 1117): empty object treated as null
+WARNING: linearized-and-warnings.pdf (object 2 0, offset 1117): empty object treated as null
test 13 done
diff --git a/qpdf/qtest/qpdf/normalize-warnings.out b/qpdf/qtest/qpdf/normalize-warnings.out
index 73947b1a..57f038f4 100644
--- a/qpdf/qtest/qpdf/normalize-warnings.out
+++ b/qpdf/qtest/qpdf/normalize-warnings.out
@@ -1,9 +1,9 @@
-WARNING: coalesce.pdf (file position 671): content normalization encountered bad tokens
-WARNING: coalesce.pdf (file position 671): normalized content ended with a bad token; you may be able to resolve this by coalescing content streams in combination with normalizing content. From the command line, specify --coalesce-contents
-WARNING: coalesce.pdf (file position 671): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
-WARNING: coalesce.pdf (file position 823): content normalization encountered bad tokens
-WARNING: coalesce.pdf (file position 823): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
-WARNING: coalesce.pdf (file position 962): content normalization encountered bad tokens
-WARNING: coalesce.pdf (file position 962): normalized content ended with a bad token; you may be able to resolve this by coalescing content streams in combination with normalizing content. From the command line, specify --coalesce-contents
-WARNING: coalesce.pdf (file position 962): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
+WARNING: coalesce.pdf (offset 671): content normalization encountered bad tokens
+WARNING: coalesce.pdf (offset 671): normalized content ended with a bad token; you may be able to resolve this by coalescing content streams in combination with normalizing content. From the command line, specify --coalesce-contents
+WARNING: coalesce.pdf (offset 671): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
+WARNING: coalesce.pdf (offset 823): content normalization encountered bad tokens
+WARNING: coalesce.pdf (offset 823): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
+WARNING: coalesce.pdf (offset 962): content normalization encountered bad tokens
+WARNING: coalesce.pdf (offset 962): normalized content ended with a bad token; you may be able to resolve this by coalescing content streams in combination with normalizing content. From the command line, specify --coalesce-contents
+WARNING: coalesce.pdf (offset 962): Resulting stream data may be corrupted but is may still useful for manual inspection. For more information on this warning, search for content normalization in the manual.
qpdf: operation succeeded with warnings; resulting file may have some problems
diff --git a/qpdf/qtest/qpdf/obj0-check.out b/qpdf/qtest/qpdf/obj0-check.out
index d3b5c2b0..a9b37544 100644
--- a/qpdf/qtest/qpdf/obj0-check.out
+++ b/qpdf/qtest/qpdf/obj0-check.out
@@ -1,5 +1,5 @@
WARNING: obj0.pdf: file is damaged
-WARNING: obj0.pdf (object 1 0, file position 77): expected n n obj
+WARNING: obj0.pdf (object 1 0, offset 77): expected n n obj
WARNING: obj0.pdf: Attempting to reconstruct cross-reference table
checking obj0.pdf
PDF Version: 1.3
diff --git a/qpdf/qtest/qpdf/split-content-stream-errors.out b/qpdf/qtest/qpdf/split-content-stream-errors.out
index ec4e5dea..c033c8d1 100644
--- a/qpdf/qtest/qpdf/split-content-stream-errors.out
+++ b/qpdf/qtest/qpdf/split-content-stream-errors.out
@@ -2,8 +2,8 @@ checking split-content-stream-errors.pdf
PDF Version: 1.3
File is not encrypted
File is not linearized
-WARNING: split-content-stream-errors.pdf (file position 557): error decoding stream data for object 6 0: LZWDecoder: bad code received
-WARNING: split-content-stream-errors.pdf (file position 557): stream will be re-processed without filtering to avoid data loss
+WARNING: split-content-stream-errors.pdf (offset 557): error decoding stream data for object 6 0: LZWDecoder: bad code received
+WARNING: split-content-stream-errors.pdf (offset 557): stream will be re-processed without filtering to avoid data loss
WARNING: page object 3 0 (item index 0 (from 0)): ignoring non-stream in an array of streams
-WARNING: split-content-stream-errors.pdf (file position 557): error decoding stream data for object 6 0: LZWDecoder: bad code received
+WARNING: split-content-stream-errors.pdf (offset 557): error decoding stream data for object 6 0: LZWDecoder: bad code received
WARNING: content stream (content stream object 6 0): errors while decoding content stream
diff --git a/qpdf/qtest/qpdf/stream-line-enders.out b/qpdf/qtest/qpdf/stream-line-enders.out
index 1932771f..13af750d 100644
--- a/qpdf/qtest/qpdf/stream-line-enders.out
+++ b/qpdf/qtest/qpdf/stream-line-enders.out
@@ -1,4 +1,4 @@
-WARNING: stream-line-enders.pdf (object 5 0, file position 384): stream keyword followed by carriage return only
-WARNING: stream-line-enders.pdf (object 6 0, file position 443): stream keyword not followed by proper line terminator
-WARNING: stream-line-enders.pdf (object 7 0, file position 503): stream keyword not followed by proper line terminator
+WARNING: stream-line-enders.pdf (object 5 0, offset 384): stream keyword followed by carriage return only
+WARNING: stream-line-enders.pdf (object 6 0, offset 443): stream keyword not followed by proper line terminator
+WARNING: stream-line-enders.pdf (object 7 0, offset 503): stream keyword not followed by proper line terminator
qpdf: operation succeeded with warnings; resulting file may have some problems
diff --git a/qpdf/qtest/qpdf/xref-errors.out b/qpdf/qtest/qpdf/xref-errors.out
index 7a2cf384..27c97736 100644
--- a/qpdf/qtest/qpdf/xref-errors.out
+++ b/qpdf/qtest/qpdf/xref-errors.out
@@ -1,8 +1,8 @@
-WARNING: xref-errors.pdf (xref table, file position 585): accepting invalid xref table entry
-WARNING: xref-errors.pdf (xref table, file position 606): accepting invalid xref table entry
-WARNING: xref-errors.pdf (xref table, file position 627): accepting invalid xref table entry
-WARNING: xref-errors.pdf (xref table, file position 648): accepting invalid xref table entry
-WARNING: xref-errors.pdf (xref table, file position 667): accepting invalid xref table entry
+WARNING: xref-errors.pdf (xref table, offset 585): accepting invalid xref table entry
+WARNING: xref-errors.pdf (xref table, offset 606): accepting invalid xref table entry
+WARNING: xref-errors.pdf (xref table, offset 627): accepting invalid xref table entry
+WARNING: xref-errors.pdf (xref table, offset 648): accepting invalid xref table entry
+WARNING: xref-errors.pdf (xref table, offset 667): accepting invalid xref table entry
checking xref-errors.pdf
PDF Version: 1.3
File is not encrypted
diff --git a/qpdf/qtest/qpdf/xref-with-short-size-recover.out b/qpdf/qtest/qpdf/xref-with-short-size-recover.out
index b57333b1..710e4fe2 100644
--- a/qpdf/qtest/qpdf/xref-with-short-size-recover.out
+++ b/qpdf/qtest/qpdf/xref-with-short-size-recover.out
@@ -1,2 +1,2 @@
-WARNING: xref-with-short-size.pdf (xref stream, file position 16227): Cross-reference stream data has the wrong size; expected = 52; actual = 56
+WARNING: xref-with-short-size.pdf (xref stream, offset 16227): Cross-reference stream data has the wrong size; expected = 52; actual = 56
qpdf: operation succeeded with warnings; resulting file may have some problems
diff --git a/qpdf/qtest/qpdf/xref-with-short-size.out b/qpdf/qtest/qpdf/xref-with-short-size.out
index 12f20e6a..9041f854 100644
--- a/qpdf/qtest/qpdf/xref-with-short-size.out
+++ b/qpdf/qtest/qpdf/xref-with-short-size.out
@@ -1,4 +1,4 @@
-WARNING: xref-with-short-size.pdf (xref stream, file position 16227): Cross-reference stream data has the wrong size; expected = 52; actual = 56
+WARNING: xref-with-short-size.pdf (xref stream, offset 16227): Cross-reference stream data has the wrong size; expected = 52; actual = 56
1/0: compressed; stream = 5, index = 1
2/0: compressed; stream = 5, index = 0
3/0: uncompressed; offset = 15