1 files changed, 95 insertions, 30 deletions

diff --git a/qpdf/qtest/qpdf/good17.qdf b/qpdf/qtest/qpdf/good17.qdf
index ddd3a5ce..747f329d 100644
--- a/qpdf/qtest/qpdf/good17.qdf
+++ b/qpdf/qtest/qpdf/good17.qdf
@@ -2,6 +2,7 @@
 %¿÷¢þ
 %QDF-1.0
 
+%% Original object ID: 1 0
 1 0 obj
 <<
   /Outlines 3 0 R
@@ -15,29 +16,29 @@ endobj
 2 0 obj
 <<
   /Type /ObjStm
-  /Length 2179
+  /Length 2424
   /N 10
-  /First 102
+  /First 126
 >>
 stream
 3 0
-4 100
-5 335
-6 520
-7 718
-8 1044
-9 1262
-10 1508
-11 1715
-12 1922
-%% Object stream: object 3, index 0
+4 124
+5 383
+6 592
+7 814
+8 1165
+9 1408
+10 1679
+11 1911
+12 2143
+%% Object stream: object 3, index 0; original object ID: 95
 <<
   /Count 6
   /First 4 0 R
   /Last 5 0 R
   /Type /Outlines
 >>
-%% Object stream: object 4, index 1
+%% Object stream: object 4, index 1; original object ID: 96
 <<
   /Count 4
   /Dest [
@@ -54,7 +55,7 @@ stream
   /Title (Isís 1 -> 5: /XYZ  null null null)
   /Type /Outline
 >>
-%% Object stream: object 5, index 2
+%% Object stream: object 5, index 2; original object ID: 97
 <<
   /Dest [
     19 0 R
@@ -68,7 +69,7 @@ stream
   /Title (Trepak 2 -> 15: /XYZ 66 756 3)
   /Type /Outline
 >>
-%% Object stream: object 6, index 3
+%% Object stream: object 6, index 3; original object ID: 98
 <<
   /Count -3
   /Dest [
@@ -82,7 +83,7 @@ stream
   /Title (Amanda 1.1 -> 11: /Fit)
   /Type /Outline
 >>
-%% Object stream: object 7, index 4
+%% Object stream: object 7, index 4; original object ID: 99
 <<
   /Count 2
   /Dest [
@@ -97,7 +98,7 @@ stream
   /Title <feff00530061006e00640079002000f703a303b103bd03b403b900f700200031002e00320020002d003e002000310033003a0020002f00460069007400480020003700390032>
   /Type /Outline
 >>
-%% Object stream: object 8, index 5
+%% Object stream: object 8, index 5; original object ID: 100
 <<
   /Count -2
   /Dest [
@@ -112,7 +113,7 @@ stream
   /Title (Isosicle 1.1.1 -> 12: /FitV 100)
   /Type /Outline
 >>
-%% Object stream: object 9, index 6
+%% Object stream: object 9, index 6; original object ID: 101
 <<
   /Count 1
   /Dest [
@@ -129,7 +130,7 @@ stream
   /Title (Isosicle 1.1.2 -> 12: /XYZ null null null)
   /Type /Outline
 >>
-%% Object stream: object 10, index 7
+%% Object stream: object 10, index 7; original object ID: 102
 <<
   /Dest [
     23 0 R
@@ -143,7 +144,7 @@ stream
   /Title (Isosicle 1.1.1.1 -> 18: /XYZ null null null)
   /Type /Outline
 >>
-%% Object stream: object 11, index 8
+%% Object stream: object 11, index 8; original object ID: 103
 <<
   /Dest [
     24 0 R
@@ -157,7 +158,7 @@ stream
   /Title (Isosicle 1.1.1.2 -> 19: /XYZ null null null)
   /Type /Outline
 >>
-%% Object stream: object 12, index 9
+%% Object stream: object 12, index 9; original object ID: 104
 <<
   /Dest [
     25 0 R
@@ -176,16 +177,16 @@ endobj
 13 0 obj
 <<
   /Type /ObjStm
-  /Length 989
+  /Length 1064
   /N 3
-  /First 56
+  /First 81
   /Extends 2 0 R
 >>
 stream
 14 0
-15 213
-16 418
-%% Object stream: object 14, index 0
+15 238
+16 468
+%% Object stream: object 14, index 0; original object ID: 105
 <<
   /Dest [
     26 0 R
@@ -200,7 +201,7 @@ stream
   /Title (Trepsichord 1.2.1 -> 1: /FitR 66 714 180 770)
   /Type /Outline
 >>
-%% Object stream: object 15, index 1
+%% Object stream: object 15, index 1; original object ID: 106
 <<
   /Dest [
     27 0 R
@@ -214,7 +215,7 @@ stream
   /Title (Trepsicle 1.2.2 -> 0: /XYZ null null null)
   /Type /Outline
 >>
-%% Object stream: object 16, index 2
+%% Object stream: object 16, index 2; original object ID: 107
 <<
   /Nums [
     0
@@ -278,6 +279,7 @@ stream
 endstream
 endobj
 
+%% Original object ID: 2 0
 17 0 obj
 <<
   /Count 30
@@ -318,6 +320,7 @@ endobj
 endobj
 
 %% Page 6
+%% Original object ID: 8 0
 18 0 obj
 <<
   /Contents 48 0 R
@@ -339,6 +342,7 @@ endobj
 endobj
 
 %% Page 16
+%% Original object ID: 18 0
 19 0 obj
 <<
   /Contents 52 0 R
@@ -360,6 +364,7 @@ endobj
 endobj
 
 %% Page 12
+%% Original object ID: 14 0
 20 0 obj
 <<
   /Contents 54 0 R
@@ -381,6 +386,7 @@ endobj
 endobj
 
 %% Page 14
+%% Original object ID: 16 0
 21 0 obj
 <<
   /Contents 56 0 R
@@ -402,6 +408,7 @@ endobj
 endobj
 
 %% Page 13
+%% Original object ID: 15 0
 22 0 obj
 <<
   /Contents 58 0 R
@@ -423,6 +430,7 @@ endobj
 endobj
 
 %% Page 19
+%% Original object ID: 21 0
 23 0 obj
 <<
   /Contents 60 0 R
@@ -444,6 +452,7 @@ endobj
 endobj
 
 %% Page 20
+%% Original object ID: 22 0
 24 0 obj
 <<
   /Contents 62 0 R
@@ -465,6 +474,7 @@ endobj
 endobj
 
 %% Page 23
+%% Original object ID: 25 0
 25 0 obj
 <<
   /Contents 64 0 R
@@ -486,6 +496,7 @@ endobj
 endobj
 
 %% Page 2
+%% Original object ID: 4 0
 26 0 obj
 <<
   /Contents 66 0 R
@@ -507,6 +518,7 @@ endobj
 endobj
 
 %% Page 1
+%% Original object ID: 3 0
 27 0 obj
 <<
   /Contents 68 0 R
@@ -528,6 +540,7 @@ endobj
 endobj
 
 %% Page 3
+%% Original object ID: 5 0
 28 0 obj
 <<
   /Contents 70 0 R
@@ -549,6 +562,7 @@ endobj
 endobj
 
 %% Page 4
+%% Original object ID: 6 0
 29 0 obj
 <<
   /Contents 72 0 R
@@ -570,6 +584,7 @@ endobj
 endobj
 
 %% Page 5
+%% Original object ID: 7 0
 30 0 obj
 <<
   /Contents 74 0 R
@@ -591,6 +606,7 @@ endobj
 endobj
 
 %% Page 7
+%% Original object ID: 9 0
 31 0 obj
 <<
   /Contents 76 0 R
@@ -612,6 +628,7 @@ endobj
 endobj
 
 %% Page 8
+%% Original object ID: 10 0
 32 0 obj
 <<
   /Contents 78 0 R
@@ -633,6 +650,7 @@ endobj
 endobj
 
 %% Page 9
+%% Original object ID: 11 0
 33 0 obj
 <<
   /Contents 80 0 R
@@ -654,6 +672,7 @@ endobj
 endobj
 
 %% Page 10
+%% Original object ID: 12 0
 34 0 obj
 <<
   /Contents 82 0 R
@@ -675,6 +694,7 @@ endobj
 endobj
 
 %% Page 11
+%% Original object ID: 13 0
 35 0 obj
 <<
   /Contents 84 0 R
@@ -696,6 +716,7 @@ endobj
 endobj
 
 %% Page 15
+%% Original object ID: 17 0
 36 0 obj
 <<
   /Contents 86 0 R
@@ -717,6 +738,7 @@ endobj
 endobj
 
 %% Page 17
+%% Original object ID: 19 0
 37 0 obj
 <<
   /Contents 88 0 R
@@ -738,6 +760,7 @@ endobj
 endobj
 
 %% Page 18
+%% Original object ID: 20 0
 38 0 obj
 <<
   /Contents 90 0 R
@@ -759,6 +782,7 @@ endobj
 endobj
 
 %% Page 21
+%% Original object ID: 23 0
 39 0 obj
 <<
   /Contents 92 0 R
@@ -780,6 +804,7 @@ endobj
 endobj
 
 %% Page 22
+%% Original object ID: 24 0
 40 0 obj
 <<
   /Contents 94 0 R
@@ -801,6 +826,7 @@ endobj
 endobj
 
 %% Page 24
+%% Original object ID: 26 0
 41 0 obj
 <<
   /Contents 96 0 R
@@ -822,6 +848,7 @@ endobj
 endobj
 
 %% Page 25
+%% Original object ID: 27 0
 42 0 obj
 <<
   /Contents 98 0 R
@@ -843,6 +870,7 @@ endobj
 endobj
 
 %% Page 26
+%% Original object ID: 28 0
 43 0 obj
 <<
   /Contents 100 0 R
@@ -864,6 +892,7 @@ endobj
 endobj
 
 %% Page 27
+%% Original object ID: 29 0
 44 0 obj
 <<
   /Contents 102 0 R
@@ -885,6 +914,7 @@ endobj
 endobj
 
 %% Page 28
+%% Original object ID: 30 0
 45 0 obj
 <<
   /Contents 104 0 R
@@ -906,6 +936,7 @@ endobj
 endobj
 
 %% Page 29
+%% Original object ID: 31 0
 46 0 obj
 <<
   /Contents 106 0 R
@@ -927,6 +958,7 @@ endobj
 endobj
 
 %% Page 30
+%% Original object ID: 32 0
 47 0 obj
 <<
   /Contents 108 0 R
@@ -948,6 +980,7 @@ endobj
 endobj
 
 %% Contents for page 6
+%% Original object ID: 45 0
 48 0 obj
 <<
   /Length 49 0 R
@@ -965,6 +998,7 @@ endobj
 46
 endobj
 
+%% Original object ID: 35 0
 50 0 obj
 <<
   /BaseFont /Helvetica
@@ -975,6 +1009,7 @@ endobj
 >>
 endobj
 
+%% Original object ID: 36 0
 51 0 obj
 [
   /PDF
@@ -983,6 +1018,7 @@ endobj
 endobj
 
 %% Contents for page 16
+%% Original object ID: 65 0
 52 0 obj
 <<
   /Length 53 0 R
@@ -1001,6 +1037,7 @@ endobj
 endobj
 
 %% Contents for page 12
+%% Original object ID: 57 0
 54 0 obj
 <<
   /Length 55 0 R
@@ -1019,6 +1056,7 @@ endobj
 endobj
 
 %% Contents for page 14
+%% Original object ID: 61 0
 56 0 obj
 <<
   /Length 57 0 R
@@ -1037,6 +1075,7 @@ endobj
 endobj
 
 %% Contents for page 13
+%% Original object ID: 59 0
 58 0 obj
 <<
   /Length 59 0 R
@@ -1055,6 +1094,7 @@ endobj
 endobj
 
 %% Contents for page 19
+%% Original object ID: 71 0
 60 0 obj
 <<
   /Length 61 0 R
@@ -1073,6 +1113,7 @@ endobj
 endobj
 
 %% Contents for page 20
+%% Original object ID: 73 0
 62 0 obj
 <<
   /Length 63 0 R
@@ -1091,6 +1132,7 @@ endobj
 endobj
 
 %% Contents for page 23
+%% Original object ID: 79 0
 64 0 obj
 <<
   /Length 65 0 R
@@ -1109,6 +1151,7 @@ endobj
 endobj
 
 %% Contents for page 2
+%% Original object ID: 37 0
 66 0 obj
 <<
   /Length 67 0 R
@@ -1127,6 +1170,7 @@ endobj
 endobj
 
 %% Contents for page 1
+%% Original object ID: 33 0
 68 0 obj
 <<
   /Length 69 0 R
@@ -1145,6 +1189,7 @@ endobj
 endobj
 
 %% Contents for page 3
+%% Original object ID: 39 0
 70 0 obj
 <<
   /Length 71 0 R
@@ -1163,6 +1208,7 @@ endobj
 endobj
 
 %% Contents for page 4
+%% Original object ID: 41 0
 72 0 obj
 <<
   /Length 73 0 R
@@ -1181,6 +1227,7 @@ endobj
 endobj
 
 %% Contents for page 5
+%% Original object ID: 43 0
 74 0 obj
 <<
   /Length 75 0 R
@@ -1199,6 +1246,7 @@ endobj
 endobj
 
 %% Contents for page 7
+%% Original object ID: 47 0
 76 0 obj
 <<
   /Length 77 0 R
@@ -1217,6 +1265,7 @@ endobj
 endobj
 
 %% Contents for page 8
+%% Original object ID: 49 0
 78 0 obj
 <<
   /Length 79 0 R
@@ -1235,6 +1284,7 @@ endobj
 endobj
 
 %% Contents for page 9
+%% Original object ID: 51 0
 80 0 obj
 <<
   /Length 81 0 R
@@ -1253,6 +1303,7 @@ endobj
 endobj
 
 %% Contents for page 10
+%% Original object ID: 53 0
 82 0 obj
 <<
   /Length 83 0 R
@@ -1271,6 +1322,7 @@ endobj
 endobj
 
 %% Contents for page 11
+%% Original object ID: 55 0
 84 0 obj
 <<
   /Length 85 0 R
@@ -1289,6 +1341,7 @@ endobj
 endobj
 
 %% Contents for page 15
+%% Original object ID: 63 0
 86 0 obj
 <<
   /Length 87 0 R
@@ -1307,6 +1360,7 @@ endobj
 endobj
 
 %% Contents for page 17
+%% Original object ID: 67 0
 88 0 obj
 <<
   /Length 89 0 R
@@ -1325,6 +1379,7 @@ endobj
 endobj
 
 %% Contents for page 18
+%% Original object ID: 69 0
 90 0 obj
 <<
   /Length 91 0 R
@@ -1343,6 +1398,7 @@ endobj
 endobj
 
 %% Contents for page 21
+%% Original object ID: 75 0
 92 0 obj
 <<
   /Length 93 0 R
@@ -1361,6 +1417,7 @@ endobj
 endobj
 
 %% Contents for page 22
+%% Original object ID: 77 0
 94 0 obj
 <<
   /Length 95 0 R
@@ -1379,6 +1436,7 @@ endobj
 endobj
 
 %% Contents for page 24
+%% Original object ID: 81 0
 96 0 obj
 <<
   /Length 97 0 R
@@ -1397,6 +1455,7 @@ endobj
 endobj
 
 %% Contents for page 25
+%% Original object ID: 83 0
 98 0 obj
 <<
   /Length 99 0 R
@@ -1415,6 +1474,7 @@ endobj
 endobj
 
 %% Contents for page 26
+%% Original object ID: 85 0
 100 0 obj
 <<
   /Length 101 0 R
@@ -1433,6 +1493,7 @@ endobj
 endobj
 
 %% Contents for page 27
+%% Original object ID: 87 0
 102 0 obj
 <<
   /Length 103 0 R
@@ -1451,6 +1512,7 @@ endobj
 endobj
 
 %% Contents for page 28
+%% Original object ID: 89 0
 104 0 obj
 <<
   /Length 105 0 R
@@ -1469,6 +1531,7 @@ endobj
 endobj
 
 %% Contents for page 29
+%% Original object ID: 91 0
 106 0 obj
 <<
   /Length 107 0 R
@@ -1487,6 +1550,7 @@ endobj
 endobj
 
 %% Contents for page 30
+%% Original object ID: 93 0
 108 0 obj
 <<
   /Length 109 0 R
@@ -1514,10 +1578,11 @@ endobj
   /ID [<31415926535897932384626433832795><31415926535897932384626433832795>]
 >>
 stream
-
+
+~
 endstream
 endobj
 
 startxref
-14730
+16834
 %%EOF