diff options
| -rw-r--r-- | TODO | 10 | ||||
| -rw-r--r-- | libqpdf/QPDFJob.cc | 11 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-field-types---show-encryption-key.out | 618 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-field-types.out | 618 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-image-streams-all.out | 112 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-image-streams-small.out | 112 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-image-streams-specialized.out | 112 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-image-streams.out | 112 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-outlines-with-actions.out | 144 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-outlines-with-old-root-dests.out | 130 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-page-labels-and-outlines.out | 128 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/json-page-labels-num-tree.out | 112 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/page_api_2-json-objects.out | 14 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/page_api_2-json-pages.out | 28 |
14 files changed, 1127 insertions, 1134 deletions
@@ -48,16 +48,6 @@ Soon: Break ground on "Document-level work" Output JSON v2 ============== -Before starting on v2 format: - -* Writing objects should write in numerical order with the trailer at - the end. - -* Having QPDFJob call these methods will change output ordering. We - should fix the json test outputs manually (or programmatically from - the input), not by overwriting, in case this has any unwanted side - effects. - General things to remember: * deprecate getJSON without a version diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index 63fa0c34..78c678b0 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -1066,13 +1066,14 @@ QPDFJob::doJSONObjects(Pipeline* p, bool& first, QPDF& pdf) void QPDFJob::doJSONObjectinfo(Pipeline* p, bool& first, QPDF& pdf) { + JSON::writeDictionaryKey(p, first, "objectinfo", 0); + bool first_object = true; + JSON::writeDictionaryOpen(p, first_object, 1); bool all_objects = m->json_objects.empty(); std::set<QPDFObjGen> wanted_og = getWantedJSONObjects(); - JSON j_objectinfo = JSON::makeDictionary(); for (auto& obj: pdf.getAllObjects()) { if (all_objects || wanted_og.count(obj.getObjGen())) { - auto j_details = j_objectinfo.addDictionaryMember( - obj.unparse(), JSON::makeDictionary()); + auto j_details = JSON::makeDictionary(); auto j_stream = j_details.addDictionaryMember("stream", JSON::makeDictionary()); bool is_stream = obj.isStream(); @@ -1085,9 +1086,11 @@ QPDFJob::doJSONObjectinfo(Pipeline* p, bool& first, QPDF& pdf) "filter", (is_stream ? obj.getDict().getKey("/Filter").getJSON(true) : JSON::makeNull())); + JSON::writeDictionaryItem( + p, first_object, obj.unparse(), j_details, 1); } } - JSON::writeDictionaryItem(p, first, "objectinfo", j_objectinfo, 0); + JSON::writeDictionaryClose(p, first_object, 1); } void diff --git a/qpdf/qtest/qpdf/json-field-types---show-encryption-key.out b/qpdf/qtest/qpdf/json-field-types---show-encryption-key.out index 106de5aa..43e07e53 100644 --- a/qpdf/qtest/qpdf/json-field-types---show-encryption-key.out +++ b/qpdf/qtest/qpdf/json-field-types---show-encryption-key.out @@ -2727,1365 +2727,1365 @@ "length": null } }, - "10 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "100 0 R": { + "2 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "101 0 R": { + "3 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "102 0 R": { + "4 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "103 0 R": { + "5 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "104 0 R": { + "6 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "105 0 R": { + "7 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "106 0 R": { + "8 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "107 0 R": { + "9 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "108 0 R": { + "10 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "109 0 R": { + "11 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "11 0 R": { + "12 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "110 0 R": { + "13 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "111 0 R": { + "14 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "112 0 R": { + "15 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "113 0 R": { + "16 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "114 0 R": { + "17 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "115 0 R": { + "18 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "116 0 R": { + "19 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "117 0 R": { + "20 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "118 0 R": { + "21 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "119 0 R": { + "22 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "12 0 R": { + "23 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "120 0 R": { + "24 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "121 0 R": { + "25 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "122 0 R": { + "26 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 82 } }, - "123 0 R": { + "27 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "124 0 R": { + "28 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "125 0 R": { + "29 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "126 0 R": { + "30 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "127 0 R": { + "31 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 82 } }, - "128 0 R": { + "32 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "129 0 R": { + "33 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "13 0 R": { + "34 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "130 0 R": { + "35 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 82 } }, - "131 0 R": { + "36 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "132 0 R": { + "37 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "133 0 R": { + "38 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "134 0 R": { + "39 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "135 0 R": { + "40 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "136 0 R": { + "41 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "137 0 R": { + "42 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 46 } }, - "138 0 R": { + "43 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "139 0 R": { + "44 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 46 } }, - "14 0 R": { + "45 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "140 0 R": { + "46 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 47 } }, - "141 0 R": { + "47 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "142 0 R": { + "48 0 R": { "stream": { "filter": null, "is": true, - "length": 702 + "length": 45 } }, - "143 0 R": { + "49 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "144 0 R": { + "50 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 4747 } }, - "145 0 R": { + "51 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "146 0 R": { + "52 0 R": { "stream": { "filter": null, - "is": true, - "length": 582 + "is": false, + "length": null } }, - "147 0 R": { + "53 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "148 0 R": { + "54 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "149 0 R": { + "55 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "15 0 R": { + "56 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "150 0 R": { + "57 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "151 0 R": { + "58 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 220 } }, - "152 0 R": { + "59 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "153 0 R": { + "60 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "154 0 R": { + "61 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "155 0 R": { + "62 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 220 } }, - "156 0 R": { + "63 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "157 0 R": { + "64 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "158 0 R": { + "65 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "159 0 R": { + "66 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 220 } }, - "16 0 R": { + "67 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "160 0 R": { + "68 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "161 0 R": { + "69 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "162 0 R": { + "70 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 220 } }, - "163 0 R": { + "71 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "164 0 R": { + "72 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "165 0 R": { + "73 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "166 0 R": { + "74 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 220 } }, - "167 0 R": { + "75 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "168 0 R": { + "76 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "169 0 R": { + "77 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "17 0 R": { + "78 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 220 } }, - "170 0 R": { + "79 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "171 0 R": { + "80 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "172 0 R": { + "81 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "173 0 R": { + "82 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "174 0 R": { + "83 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "175 0 R": { + "84 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "176 0 R": { + "85 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "177 0 R": { + "86 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "178 0 R": { + "87 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "179 0 R": { + "88 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "18 0 R": { + "89 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "180 0 R": { + "90 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "181 0 R": { + "91 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "182 0 R": { + "92 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "183 0 R": { + "93 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "184 0 R": { + "94 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "185 0 R": { + "95 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "186 0 R": { + "96 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "187 0 R": { + "97 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "188 0 R": { + "98 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "189 0 R": { + "99 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "19 0 R": { + "100 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "190 0 R": { + "101 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "191 0 R": { + "102 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "192 0 R": { + "103 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "193 0 R": { + "104 0 R": { "stream": { "filter": null, - "is": true, - "length": 16184 + "is": false, + "length": null } }, - "194 0 R": { + "105 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "195 0 R": { + "106 0 R": { "stream": { "filter": null, - "is": true, - "length": 11088 + "is": false, + "length": null } }, - "196 0 R": { + "107 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "2 0 R": { + "108 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "20 0 R": { + "109 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "21 0 R": { + "110 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "22 0 R": { + "111 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "23 0 R": { + "112 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "24 0 R": { + "113 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "25 0 R": { + "114 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "26 0 R": { + "115 0 R": { "stream": { "filter": null, - "is": true, - "length": 82 + "is": false, + "length": null } }, - "27 0 R": { + "116 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "28 0 R": { + "117 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "29 0 R": { + "118 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "3 0 R": { + "119 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "30 0 R": { + "120 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "31 0 R": { + "121 0 R": { "stream": { "filter": null, - "is": true, - "length": 82 + "is": false, + "length": null } }, - "32 0 R": { + "122 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "33 0 R": { + "123 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "34 0 R": { + "124 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "35 0 R": { + "125 0 R": { "stream": { "filter": null, - "is": true, - "length": 82 + "is": false, + "length": null } }, - "36 0 R": { + "126 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "37 0 R": { + "127 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "38 0 R": { + "128 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "39 0 R": { + "129 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "4 0 R": { + "130 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "40 0 R": { + "131 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "41 0 R": { + "132 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "42 0 R": { + "133 0 R": { "stream": { "filter": null, - "is": true, - "length": 46 + "is": false, + "length": null } }, - "43 0 R": { + "134 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "44 0 R": { + "135 0 R": { "stream": { "filter": null, - "is": true, - "length": 46 + "is": false, + "length": null } }, - "45 0 R": { + "136 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "46 0 R": { + "137 0 R": { "stream": { "filter": null, - "is": true, - "length": 47 + "is": false, + "length": null } }, - "47 0 R": { + "138 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "48 0 R": { + "139 0 R": { "stream": { "filter": null, - "is": true, - "length": 45 + "is": false, + "length": null } }, - "49 0 R": { + "140 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "5 0 R": { + "141 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "50 0 R": { + "142 0 R": { "stream": { "filter": null, "is": true, - "length": 4747 + "length": 702 } }, - "51 0 R": { + "143 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "52 0 R": { + "144 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "53 0 R": { + "145 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "54 0 R": { + "146 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 582 } }, - "55 0 R": { + "147 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "56 0 R": { + "148 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "57 0 R": { + "149 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "58 0 R": { + "150 0 R": { "stream": { "filter": null, - "is": true, - "length": 220 + "is": false, + "length": null } }, - "59 0 R": { + "151 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "6 0 R": { + "152 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "60 0 R": { + "153 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "61 0 R": { + "154 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "62 0 R": { + "155 0 R": { "stream": { "filter": null, - "is": true, - "length": 220 + "is": false, + "length": null } }, - "63 0 R": { + "156 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "64 0 R": { + "157 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "65 0 R": { + "158 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "66 0 R": { + "159 0 R": { "stream": { "filter": null, - "is": true, - "length": 220 + "is": false, + "length": null } }, - "67 0 R": { + "160 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "68 0 R": { + "161 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "69 0 R": { + "162 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "7 0 R": { + "163 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "70 0 R": { + "164 0 R": { "stream": { "filter": null, - "is": true, - "length": 220 + "is": false, + "length": null } }, - "71 0 R": { + "165 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "72 0 R": { + "166 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "73 0 R": { + "167 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "74 0 R": { + "168 0 R": { "stream": { "filter": null, - "is": true, - "length": 220 + "is": false, + "length": null } }, - "75 0 R": { + "169 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "76 0 R": { + "170 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "77 0 R": { + "171 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "78 0 R": { + "172 0 R": { "stream": { "filter": null, - "is": true, - "length": 220 + "is": false, + "length": null } }, - "79 0 R": { + "173 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "8 0 R": { + "174 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "80 0 R": { + "175 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "81 0 R": { + "176 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "82 0 R": { + "177 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "83 0 R": { + "178 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "84 0 R": { + "179 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "85 0 R": { + "180 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "86 0 R": { + "181 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "87 0 R": { + "182 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "88 0 R": { + "183 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "89 0 R": { + "184 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "9 0 R": { + "185 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "90 0 R": { + "186 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "91 0 R": { + "187 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "92 0 R": { + "188 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "93 0 R": { + "189 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "94 0 R": { + "190 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "95 0 R": { + "191 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "96 0 R": { + "192 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "97 0 R": { + "193 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 16184 } }, - "98 0 R": { + "194 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "99 0 R": { + "195 0 R": { + "stream": { + "filter": null, + "is": true, + "length": 11088 + } + }, + "196 0 R": { "stream": { "filter": null, "is": false, diff --git a/qpdf/qtest/qpdf/json-field-types.out b/qpdf/qtest/qpdf/json-field-types.out index 106de5aa..43e07e53 100644 --- a/qpdf/qtest/qpdf/json-field-types.out +++ b/qpdf/qtest/qpdf/json-field-types.out @@ -2727,1365 +2727,1365 @@ "length": null } }, - "10 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "100 0 R": { + "2 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "101 0 R": { + "3 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "102 0 R": { + "4 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "103 0 R": { + "5 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "104 0 R": { + "6 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "105 0 R": { + "7 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "106 0 R": { + "8 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "107 0 R": { + "9 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "108 0 R": { + "10 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "109 0 R": { + "11 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "11 0 R": { + "12 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "110 0 R": { + "13 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "111 0 R": { + "14 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "112 0 R": { + "15 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "113 0 R": { + "16 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "114 0 R": { + "17 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "115 0 R": { + "18 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "116 0 R": { + "19 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "117 0 R": { + "20 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "118 0 R": { + "21 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "119 0 R": { + "22 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "12 0 R": { + "23 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "120 0 R": { + "24 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "121 0 R": { + "25 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "122 0 R": { + "26 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 82 } }, - "123 0 R": { + "27 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "124 0 R": { + "28 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "125 0 R": { + "29 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "126 0 R": { + "30 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "127 0 R": { + "31 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 82 } }, - "128 0 R": { + "32 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "129 0 R": { + "33 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "13 0 R": { + "34 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "130 0 R": { + "35 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 82 } }, - "131 0 R": { + "36 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "132 0 R": { + "37 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "133 0 R": { + "38 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "134 0 R": { + "39 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "135 0 R": { + "40 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "136 0 R": { + "41 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "137 0 R": { + "42 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 46 } }, - "138 0 R": { + "43 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "139 0 R": { + "44 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 46 } }, - "14 0 R": { + "45 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "140 0 R": { + "46 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 47 } }, - "141 0 R": { + "47 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "142 0 R": { + "48 0 R": { "stream": { "filter": null, "is": true, - "length": 702 + "length": 45 } }, - "143 0 R": { + "49 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "144 0 R": { + "50 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 4747 } }, - "145 0 R": { + "51 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "146 0 R": { + "52 0 R": { "stream": { "filter": null, - "is": true, - "length": 582 + "is": false, + "length": null } }, - "147 0 R": { + "53 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "148 0 R": { + "54 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "149 0 R": { + "55 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "15 0 R": { + "56 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "150 0 R": { + "57 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "151 0 R": { + "58 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 220 } }, - "152 0 R": { + "59 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "153 0 R": { + "60 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "154 0 R": { + "61 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "155 0 R": { + "62 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 220 } }, - "156 0 R": { + "63 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "157 0 R": { + "64 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "158 0 R": { + "65 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "159 0 R": { + "66 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 220 } }, - "16 0 R": { + "67 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "160 0 R": { + "68 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "161 0 R": { + "69 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "162 0 R": { + "70 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 220 } }, - "163 0 R": { + "71 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "164 0 R": { + "72 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "165 0 R": { + "73 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "166 0 R": { + "74 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 220 } }, - "167 0 R": { + "75 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "168 0 R": { + "76 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "169 0 R": { + "77 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "17 0 R": { + "78 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 220 } }, - "170 0 R": { + "79 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "171 0 R": { + "80 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 12 } }, - "172 0 R": { + "81 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "173 0 R": { + "82 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "174 0 R": { + "83 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "175 0 R": { + "84 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "176 0 R": { + "85 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "177 0 R": { + "86 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "178 0 R": { + "87 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "179 0 R": { + "88 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "18 0 R": { + "89 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "180 0 R": { + "90 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "181 0 R": { + "91 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "182 0 R": { + "92 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "183 0 R": { + "93 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "184 0 R": { + "94 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "185 0 R": { + "95 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "186 0 R": { + "96 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "187 0 R": { + "97 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "188 0 R": { + "98 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "189 0 R": { + "99 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "19 0 R": { + "100 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "190 0 R": { + "101 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "191 0 R": { + "102 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "192 0 R": { + "103 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "193 0 R": { + "104 0 R": { "stream": { "filter": null, - "is": true, - "length": 16184 + "is": false, + "length": null } }, - "194 0 R": { + "105 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "195 0 R": { + "106 0 R": { "stream": { "filter": null, - "is": true, - "length": 11088 + "is": false, + "length": null } }, - "196 0 R": { + "107 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "2 0 R": { + "108 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "20 0 R": { + "109 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "21 0 R": { + "110 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "22 0 R": { + "111 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "23 0 R": { + "112 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "24 0 R": { + "113 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "25 0 R": { + "114 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "26 0 R": { + "115 0 R": { "stream": { "filter": null, - "is": true, - "length": 82 + "is": false, + "length": null } }, - "27 0 R": { + "116 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "28 0 R": { + "117 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "29 0 R": { + "118 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "3 0 R": { + "119 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "30 0 R": { + "120 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "31 0 R": { + "121 0 R": { "stream": { "filter": null, - "is": true, - "length": 82 + "is": false, + "length": null } }, - "32 0 R": { + "122 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "33 0 R": { + "123 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "34 0 R": { + "124 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "35 0 R": { + "125 0 R": { "stream": { "filter": null, - "is": true, - "length": 82 + "is": false, + "length": null } }, - "36 0 R": { + "126 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "37 0 R": { + "127 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "38 0 R": { + "128 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "39 0 R": { + "129 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "4 0 R": { + "130 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "40 0 R": { + "131 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "41 0 R": { + "132 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "42 0 R": { + "133 0 R": { "stream": { "filter": null, - "is": true, - "length": 46 + "is": false, + "length": null } }, - "43 0 R": { + "134 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "44 0 R": { + "135 0 R": { "stream": { "filter": null, - "is": true, - "length": 46 + "is": false, + "length": null } }, - "45 0 R": { + "136 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "46 0 R": { + "137 0 R": { "stream": { "filter": null, - "is": true, - "length": 47 + "is": false, + "length": null } }, - "47 0 R": { + "138 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "48 0 R": { + "139 0 R": { "stream": { "filter": null, - "is": true, - "length": 45 + "is": false, + "length": null } }, - "49 0 R": { + "140 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "5 0 R": { + "141 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "50 0 R": { + "142 0 R": { "stream": { "filter": null, "is": true, - "length": 4747 + "length": 702 } }, - "51 0 R": { + "143 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "52 0 R": { + "144 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "53 0 R": { + "145 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "54 0 R": { + "146 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 582 } }, - "55 0 R": { + "147 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "56 0 R": { + "148 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "57 0 R": { + "149 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "58 0 R": { + "150 0 R": { "stream": { "filter": null, - "is": true, - "length": 220 + "is": false, + "length": null } }, - "59 0 R": { + "151 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "6 0 R": { + "152 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "60 0 R": { + "153 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "61 0 R": { + "154 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "62 0 R": { + "155 0 R": { "stream": { "filter": null, - "is": true, - "length": 220 + "is": false, + "length": null } }, - "63 0 R": { + "156 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "64 0 R": { + "157 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "65 0 R": { + "158 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "66 0 R": { + "159 0 R": { "stream": { "filter": null, - "is": true, - "length": 220 + "is": false, + "length": null } }, - "67 0 R": { + "160 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "68 0 R": { + "161 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "69 0 R": { + "162 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "7 0 R": { + "163 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "70 0 R": { + "164 0 R": { "stream": { "filter": null, - "is": true, - "length": 220 + "is": false, + "length": null } }, - "71 0 R": { + "165 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "72 0 R": { + "166 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "73 0 R": { + "167 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "74 0 R": { + "168 0 R": { "stream": { "filter": null, - "is": true, - "length": 220 + "is": false, + "length": null } }, - "75 0 R": { + "169 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "76 0 R": { + "170 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "77 0 R": { + "171 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "78 0 R": { + "172 0 R": { "stream": { "filter": null, - "is": true, - "length": 220 + "is": false, + "length": null } }, - "79 0 R": { + "173 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "8 0 R": { + "174 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "80 0 R": { + "175 0 R": { "stream": { "filter": null, - "is": true, - "length": 12 + "is": false, + "length": null } }, - "81 0 R": { + "176 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "82 0 R": { + "177 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "83 0 R": { + "178 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "84 0 R": { + "179 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "85 0 R": { + "180 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "86 0 R": { + "181 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "87 0 R": { + "182 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "88 0 R": { + "183 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "89 0 R": { + "184 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "9 0 R": { + "185 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "90 0 R": { + "186 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "91 0 R": { + "187 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "92 0 R": { + "188 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "93 0 R": { + "189 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "94 0 R": { + "190 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "95 0 R": { + "191 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "96 0 R": { + "192 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "97 0 R": { + "193 0 R": { "stream": { "filter": null, - "is": false, - "length": null + "is": true, + "length": 16184 } }, - "98 0 R": { + "194 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "99 0 R": { + "195 0 R": { + "stream": { + "filter": null, + "is": true, + "length": 11088 + } + }, + "196 0 R": { "stream": { "filter": null, "is": false, diff --git a/qpdf/qtest/qpdf/json-image-streams-all.out b/qpdf/qtest/qpdf/json-image-streams-all.out index 68404e4b..e8dba0e9 100644 --- a/qpdf/qtest/qpdf/json-image-streams-all.out +++ b/qpdf/qtest/qpdf/json-image-streams-all.out @@ -648,6 +648,62 @@ "length": null } }, + "2 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "3 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "4 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "5 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "6 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "7 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "8 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "9 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, "10 0 R": { "stream": { "filter": null, @@ -718,13 +774,6 @@ "length": 94 } }, - "2 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "20 0 R": { "stream": { "filter": null, @@ -795,61 +844,12 @@ "length": 107 } }, - "3 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "30 0 R": { "stream": { "filter": "/RunLengthDecode", "is": true, "length": 3001 } - }, - "4 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "5 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "6 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "7 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "8 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "9 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } } } } diff --git a/qpdf/qtest/qpdf/json-image-streams-small.out b/qpdf/qtest/qpdf/json-image-streams-small.out index a73db43b..0f6ef237 100644 --- a/qpdf/qtest/qpdf/json-image-streams-small.out +++ b/qpdf/qtest/qpdf/json-image-streams-small.out @@ -660,6 +660,62 @@ "length": null } }, + "2 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "3 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "4 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "5 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "6 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "7 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "8 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "9 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, "10 0 R": { "stream": { "filter": null, @@ -730,13 +786,6 @@ "length": 96 } }, - "2 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "20 0 R": { "stream": { "filter": "/FlateDecode", @@ -807,61 +856,12 @@ "length": 108 } }, - "3 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "30 0 R": { "stream": { "filter": "/RunLengthDecode", "is": true, "length": 37 } - }, - "4 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "5 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "6 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "7 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "8 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "9 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } } } } diff --git a/qpdf/qtest/qpdf/json-image-streams-specialized.out b/qpdf/qtest/qpdf/json-image-streams-specialized.out index 3479f3da..558baaf8 100644 --- a/qpdf/qtest/qpdf/json-image-streams-specialized.out +++ b/qpdf/qtest/qpdf/json-image-streams-specialized.out @@ -648,6 +648,62 @@ "length": null } }, + "2 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "3 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "4 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "5 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "6 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "7 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "8 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "9 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, "10 0 R": { "stream": { "filter": null, @@ -718,13 +774,6 @@ "length": 94 } }, - "2 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "20 0 R": { "stream": { "filter": null, @@ -795,61 +844,12 @@ "length": 107 } }, - "3 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "30 0 R": { "stream": { "filter": "/RunLengthDecode", "is": true, "length": 3001 } - }, - "4 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "5 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "6 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "7 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "8 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "9 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } } } } diff --git a/qpdf/qtest/qpdf/json-image-streams.out b/qpdf/qtest/qpdf/json-image-streams.out index 9aebe5a6..9cb0f859 100644 --- a/qpdf/qtest/qpdf/json-image-streams.out +++ b/qpdf/qtest/qpdf/json-image-streams.out @@ -648,6 +648,62 @@ "length": null } }, + "2 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "3 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "4 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "5 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "6 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "7 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "8 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "9 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, "10 0 R": { "stream": { "filter": null, @@ -718,13 +774,6 @@ "length": 94 } }, - "2 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "20 0 R": { "stream": { "filter": null, @@ -795,61 +844,12 @@ "length": 107 } }, - "3 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "30 0 R": { "stream": { "filter": "/RunLengthDecode", "is": true, "length": 3001 } - }, - "4 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "5 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "6 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "7 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "8 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "9 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } } } } diff --git a/qpdf/qtest/qpdf/json-outlines-with-actions.out b/qpdf/qtest/qpdf/json-outlines-with-actions.out index 819448ef..c52e9b58 100644 --- a/qpdf/qtest/qpdf/json-outlines-with-actions.out +++ b/qpdf/qtest/qpdf/json-outlines-with-actions.out @@ -1497,70 +1497,63 @@ "length": null } }, - "10 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "100 0 R": { + "2 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "101 0 R": { + "3 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "102 0 R": { + "4 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "103 0 R": { + "5 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "104 0 R": { + "6 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "105 0 R": { + "7 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "106 0 R": { + "8 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "107 0 R": { + "9 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "108 0 R": { + "10 0 R": { "stream": { "filter": null, "is": false, @@ -1630,13 +1623,6 @@ "length": null } }, - "2 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "20 0 R": { "stream": { "filter": null, @@ -1707,13 +1693,6 @@ "length": null } }, - "3 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "30 0 R": { "stream": { "filter": null, @@ -1784,13 +1763,6 @@ "length": null } }, - "4 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "40 0 R": { "stream": { "filter": null, @@ -1861,13 +1833,6 @@ "length": null } }, - "5 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "50 0 R": { "stream": { "filter": null, @@ -1938,13 +1903,6 @@ "length": null } }, - "6 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "60 0 R": { "stream": { "filter": null, @@ -2015,13 +1973,6 @@ "length": null } }, - "7 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "70 0 R": { "stream": { "filter": null, @@ -2092,13 +2043,6 @@ "length": null } }, - "8 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "80 0 R": { "stream": { "filter": null, @@ -2169,13 +2113,6 @@ "length": null } }, - "9 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "90 0 R": { "stream": { "filter": null, @@ -2245,6 +2182,69 @@ "is": false, "length": null } + }, + "100 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "101 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "102 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "103 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "104 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "105 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "106 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "107 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "108 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } } } } diff --git a/qpdf/qtest/qpdf/json-outlines-with-old-root-dests.out b/qpdf/qtest/qpdf/json-outlines-with-old-root-dests.out index 2bb57b4d..49ecb410 100644 --- a/qpdf/qtest/qpdf/json-outlines-with-old-root-dests.out +++ b/qpdf/qtest/qpdf/json-outlines-with-old-root-dests.out @@ -1607,63 +1607,63 @@ "length": null } }, - "10 0 R": { + "2 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "100 0 R": { + "3 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "101 0 R": { + "4 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "102 0 R": { + "5 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "103 0 R": { + "6 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "104 0 R": { + "7 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "105 0 R": { + "8 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "106 0 R": { + "9 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "107 0 R": { + "10 0 R": { "stream": { "filter": null, "is": false, @@ -1733,13 +1733,6 @@ "length": null } }, - "2 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "20 0 R": { "stream": { "filter": null, @@ -1810,13 +1803,6 @@ "length": null } }, - "3 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "30 0 R": { "stream": { "filter": null, @@ -1887,13 +1873,6 @@ "length": null } }, - "4 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "40 0 R": { "stream": { "filter": null, @@ -1964,13 +1943,6 @@ "length": null } }, - "5 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "50 0 R": { "stream": { "filter": null, @@ -2041,13 +2013,6 @@ "length": null } }, - "6 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "60 0 R": { "stream": { "filter": null, @@ -2118,13 +2083,6 @@ "length": null } }, - "7 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "70 0 R": { "stream": { "filter": null, @@ -2195,13 +2153,6 @@ "length": null } }, - "8 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "80 0 R": { "stream": { "filter": null, @@ -2272,13 +2223,6 @@ "length": null } }, - "9 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "90 0 R": { "stream": { "filter": null, @@ -2348,6 +2292,62 @@ "is": false, "length": null } + }, + "100 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "101 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "102 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "103 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "104 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "105 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "106 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "107 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } } } } diff --git a/qpdf/qtest/qpdf/json-page-labels-and-outlines.out b/qpdf/qtest/qpdf/json-page-labels-and-outlines.out index 52f36f21..4154693d 100644 --- a/qpdf/qtest/qpdf/json-page-labels-and-outlines.out +++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines.out @@ -1708,56 +1708,63 @@ "length": null } }, - "10 0 R": { + "2 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "100 0 R": { + "3 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "101 0 R": { + "4 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "102 0 R": { + "5 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "103 0 R": { + "6 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "104 0 R": { + "7 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "105 0 R": { + "8 0 R": { "stream": { "filter": null, "is": false, "length": null } }, - "106 0 R": { + "9 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "10 0 R": { "stream": { "filter": null, "is": false, @@ -1827,13 +1834,6 @@ "length": null } }, - "2 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "20 0 R": { "stream": { "filter": null, @@ -1904,13 +1904,6 @@ "length": null } }, - "3 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "30 0 R": { "stream": { "filter": null, @@ -1981,13 +1974,6 @@ "length": 46 } }, - "4 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "40 0 R": { "stream": { "filter": null, @@ -2058,13 +2044,6 @@ "length": 46 } }, - "5 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "50 0 R": { "stream": { "filter": null, @@ -2135,13 +2114,6 @@ "length": 47 } }, - "6 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "60 0 R": { "stream": { "filter": null, @@ -2212,13 +2184,6 @@ "length": 47 } }, - "7 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "70 0 R": { "stream": { "filter": null, @@ -2289,13 +2254,6 @@ "length": 47 } }, - "8 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "80 0 R": { "stream": { "filter": null, @@ -2366,13 +2324,6 @@ "length": 47 } }, - "9 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "90 0 R": { "stream": { "filter": null, @@ -2442,6 +2393,55 @@ "is": false, "length": null } + }, + "100 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "101 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "102 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "103 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "104 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "105 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "106 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } } } } diff --git a/qpdf/qtest/qpdf/json-page-labels-num-tree.out b/qpdf/qtest/qpdf/json-page-labels-num-tree.out index a7a3dec0..a4bc2cfa 100644 --- a/qpdf/qtest/qpdf/json-page-labels-num-tree.out +++ b/qpdf/qtest/qpdf/json-page-labels-num-tree.out @@ -1343,6 +1343,62 @@ "length": null } }, + "2 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "3 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "4 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "5 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "6 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "7 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "8 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "9 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, "10 0 R": { "stream": { "filter": null, @@ -1413,13 +1469,6 @@ "length": null } }, - "2 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "20 0 R": { "stream": { "filter": null, @@ -1490,13 +1539,6 @@ "length": null } }, - "3 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "30 0 R": { "stream": { "filter": null, @@ -1567,13 +1609,6 @@ "length": null } }, - "4 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "40 0 R": { "stream": { "filter": null, @@ -1644,13 +1679,6 @@ "length": null } }, - "5 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "50 0 R": { "stream": { "filter": null, @@ -1721,13 +1749,6 @@ "length": null } }, - "6 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "60 0 R": { "stream": { "filter": null, @@ -1798,13 +1819,6 @@ "length": null } }, - "7 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "70 0 R": { "stream": { "filter": null, @@ -1875,13 +1889,6 @@ "length": null } }, - "8 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "80 0 R": { "stream": { "filter": null, @@ -1952,13 +1959,6 @@ "length": null } }, - "9 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "90 0 R": { "stream": { "filter": null, diff --git a/qpdf/qtest/qpdf/page_api_2-json-objects.out b/qpdf/qtest/qpdf/page_api_2-json-objects.out index d3d0619d..e97d6ef3 100644 --- a/qpdf/qtest/qpdf/page_api_2-json-objects.out +++ b/qpdf/qtest/qpdf/page_api_2-json-objects.out @@ -93,13 +93,6 @@ "length": null } }, - "10 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "2 0 R": { "stream": { "filter": null, @@ -155,6 +148,13 @@ "is": true, "length": 47 } + }, + "10 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } } } } diff --git a/qpdf/qtest/qpdf/page_api_2-json-pages.out b/qpdf/qtest/qpdf/page_api_2-json-pages.out index fd5aef89..56aa5497 100644 --- a/qpdf/qtest/qpdf/page_api_2-json-pages.out +++ b/qpdf/qtest/qpdf/page_api_2-json-pages.out @@ -145,20 +145,6 @@ "length": null } }, - "10 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "11 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "2 0 R": { "stream": { "filter": null, @@ -214,6 +200,20 @@ "is": true, "length": 47 } + }, + "10 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "11 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } } } } |