octoleo
/
qpdf
mirror of https://github.com/qpdf/qpdf.git
2
1
Fork 0
Code Issues Releases Wiki Activity

Make newly created name/number trees indirect objects

This commit is contained in:
Jay Berkenbilt 2021-02-07 18:49:30 -05:00
parent 553ac7f353
commit bfbeec5497
4 changed files with 62 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
examples/qtest/name-number-tree/out.pdf
View File

@ -6,37 +6,57 @@
1 0 obj 1 0 obj
<< <<
/Example << /Example <<
/NameTree << /NameTree 2 0 R
/Names [ /NumberTree 3 0 R
(B)
(bishop)
(N)
(knight)
(Q)
(queen)
(R)
(rook)
]
>>
/NumberTree <<
/Kids [
2 0 R
3 0 R
4 0 R
]
/Limits [
7
343
]
>>
>> >>
/Pages 5 0 R /Pages 4 0 R
/Type /Catalog /Type /Catalog
>> >>
endobj endobj
%% Original object ID: 3 0 %% Original object ID: 3 0
2 0 obj 2 0 obj
<<
/Names [
(B)
(bishop)
(N)
(knight)
(Q)
(queen)
(R)
(rook)
]
>>
endobj
%% Original object ID: 4 0
3 0 obj
<<
/Kids [
5 0 R
6 0 R
7 0 R
]
/Limits [
7
343
]
>>
endobj
%% Original object ID: 2 0
4 0 obj
<<
/Count 0
/Kids [
]
/Type /Pages
>>
endobj
%% Original object ID: 5 0
5 0 obj
<< <<
/Limits [ /Limits [
7 7
@ -73,8 +93,8 @@ endobj
>> >>
endobj endobj
%% Original object ID: 4 0 %% Original object ID: 6 0
3 0 obj 6 0 obj
<< <<
/Limits [ /Limits [
119 119
@ -111,8 +131,8 @@ endobj
>> >>
endobj endobj
%% Original object ID: 5 0 %% Original object ID: 7 0
4 0 obj 7 0 obj
<< <<
/Limits [ /Limits [
231 231
@ -151,29 +171,21 @@ endobj
>> >>
endobj endobj
%% Original object ID: 2 0
5 0 obj
<<
/Count 0
/Kids [
]
/Type /Pages
>>
endobj
xref xref
0 6 0 8
0000000000 65535 f 0000000000 65535 f
0000000052 00000 n 0000000052 00000 n
0000000448 00000 n 0000000194 00000 n
0000000775 00000 n 0000000339 00000 n
0000001130 00000 n 0000000462 00000 n
0000001505 00000 n 0000000551 00000 n
0000000878 00000 n
0000001233 00000 n
trailer << trailer <<
/Root 1 0 R /Root 1 0 R
/Size 6 /Size 8
/ID [<31415926535897932384626433832795><31415926535897932384626433832795>] /ID [<31415926535897932384626433832795><31415926535897932384626433832795>]
>> >>
startxref startxref
1567 1581
%%EOF %%EOF

3
libqpdf/QPDFNameTreeObjectHelper.cc
View File

@ -60,7 +60,8 @@ QPDFNameTreeObjectHelper
QPDFNameTreeObjectHelper::newEmpty(QPDF& qpdf, bool auto_repair) QPDFNameTreeObjectHelper::newEmpty(QPDF& qpdf, bool auto_repair)
{ {
return QPDFNameTreeObjectHelper( return QPDFNameTreeObjectHelper(
QPDFObjectHandle::parse("<< /Names [] >>"), qpdf, auto_repair); qpdf.makeIndirectObject(
QPDFObjectHandle::parse("<< /Names [] >>")), qpdf, auto_repair);
} }
QPDFNameTreeObjectHelper::iterator::iterator( QPDFNameTreeObjectHelper::iterator::iterator(

3
libqpdf/QPDFNumberTreeObjectHelper.cc
View File

@ -56,7 +56,8 @@ QPDFNumberTreeObjectHelper
QPDFNumberTreeObjectHelper::newEmpty(QPDF& qpdf, bool auto_repair) QPDFNumberTreeObjectHelper::newEmpty(QPDF& qpdf, bool auto_repair)
{ {
return QPDFNumberTreeObjectHelper( return QPDFNumberTreeObjectHelper(
QPDFObjectHandle::parse("<< /Nums [] >>"), qpdf, auto_repair); qpdf.makeIndirectObject(
QPDFObjectHandle::parse("<< /Nums [] >>")), qpdf, auto_repair);
} }
QPDFNumberTreeObjectHelper::iterator::iterator( QPDFNumberTreeObjectHelper::iterator::iterator(

2
libtests/qutil.cc
View File

@ -487,7 +487,7 @@ void read_from_file_test()
Pl_Buffer b2("buffer"); Pl_Buffer b2("buffer");
// QUtil::file_provider also exercises QUtil::pipe_file // QUtil::file_provider also exercises QUtil::pipe_file
QUtil::file_provider("other-file")(&b2); QUtil::file_provider("other-file")(&b2);
auto buf2 = b2.getBuffer(); PointerHolder<Buffer> buf2 = b2.getBuffer();
assert(buf2->getSize() == size); assert(buf2->getSize() == size);
assert(memcmp(buf2->getBuffer(), p, size) == 0); assert(memcmp(buf2->getBuffer(), p, size) == 0);
} }