diff --git a/TODO b/TODO index d33141ba..7ec4085e 100644 --- a/TODO +++ b/TODO @@ -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 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,6 +2727,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, @@ -2734,76 +2790,6 @@ "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 - } - }, - "109 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "11 0 R": { "stream": { "filter": null, @@ -2811,76 +2797,6 @@ "length": null } }, - "110 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "111 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "112 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "113 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "114 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "115 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "116 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "117 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "118 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "119 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "12 0 R": { "stream": { "filter": null, @@ -2888,76 +2804,6 @@ "length": null } }, - "120 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "121 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "122 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "123 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "124 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "125 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "126 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "127 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "128 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "129 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "13 0 R": { "stream": { "filter": null, @@ -2965,76 +2811,6 @@ "length": null } }, - "130 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "131 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "132 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "133 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "134 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "135 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "136 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "137 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "138 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "139 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "14 0 R": { "stream": { "filter": null, @@ -3042,76 +2818,6 @@ "length": null } }, - "140 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "141 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "142 0 R": { - "stream": { - "filter": null, - "is": true, - "length": 702 - } - }, - "143 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "144 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "145 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "146 0 R": { - "stream": { - "filter": null, - "is": true, - "length": 582 - } - }, - "147 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "148 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "149 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "15 0 R": { "stream": { "filter": null, @@ -3119,76 +2825,6 @@ "length": null } }, - "150 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "151 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "152 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "153 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "154 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "155 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "156 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "157 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "158 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "159 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "16 0 R": { "stream": { "filter": null, @@ -3196,76 +2832,6 @@ "length": null } }, - "160 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "161 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "162 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "163 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "164 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "165 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "166 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "167 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "168 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "169 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "17 0 R": { "stream": { "filter": null, @@ -3273,76 +2839,6 @@ "length": null } }, - "170 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "171 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "172 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "173 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "174 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "175 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "176 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "177 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "178 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "179 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "18 0 R": { "stream": { "filter": null, @@ -3350,76 +2846,6 @@ "length": null } }, - "180 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "181 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "182 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "183 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "184 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "185 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "186 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "187 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "188 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "189 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "19 0 R": { "stream": { "filter": null, @@ -3427,62 +2853,6 @@ "length": 12 } }, - "190 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "191 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "192 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "193 0 R": { - "stream": { - "filter": null, - "is": true, - "length": 16184 - } - }, - "194 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "195 0 R": { - "stream": { - "filter": null, - "is": true, - "length": 11088 - } - }, - "196 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "2 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "20 0 R": { "stream": { "filter": null, @@ -3553,13 +2923,6 @@ "length": 12 } }, - "3 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "30 0 R": { "stream": { "filter": null, @@ -3630,13 +2993,6 @@ "length": null } }, - "4 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "40 0 R": { "stream": { "filter": null, @@ -3707,13 +3063,6 @@ "length": null } }, - "5 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "50 0 R": { "stream": { "filter": null, @@ -3784,13 +3133,6 @@ "length": null } }, - "6 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "60 0 R": { "stream": { "filter": null, @@ -3861,13 +3203,6 @@ "length": null } }, - "7 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "70 0 R": { "stream": { "filter": null, @@ -3938,13 +3273,6 @@ "length": null } }, - "8 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "80 0 R": { "stream": { "filter": null, @@ -4015,13 +3343,6 @@ "length": null } }, - "9 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "90 0 R": { "stream": { "filter": null, @@ -4091,6 +3412,685 @@ "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 + } + }, + "109 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "110 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "111 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "112 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "113 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "114 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "115 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "116 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "117 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "118 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "119 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "120 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "121 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "122 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "123 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "124 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "125 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "126 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "127 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "128 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "129 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "130 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "131 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "132 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "133 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "134 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "135 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "136 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "137 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "138 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "139 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "140 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "141 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "142 0 R": { + "stream": { + "filter": null, + "is": true, + "length": 702 + } + }, + "143 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "144 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "145 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "146 0 R": { + "stream": { + "filter": null, + "is": true, + "length": 582 + } + }, + "147 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "148 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "149 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "150 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "151 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "152 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "153 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "154 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "155 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "156 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "157 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "158 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "159 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "160 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "161 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "162 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "163 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "164 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "165 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "166 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "167 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "168 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "169 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "170 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "171 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "172 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "173 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "174 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "175 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "176 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "177 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "178 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "179 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "180 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "181 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "182 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "183 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "184 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "185 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "186 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "187 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "188 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "189 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "190 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "191 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "192 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "193 0 R": { + "stream": { + "filter": null, + "is": true, + "length": 16184 + } + }, + "194 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "195 0 R": { + "stream": { + "filter": null, + "is": true, + "length": 11088 + } + }, + "196 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } } } } 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,6 +2727,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, @@ -2734,76 +2790,6 @@ "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 - } - }, - "109 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "11 0 R": { "stream": { "filter": null, @@ -2811,76 +2797,6 @@ "length": null } }, - "110 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "111 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "112 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "113 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "114 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "115 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "116 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "117 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "118 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "119 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "12 0 R": { "stream": { "filter": null, @@ -2888,76 +2804,6 @@ "length": null } }, - "120 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "121 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "122 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "123 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "124 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "125 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "126 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "127 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "128 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "129 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "13 0 R": { "stream": { "filter": null, @@ -2965,76 +2811,6 @@ "length": null } }, - "130 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "131 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "132 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "133 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "134 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "135 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "136 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "137 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "138 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "139 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "14 0 R": { "stream": { "filter": null, @@ -3042,76 +2818,6 @@ "length": null } }, - "140 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "141 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "142 0 R": { - "stream": { - "filter": null, - "is": true, - "length": 702 - } - }, - "143 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "144 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "145 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "146 0 R": { - "stream": { - "filter": null, - "is": true, - "length": 582 - } - }, - "147 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "148 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "149 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "15 0 R": { "stream": { "filter": null, @@ -3119,76 +2825,6 @@ "length": null } }, - "150 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "151 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "152 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "153 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "154 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "155 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "156 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "157 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "158 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "159 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "16 0 R": { "stream": { "filter": null, @@ -3196,76 +2832,6 @@ "length": null } }, - "160 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "161 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "162 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "163 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "164 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "165 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "166 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "167 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "168 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "169 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "17 0 R": { "stream": { "filter": null, @@ -3273,76 +2839,6 @@ "length": null } }, - "170 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "171 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "172 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "173 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "174 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "175 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "176 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "177 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "178 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "179 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "18 0 R": { "stream": { "filter": null, @@ -3350,76 +2846,6 @@ "length": null } }, - "180 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "181 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "182 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "183 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "184 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "185 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "186 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "187 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "188 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "189 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "19 0 R": { "stream": { "filter": null, @@ -3427,62 +2853,6 @@ "length": 12 } }, - "190 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "191 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "192 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "193 0 R": { - "stream": { - "filter": null, - "is": true, - "length": 16184 - } - }, - "194 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "195 0 R": { - "stream": { - "filter": null, - "is": true, - "length": 11088 - } - }, - "196 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, - "2 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "20 0 R": { "stream": { "filter": null, @@ -3553,13 +2923,6 @@ "length": 12 } }, - "3 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "30 0 R": { "stream": { "filter": null, @@ -3630,13 +2993,6 @@ "length": null } }, - "4 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "40 0 R": { "stream": { "filter": null, @@ -3707,13 +3063,6 @@ "length": null } }, - "5 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "50 0 R": { "stream": { "filter": null, @@ -3784,13 +3133,6 @@ "length": null } }, - "6 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "60 0 R": { "stream": { "filter": null, @@ -3861,13 +3203,6 @@ "length": null } }, - "7 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "70 0 R": { "stream": { "filter": null, @@ -3938,13 +3273,6 @@ "length": null } }, - "8 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "80 0 R": { "stream": { "filter": null, @@ -4015,13 +3343,6 @@ "length": null } }, - "9 0 R": { - "stream": { - "filter": null, - "is": false, - "length": null - } - }, "90 0 R": { "stream": { "filter": null, @@ -4091,6 +3412,685 @@ "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 + } + }, + "109 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "110 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "111 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "112 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "113 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "114 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "115 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "116 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "117 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "118 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "119 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "120 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "121 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "122 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "123 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "124 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "125 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "126 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "127 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "128 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "129 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "130 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "131 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "132 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "133 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "134 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "135 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "136 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "137 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "138 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "139 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "140 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "141 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "142 0 R": { + "stream": { + "filter": null, + "is": true, + "length": 702 + } + }, + "143 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "144 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "145 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "146 0 R": { + "stream": { + "filter": null, + "is": true, + "length": 582 + } + }, + "147 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "148 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "149 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "150 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "151 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "152 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "153 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "154 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "155 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "156 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "157 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "158 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "159 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "160 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "161 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "162 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "163 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "164 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "165 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "166 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "167 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "168 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "169 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "170 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "171 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "172 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "173 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "174 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "175 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "176 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "177 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "178 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "179 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "180 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "181 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "182 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "183 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "184 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "185 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "186 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "187 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "188 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "189 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "190 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "191 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "192 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "193 0 R": { + "stream": { + "filter": null, + "is": true, + "length": 16184 + } + }, + "194 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } + }, + "195 0 R": { + "stream": { + "filter": null, + "is": true, + "length": 11088 + } + }, + "196 0 R": { + "stream": { + "filter": null, + "is": false, + "length": null + } } } } 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,6 +1497,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, @@ -1504,69 +1560,6 @@ "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 - } - }, "11 0 R": { "stream": { "filter": null, @@ -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,6 +1607,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, @@ -1614,62 +1670,6 @@ "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 - } - }, "11 0 R": { "stream": { "filter": null, @@ -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,6 +1708,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, @@ -1715,55 +1771,6 @@ "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 - } - }, "11 0 R": { "stream": { "filter": null, @@ -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 + } } } }