Objectinfo json: write incrementally and in numeric order

This script was used on test data:

----------
#!/usr/bin/env python3
import json
import sys
import re

def json_dumps(data):
    return json.dumps(data, ensure_ascii=False,
                      indent=2, separators=(',', ': '))

for filename in sys.argv[1:]:
    with open(filename, 'r') as f:
        data = json.loads(f.read())
    if 'objectinfo' not in data:
        continue
    trailer = None
    to_sort = []
    for k, v in data['objectinfo'].items():
        if k == 'trailer':
            trailer = v
        else:
            m = re.match(r'^(\d+) \d+ R', k)
            if m:
                to_sort.append([int(m.group(1)), k, v])
    newobjectinfo = {x[1]: x[2] for x in sorted(to_sort)}
    if trailer is not None:
        newobjectinfo['trailer'] = trailer
    data['objectinfo'] = newobjectinfo
print(json_dumps(data))
----------
This commit is contained in:
Jay Berkenbilt 2022-05-06 19:08:31 -04:00
parent 948de60990
commit a9fbbd5dca
14 changed files with 2114 additions and 2121 deletions

10
TODO
View File

@ -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

View File

@ -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

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -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
}
}
}
}

View File

@ -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
}
}
}
}

View File

@ -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
}
}
}
}

View File

@ -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
}
}
}
}

View File

@ -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
}
}
}
}

View File

@ -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
}
}
}
}

View File

@ -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
}
}
}
}

View File

@ -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,

View File

@ -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
}
}
}
}

View File

@ -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
}
}
}
}