octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-22 02:49:00 +00:00
Code Issues Releases Wiki Activity

Overlay/underlay: capture origial page as form XObject (fixes #904)

Browse Source
This commit is contained in:
Jay Berkenbilt 2023-02-25 12:55:47 -05:00
parent 48bacbf2e6
commit 78f7dc9fe8
19 changed files with 11262 additions and 11349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2023-02-25 Jay Berkenbilt <ejb@ql.org>
* When performing overlay or underlay operations, convert the
origianal page to a form XObject instead of simply isolating its
contents with q/Q operators. This prevents unbalanced q/Q
operators in any of the original pages from messing up the
graphics state of anything that is overlaid on top of it. Fixes
#904.
2023-02-18 Jay Berkenbilt <ejb@ql.org>
* Treat all linearization errors and warnings as warnings, and

39
libqpdf/QPDFJob.cc
View File

@ -2082,11 +2082,6 @@ QPDFJob::doUnderOverlayForPage(
std::string content;
int min_suffix = 1;
QPDFObjectHandle resources = dest_page.getAttribute("/Resources", true);
if (!resources.isDictionary()) {
QTC::TC("qpdf", "QPDFJob overlay page with no resources");
resources = dest_page.getObjectHandle().replaceKeyAndGetNew(
"/Resources", QPDFObjectHandle::newDictionary());
}
for (int from_pageno: pagenos[pageno]) {
doIfVerbose([&](Pipeline& v, std::string const& prefix) {
v << " " << uo.which << " " << from_pageno << "\n";
@ -2179,7 +2174,24 @@ QPDFJob::handleUnderOverlay(QPDF& pdf)
overlay_pagenos.count(pageno))) {
continue;
}
// This code converts the original page, any underlays, and
// any overlays to form XObjects. Then it concatenates display
// of all underlays, the original page, and all overlays.
// Prior to 11.3.0, the original page contents were wrapped in
// q/Q, but this didin't work if the original page had
// unbalanced q/Q operators. See github issue #904.
auto& dest_page = main_pages.at(i);
auto dest_page_oh = dest_page.getObjectHandle();
auto this_page_fo = dest_page.getFormXObjectForPage();
// The resulting form xobject lazily reads the content from
// the original page, which we are going to replace. Therefore
// we have to explicitly copy it.
auto content_data = this_page_fo.getRawStreamData();
this_page_fo.replaceStreamData(
content_data, QPDFObjectHandle(), QPDFObjectHandle());
auto resources = dest_page_oh.replaceKeyAndGetNew(
"/Resources", "<< /XObject << >> >>"_qpdf);
resources.getKey("/XObject").replaceKeyAndGetNew("/Fx0", this_page_fo);
auto content = doUnderOverlayForPage(
pdf,
m->underlay,
@ -2188,15 +2200,16 @@ QPDFJob::handleUnderOverlay(QPDF& pdf)
underlay_fo,
upages,
dest_page);
if (!content.empty()) {
dest_page.addPageContents(pdf.newStream(content), true);
}
content = doUnderOverlayForPage(
content += dest_page.placeFormXObject(
this_page_fo,
"/Fx0",
dest_page.getMediaBox().getArrayAsRectangle(),
true,
false,
false);
content += doUnderOverlayForPage(
pdf, m->overlay, overlay_pagenos, i, overlay_fo, opages, dest_page);
if (!content.empty()) {
dest_page.addPageContents(pdf.newStream("q\n"), true);
dest_page.addPageContents(pdf.newStream("\nQ\n" + content), false);
}
dest_page_oh.replaceKey("/Contents", pdf.newStream(content));
}
}

5
manual/release-notes.rst
View File

@ -14,6 +14,11 @@ For a detailed list of changes, please see the file
- New option :qpdf:ref:`--remove-restrictions` removes security
restrictions from digitally signed files.
- Improve overlay/underlay so that the content a page with
unbalanced graphics state operators (``q``/``Q``) doesn't affect
the way subsequent pages are displayed. This changes the output
of all overlay/underlay operations.
- Library enhancements
- New method ``QPDF::removeSecurityRestrictions`` removes security

1
qpdf/qpdf.testcov
View File

@ -593,7 +593,6 @@ QPDF resolve duplicated page in insert 0
QPDFWriter preserve object streams 1
QPDFWriter exclude from object stream 0
QPDF_pages findPage not found 0
QPDFJob overlay page with no resources 0
QPDFObjectHandle check ownership 0
QPDFJob weak crypto error 0
qpdf-c called qpdf_oh_is_initialized 0

BIN
qpdf/qtest/qpdf/job-json-underlay-overlay-password.pdf
View File

Binary file not shown.

BIN
qpdf/qtest/qpdf/job-json-underlay-overlay.pdf
View File

Binary file not shown.

528
qpdf/qtest/qpdf/overlay-copy-annotations-p1.pdf
View File

@ -116,11 +116,7 @@ endobj
15 0 R
16 0 R
]
/Contents [
23 0 R
25 0 R
27 0 R
]
/Contents 23 0 R
/MediaBox [
0
0
@ -129,12 +125,9 @@ endobj
]
/Parent 3 0 R
/Resources <<
/Font <<
/F1 29 0 R
>>
/ProcSet 30 0 R
/XObject <<
/Fx1 31 0 R
/Fx0 25 0 R
/Fx1 27 0 R
>>
>>
/Type /Page
@ -158,7 +151,7 @@ endobj
118.8
11.322
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 11 0 R
@ -195,7 +188,7 @@ endobj
0
0
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 13 0 R
@ -220,8 +213,8 @@ endobj
<<
/AP <<
/N <<
/1 34 0 R
/Off 36 0 R
/1 30 0 R
/Off 32 0 R
>>
>>
/AS /1
@ -248,8 +241,8 @@ endobj
<<
/AP <<
/N <<
/2 38 0 R
/Off 40 0 R
/2 34 0 R
/Off 36 0 R
>>
>>
/AS /2
@ -276,8 +269,8 @@ endobj
<<
/AP <<
/N <<
/3 42 0 R
/Off 44 0 R
/3 38 0 R
/Off 40 0 R
>>
>>
/AS /3
@ -331,10 +324,10 @@ endobj
18 0 obj
<<
/AP <<
/N 46 0 R
/N 42 0 R
>>
/Contents (attachment1.txt)
/FS 48 0 R
/FS 44 0 R
/NM (attachment1.txt)
/Rect [
72
@ -350,7 +343,7 @@ endobj
19 0 obj
<<
/AP <<
/N 49 0 R
/N 45 0 R
>>
/DA ()
/Rect [
@ -367,7 +360,7 @@ endobj
20 0 obj
<<
/AP <<
/N 51 0 R
/N 47 0 R
>>
/DA ()
/Rect [
@ -384,7 +377,7 @@ endobj
21 0 obj
<<
/AP <<
/N 53 0 R
/N 49 0 R
>>
/DA ()
/Rect [
@ -401,7 +394,7 @@ endobj
22 0 obj
<<
/AP <<
/N 55 0 R
/N 51 0 R
>>
/DA ()
/Rect [
@ -422,16 +415,36 @@ endobj
>>
stream
q
1 0 0 1 0 0 cm
/Fx0 Do
Q
q
1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
24 0 obj
2
54
endobj
%% Contents for page 1
25 0 obj
<<
/BBox [
0
0
612
792
]
/Resources <<
/Font <<
/F1 53 0 R
>>
/ProcSet 54 0 R
>>
/Subtype /Form
/Type /XObject
/Length 26 0 R
>>
stream
@ -452,43 +465,7 @@ endobj
108
endobj
%% Contents for page 1
27 0 obj
<<
/Length 28 0 R
>>
stream
Q
q
1 0 0 1 0 0 cm
/Fx1 Do
Q
endstream
endobj
28 0 obj
30
endobj
29 0 obj
<<
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
/Name /F1
/Subtype /Type1
/Type /Font
>>
endobj
30 0 obj
[
/PDF
/Text
]
endobj
31 0 obj
<<
/BBox [
0
@ -503,7 +480,7 @@ endobj
>>
/Subtype /Form
/Type /XObject
/Length 32 0 R
/Length 28 0 R
>>
stream
q
@ -571,11 +548,11 @@ ET
endstream
endobj
32 0 obj
28 0 obj
874
endobj
33 0 obj
29 0 obj
<<
/Font <<
/F1 9 0 R
@ -583,6 +560,63 @@ endobj
>>
endobj
30 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 31 0 R
>>
stream
/Tx BMC
q BT
0.18039 0.20392 0.21176 rg /ZaDi 12.05 Tf
0 0 Td
ET
Q
1 0 0 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
3.6 7.35 4.65 8.4 6 8.4 c f*
EMC
endstream
endobj
31 0 obj
202
endobj
32 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 33 0 R
>>
stream
/Tx BMC
EMC
endstream
endobj
33 0 obj
12
endobj
34 0 obj
<<
/BBox [
@ -591,7 +625,7 @@ endobj
12.05
12.05
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 35 0 R
@ -603,7 +637,7 @@ q BT
0 0 Td
ET
Q
1 0 0 rg
0 1 0 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
@ -625,7 +659,7 @@ endobj
12.05
12.05
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 37 0 R
@ -648,7 +682,7 @@ endobj
12.05
12.05
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 39 0 R
@ -660,7 +694,7 @@ q BT
0 0 Td
ET
Q
0 1 0 rg
0 0 1 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
@ -682,7 +716,7 @@ endobj
12.05
12.05
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 41 0 R
@ -698,63 +732,6 @@ endobj
endobj
42 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Resources 57 0 R
/Subtype /Form
/Type /XObject
/Length 43 0 R
>>
stream
/Tx BMC
q BT
0.18039 0.20392 0.21176 rg /ZaDi 12.05 Tf
0 0 Td
ET
Q
0 0 1 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
3.6 7.35 4.65 8.4 6 8.4 c f*
EMC
endstream
endobj
43 0 obj
202
endobj
44 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Resources 57 0 R
/Subtype /Form
/Type /XObject
/Length 45 0 R
>>
stream
/Tx BMC
EMC
endstream
endobj
45 0 obj
12
endobj
46 0 obj
<<
/BBox [
0
@ -766,7 +743,7 @@ endobj
>>
/Subtype /Form
/Type /XObject
/Length 47 0 R
/Length 43 0 R
>>
stream
0 10 m
@ -779,15 +756,15 @@ S
endstream
endobj
47 0 obj
43 0 obj
52
endobj
48 0 obj
44 0 obj
<<
/EF <<
/F 58 0 R
/UF 58 0 R
/F 56 0 R
/UF 56 0 R
>>
/F (attachment1.txt)
/Type /Filespec
@ -795,6 +772,64 @@ endobj
>>
endobj
45 0 obj
<<
/BBox [
0
0
20
10
]
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 46 0 R
>>
stream
1 0 0 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
46 0 obj
36
endobj
47 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
0
1
-1
0
0
0
]
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 48 0 R
>>
stream
0 1 0 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
48 0 obj
36
endobj
49 0 obj
<<
/BBox [
@ -803,13 +838,21 @@ endobj
20
10
]
/Resources 33 0 R
/Matrix [
-1
0
0
-1
0
0
]
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 50 0 R
>>
stream
1 0 0 RG
0 0 1 RG
0 0 20 10 re
0 0 5 10 re
S
@ -830,84 +873,18 @@ endobj
]
/Matrix [
0
1
-1
1
0
0
0
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 52 0 R
>>
stream
0 1 0 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
52 0 obj
36
endobj
53 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
-1
0
0
-1
0
0
]
/Resources 33 0 R
/Subtype /Form
/Type /XObject
/Length 54 0 R
>>
stream
0 0 1 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
54 0 obj
36
endobj
55 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
0
-1
1
0
0
0
]
/Resources 33 0 R
/Subtype /Form
/Type /XObject
/Length 56 0 R
>>
stream
0.5 0 1 RG
0 0 20 10 re
0 0 5 10 re
@ -915,13 +892,30 @@ S
endstream
endobj
56 0 obj
52 0 obj
38
endobj
57 0 obj
53 0 obj
<<
/Font 60 0 R
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
/Name /F1
/Subtype /Type1
/Type /Font
>>
endobj
54 0 obj
[
/PDF
/Text
]
endobj
55 0 obj
<<
/Font 58 0 R
/ProcSet [
/PDF
/Text
@ -929,7 +923,7 @@ endobj
>>
endobj
58 0 obj
56 0 obj
<<
/Params <<
/CheckSum <80a33fc110b5a7b8b4d58b8d57e814bc>
@ -937,24 +931,24 @@ endobj
/Subtype /text#2fplain
>>
/Type /EmbeddedFile
/Length 59 0 R
/Length 57 0 R
>>
stream
content of attachment
endstream
endobj
59 0 obj
57 0 obj
22
endobj
60 0 obj
58 0 obj
<<
/ZaDi 61 0 R
/ZaDi 59 0 R
>>
endobj
61 0 obj
59 0 obj
<<
/BaseFont /ZapfDingbats
/Subtype /Type1
@ -963,7 +957,7 @@ endobj
endobj
xref
0 62
0 60
0000000000 65535 f
0000000025 00000 n
0000000097 00000 n
@ -973,64 +967,62 @@ xref
0000000545 00000 n
0000000794 00000 n
0000000923 00000 n
0000001326 00000 n
0000001430 00000 n
0000001646 00000 n
0000001666 00000 n
0000001937 00000 n
0000001957 00000 n
0000002268 00000 n
0000002579 00000 n
0000002890 00000 n
0000003134 00000 n
0000003338 00000 n
0000003478 00000 n
0000003620 00000 n
0000003762 00000 n
0000003927 00000 n
0000003986 00000 n
0000004028 00000 n
0000004193 00000 n
0000004237 00000 n
0000004324 00000 n
0000004344 00000 n
0000004463 00000 n
0000004499 00000 n
0000005563 00000 n
0000005584 00000 n
0000005637 00000 n
0000005996 00000 n
0000006017 00000 n
0000006186 00000 n
0000006206 00000 n
0000006565 00000 n
0000006586 00000 n
0000006755 00000 n
0000006775 00000 n
0000007134 00000 n
0000007155 00000 n
0000007324 00000 n
0000007344 00000 n
0000007548 00000 n
0000007568 00000 n
0000007699 00000 n
0000007886 00000 n
0000007906 00000 n
0000008146 00000 n
0000008166 00000 n
0000008407 00000 n
0000008427 00000 n
0000008669 00000 n
0000008689 00000 n
0000008763 00000 n
0000008971 00000 n
0000008991 00000 n
0000009029 00000 n
0000001255 00000 n
0000001359 00000 n
0000001575 00000 n
0000001595 00000 n
0000001866 00000 n
0000001886 00000 n
0000002197 00000 n
0000002508 00000 n
0000002819 00000 n
0000003063 00000 n
0000003267 00000 n
0000003407 00000 n
0000003549 00000 n
0000003691 00000 n
0000003856 00000 n
0000003967 00000 n
0000003987 00000 n
0000004306 00000 n
0000004327 00000 n
0000005391 00000 n
0000005412 00000 n
0000005465 00000 n
0000005824 00000 n
0000005845 00000 n
0000006014 00000 n
0000006034 00000 n
0000006393 00000 n
0000006414 00000 n
0000006583 00000 n
0000006603 00000 n
0000006962 00000 n
0000006983 00000 n
0000007152 00000 n
0000007172 00000 n
0000007376 00000 n
0000007396 00000 n
0000007527 00000 n
0000007714 00000 n
0000007734 00000 n
0000007974 00000 n
0000007994 00000 n
0000008235 00000 n
0000008255 00000 n
0000008497 00000 n
0000008517 00000 n
0000008636 00000 n
0000008672 00000 n
0000008746 00000 n
0000008954 00000 n
0000008974 00000 n
0000009012 00000 n
trailer <<
/Root 1 0 R
/Size 62
/Size 60
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
9110
9093
%%EOF

570
qpdf/qtest/qpdf/overlay-copy-annotations-p2.pdf
View File

@ -116,11 +116,7 @@ endobj
15 0 R
16 0 R
]
/Contents [
23 0 R
25 0 R
27 0 R
]
/Contents 23 0 R
/MediaBox [
0
0
@ -129,12 +125,9 @@ endobj
]
/Parent 3 0 R
/Resources <<
/Font <<
/F1 29 0 R
>>
/ProcSet 30 0 R
/XObject <<
/Fx1 31 0 R
/Fx0 25 0 R
/Fx1 27 0 R
>>
>>
/Type /Page
@ -167,7 +160,7 @@ endobj
153
198
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 11 0 R
@ -204,7 +197,7 @@ endobj
-198
153
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 13 0 R
@ -229,8 +222,8 @@ endobj
<<
/AP <<
/N <<
/1 34 0 R
/Off 36 0 R
/1 30 0 R
/Off 32 0 R
>>
>>
/AS /1
@ -257,8 +250,8 @@ endobj
<<
/AP <<
/N <<
/2 38 0 R
/Off 40 0 R
/2 34 0 R
/Off 36 0 R
>>
>>
/AS /2
@ -285,8 +278,8 @@ endobj
<<
/AP <<
/N <<
/3 42 0 R
/Off 44 0 R
/3 38 0 R
/Off 40 0 R
>>
>>
/AS /3
@ -340,10 +333,10 @@ endobj
18 0 obj
<<
/AP <<
/N 46 0 R
/N 42 0 R
>>
/Contents (attachment1.txt)
/FS 48 0 R
/FS 44 0 R
/NM (attachment1.txt)
/Rect [
189
@ -359,7 +352,7 @@ endobj
19 0 obj
<<
/AP <<
/N 49 0 R
/N 45 0 R
>>
/DA ()
/Rect [
@ -376,7 +369,7 @@ endobj
20 0 obj
<<
/AP <<
/N 51 0 R
/N 47 0 R
>>
/DA ()
/Rect [
@ -393,7 +386,7 @@ endobj
21 0 obj
<<
/AP <<
/N 53 0 R
/N 49 0 R
>>
/DA ()
/Rect [
@ -410,7 +403,7 @@ endobj
22 0 obj
<<
/AP <<
/N 55 0 R
/N 51 0 R
>>
/DA ()
/Rect [
@ -431,16 +424,44 @@ endobj
>>
stream
q
0.5 0 0 0.5 0 0 cm
/Fx0 Do
Q
q
0.5 0 0 0.5 153 198 cm
/Fx1 Do
Q
endstream
endobj
24 0 obj
2
66
endobj
%% Contents for page 1
25 0 obj
<<
/BBox [
0
0
612
792
]
/Matrix [
2
0
0
2
0
0
]
/Resources <<
/Font <<
/F1 53 0 R
>>
/ProcSet 54 0 R
>>
/Subtype /Form
/Type /XObject
/Length 26 0 R
>>
stream
@ -461,43 +482,7 @@ endobj
117
endobj
%% Contents for page 1
27 0 obj
<<
/Length 28 0 R
>>
stream
Q
q
0.5 0 0 0.5 153 198 cm
/Fx1 Do
Q
endstream
endobj
28 0 obj
38
endobj
29 0 obj
<<
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
/Name /F1
/Subtype /Type1
/Type /Font
>>
endobj
30 0 obj
[
/PDF
/Text
]
endobj
31 0 obj
<<
/BBox [
0
@ -512,7 +497,7 @@ endobj
>>
/Subtype /Form
/Type /XObject
/Length 32 0 R
/Length 28 0 R
>>
stream
q
@ -580,11 +565,11 @@ ET
endstream
endobj
32 0 obj
28 0 obj
874
endobj
33 0 obj
29 0 obj
<<
/Font <<
/F1 9 0 R
@ -592,6 +577,79 @@ endobj
>>
endobj
30 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Matrix [
0.5
0
0
0.5
153
198
]
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 31 0 R
>>
stream
/Tx BMC
q BT
0.18039 0.20392 0.21176 rg /ZaDi 12.05 Tf
0 0 Td
ET
Q
1 0 0 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
3.6 7.35 4.65 8.4 6 8.4 c f*
EMC
endstream
endobj
31 0 obj
202
endobj
32 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Matrix [
0.5
0
0
0.5
153
198
]
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 33 0 R
>>
stream
/Tx BMC
EMC
endstream
endobj
33 0 obj
12
endobj
34 0 obj
<<
/BBox [
@ -608,7 +666,7 @@ endobj
153
198
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 35 0 R
@ -620,7 +678,7 @@ q BT
0 0 Td
ET
Q
1 0 0 rg
0 1 0 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
@ -650,7 +708,7 @@ endobj
153
198
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 37 0 R
@ -681,7 +739,7 @@ endobj
153
198
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 39 0 R
@ -693,7 +751,7 @@ q BT
0 0 Td
ET
Q
0 1 0 rg
0 0 1 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
@ -723,7 +781,7 @@ endobj
153
198
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 41 0 R
@ -739,79 +797,6 @@ endobj
endobj
42 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Matrix [
0.5
0
0
0.5
153
198
]
/Resources 57 0 R
/Subtype /Form
/Type /XObject
/Length 43 0 R
>>
stream
/Tx BMC
q BT
0.18039 0.20392 0.21176 rg /ZaDi 12.05 Tf
0 0 Td
ET
Q
0 0 1 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
3.6 7.35 4.65 8.4 6 8.4 c f*
EMC
endstream
endobj
43 0 obj
202
endobj
44 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Matrix [
0.5
0
0
0.5
153
198
]
/Resources 57 0 R
/Subtype /Form
/Type /XObject
/Length 45 0 R
>>
stream
/Tx BMC
EMC
endstream
endobj
45 0 obj
12
endobj
46 0 obj
<<
/BBox [
0
@ -831,7 +816,7 @@ endobj
>>
/Subtype /Form
/Type /XObject
/Length 47 0 R
/Length 43 0 R
>>
stream
0 10 m
@ -844,15 +829,15 @@ S
endstream
endobj
47 0 obj
43 0 obj
52
endobj
48 0 obj
44 0 obj
<<
/EF <<
/F 58 0 R
/UF 58 0 R
/F 56 0 R
/UF 56 0 R
>>
/F (attachment1.txt)
/Type /Filespec
@ -860,7 +845,7 @@ endobj
>>
endobj
49 0 obj
45 0 obj
<<
/BBox [
0
@ -876,13 +861,79 @@ endobj
153
198
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 46 0 R
>>
stream
1 0 0 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
46 0 obj
36
endobj
47 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
0
0.5
-0.5
0
-198
153
]
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 48 0 R
>>
stream
0 1 0 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
48 0 obj
36
endobj
49 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
-0.5
0
0
-0.5
-153
-198
]
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 50 0 R
>>
stream
1 0 0 RG
0 0 1 RG
0 0 20 10 re
0 0 5 10 re
S
@ -894,72 +945,6 @@ endobj
endobj
51 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
0
0.5
-0.5
0
-198
153
]
/Resources 33 0 R
/Subtype /Form
/Type /XObject
/Length 52 0 R
>>
stream
0 1 0 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
52 0 obj
36
endobj
53 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
-0.5
0
0
-0.5
-153
-198
]
/Resources 33 0 R
/Subtype /Form
/Type /XObject
/Length 54 0 R
>>
stream
0 0 1 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
54 0 obj
36
endobj
55 0 obj
<<
/BBox [
0
@ -975,10 +960,10 @@ endobj
198
-153
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 56 0 R
/Length 52 0 R
>>
stream
0.5 0 1 RG
@ -988,13 +973,30 @@ S
endstream
endobj
56 0 obj
52 0 obj
38
endobj
57 0 obj
53 0 obj
<<
/Font 60 0 R
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
/Name /F1
/Subtype /Type1
/Type /Font
>>
endobj
54 0 obj
[
/PDF
/Text
]
endobj
55 0 obj
<<
/Font 58 0 R
/ProcSet [
/PDF
/Text
@ -1002,7 +1004,7 @@ endobj
>>
endobj
58 0 obj
56 0 obj
<<
/Params <<
/CheckSum <80a33fc110b5a7b8b4d58b8d57e814bc>
@ -1010,24 +1012,24 @@ endobj
/Subtype /text#2fplain
>>
/Type /EmbeddedFile
/Length 59 0 R
/Length 57 0 R
>>
stream
content of attachment
endstream
endobj
59 0 obj
57 0 obj
22
endobj
60 0 obj
58 0 obj
<<
/ZaDi 61 0 R
/ZaDi 59 0 R
>>
endobj
61 0 obj
59 0 obj
<<
/BaseFont /ZapfDingbats
/Subtype /Type1
@ -1036,7 +1038,7 @@ endobj
endobj
xref
0 62
0 60
0000000000 65535 f
0000000025 00000 n
0000000097 00000 n
@ -1046,64 +1048,62 @@ xref
0000000546 00000 n
0000000795 00000 n
0000000924 00000 n
0000001341 00000 n
0000001445 00000 n
0000001721 00000 n
0000001741 00000 n
0000002021 00000 n
0000002041 00000 n
0000002356 00000 n
0000002671 00000 n
0000002986 00000 n
0000003231 00000 n
0000003437 00000 n
0000003579 00000 n
0000003721 00000 n
0000003863 00000 n
0000004028 00000 n
0000004087 00000 n
0000004129 00000 n
0000004303 00000 n
0000004347 00000 n
0000004442 00000 n
0000004462 00000 n
0000004581 00000 n
0000004617 00000 n
0000005681 00000 n
0000005702 00000 n
0000005755 00000 n
0000006174 00000 n
0000006195 00000 n
0000006424 00000 n
0000006444 00000 n
0000006863 00000 n
0000006884 00000 n
0000007113 00000 n
0000007133 00000 n
0000007552 00000 n
0000007573 00000 n
0000007802 00000 n
0000007822 00000 n
0000008086 00000 n
0000008106 00000 n
0000008237 00000 n
0000008484 00000 n
0000008504 00000 n
0000008753 00000 n
0000008773 00000 n
0000009024 00000 n
0000009044 00000 n
0000009295 00000 n
0000009315 00000 n
0000009389 00000 n
0000009597 00000 n
0000009617 00000 n
0000009655 00000 n
0000001270 00000 n
0000001374 00000 n
0000001650 00000 n
0000001670 00000 n
0000001950 00000 n
0000001970 00000 n
0000002285 00000 n
0000002600 00000 n
0000002915 00000 n
0000003160 00000 n
0000003366 00000 n
0000003508 00000 n
0000003650 00000 n
0000003792 00000 n
0000003957 00000 n
0000004080 00000 n
0000004100 00000 n
0000004480 00000 n
0000004501 00000 n
0000005565 00000 n
0000005586 00000 n
0000005639 00000 n
0000006058 00000 n
0000006079 00000 n
0000006308 00000 n
0000006328 00000 n
0000006747 00000 n
0000006768 00000 n
0000006997 00000 n
0000007017 00000 n
0000007436 00000 n
0000007457 00000 n
0000007686 00000 n
0000007706 00000 n
0000007970 00000 n
0000007990 00000 n
0000008121 00000 n
0000008368 00000 n
0000008388 00000 n
0000008637 00000 n
0000008657 00000 n
0000008908 00000 n
0000008928 00000 n
0000009179 00000 n
0000009199 00000 n
0000009318 00000 n
0000009354 00000 n
0000009428 00000 n
0000009636 00000 n
0000009656 00000 n
0000009694 00000 n
trailer <<
/Root 1 0 R
/Size 62
/Size 60
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
9736
9775
%%EOF

570
qpdf/qtest/qpdf/overlay-copy-annotations-p5.pdf
View File

@ -116,11 +116,7 @@ endobj
15 0 R
16 0 R
]
/Contents [
23 0 R
25 0 R
27 0 R
]
/Contents 23 0 R
/MediaBox [
0
0
@ -129,12 +125,9 @@ endobj
]
/Parent 3 0 R
/Resources <<
/Font <<
/F1 29 0 R
>>
/ProcSet 30 0 R
/XObject <<
/Fx1 31 0 R
/Fx0 25 0 R
/Fx1 27 0 R
>>
>>
/Rotate 90
@ -167,7 +160,7 @@ endobj
612
159.545455
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 11 0 R
@ -204,7 +197,7 @@ endobj
-159.545455
612
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 13 0 R
@ -229,8 +222,8 @@ endobj
<<
/AP <<
/N <<
/1 34 0 R
/Off 36 0 R
/1 30 0 R
/Off 32 0 R
>>
>>
/AS /1
@ -257,8 +250,8 @@ endobj
<<
/AP <<
/N <<
/2 38 0 R
/Off 40 0 R
/2 34 0 R
/Off 36 0 R
>>
>>
/AS /2
@ -285,8 +278,8 @@ endobj
<<
/AP <<
/N <<
/3 42 0 R
/Off 44 0 R
/3 38 0 R
/Off 40 0 R
>>
>>
/AS /3
@ -340,10 +333,10 @@ endobj
18 0 obj
<<
/AP <<
/N 46 0 R
/N 42 0 R
>>
/Contents (attachment1.txt)
/FS 48 0 R
/FS 44 0 R
/NM (attachment1.txt)
/Rect [
287.454545
@ -359,7 +352,7 @@ endobj
19 0 obj
<<
/AP <<
/N 49 0 R
/N 45 0 R
>>
/DA ()
/Rect [
@ -376,7 +369,7 @@ endobj
20 0 obj
<<
/AP <<
/N 51 0 R
/N 47 0 R
>>
/DA ()
/Rect [
@ -393,7 +386,7 @@ endobj
21 0 obj
<<
/AP <<
/N 53 0 R
/N 49 0 R
>>
/DA ()
/Rect [
@ -410,7 +403,7 @@ endobj
22 0 obj
<<
/AP <<
/N 55 0 R
/N 51 0 R
>>
/DA ()
/Rect [
@ -431,16 +424,44 @@ endobj
>>
stream
q
0 1 -1 0 612 0 cm
/Fx0 Do
Q
q
0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
endstream
endobj
24 0 obj
2
80
endobj
%% Contents for page 1
25 0 obj
<<
/BBox [
0
0
612
792
]
/Matrix [
0
-1
1
0
0
612
]
/Resources <<
/Font <<
/F1 53 0 R
>>
/ProcSet 54 0 R
>>
/Subtype /Form
/Type /XObject
/Length 26 0 R
>>
stream
@ -461,43 +482,7 @@ endobj
112
endobj
%% Contents for page 1
27 0 obj
<<
/Length 28 0 R
>>
stream
Q
q
0 0.77273 -0.77273 0 612 159.54545 cm
/Fx1 Do
Q
endstream
endobj
28 0 obj
53
endobj
29 0 obj
<<
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
/Name /F1
/Subtype /Type1
/Type /Font
>>
endobj
30 0 obj
[
/PDF
/Text
]
endobj
31 0 obj
<<
/BBox [
0
@ -512,7 +497,7 @@ endobj
>>
/Subtype /Form
/Type /XObject
/Length 32 0 R
/Length 28 0 R
>>
stream
q
@ -580,11 +565,11 @@ ET
endstream
endobj
32 0 obj
28 0 obj
874
endobj
33 0 obj
29 0 obj
<<
/Font <<
/F1 9 0 R
@ -592,6 +577,79 @@ endobj
>>
endobj
30 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Matrix [
0
0.772727
-0.772727
0
612
159.545455
]
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 31 0 R
>>
stream
/Tx BMC
q BT
0.18039 0.20392 0.21176 rg /ZaDi 12.05 Tf
0 0 Td
ET
Q
1 0 0 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
3.6 7.35 4.65 8.4 6 8.4 c f*
EMC
endstream
endobj
31 0 obj
202
endobj
32 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Matrix [
0
0.772727
-0.772727
0
612
159.545455
]
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 33 0 R
>>
stream
/Tx BMC
EMC
endstream
endobj
33 0 obj
12
endobj
34 0 obj
<<
/BBox [
@ -608,7 +666,7 @@ endobj
612
159.545455
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 35 0 R
@ -620,7 +678,7 @@ q BT
0 0 Td
ET
Q
1 0 0 rg
0 1 0 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
@ -650,7 +708,7 @@ endobj
612
159.545455
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 37 0 R
@ -681,7 +739,7 @@ endobj
612
159.545455
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 39 0 R
@ -693,7 +751,7 @@ q BT
0 0 Td
ET
Q
0 1 0 rg
0 0 1 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
@ -723,7 +781,7 @@ endobj
612
159.545455
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 41 0 R
@ -739,79 +797,6 @@ endobj
endobj
42 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Matrix [
0
0.772727
-0.772727
0
612
159.545455
]
/Resources 57 0 R
/Subtype /Form
/Type /XObject
/Length 43 0 R
>>
stream
/Tx BMC
q BT
0.18039 0.20392 0.21176 rg /ZaDi 12.05 Tf
0 0 Td
ET
Q
0 0 1 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
3.6 7.35 4.65 8.4 6 8.4 c f*
EMC
endstream
endobj
43 0 obj
202
endobj
44 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Matrix [
0
0.772727
-0.772727
0
612
159.545455
]
/Resources 57 0 R
/Subtype /Form
/Type /XObject
/Length 45 0 R
>>
stream
/Tx BMC
EMC
endstream
endobj
45 0 obj
12
endobj
46 0 obj
<<
/BBox [
0
@ -831,7 +816,7 @@ endobj
>>
/Subtype /Form
/Type /XObject
/Length 47 0 R
/Length 43 0 R
>>
stream
0 10 m
@ -844,15 +829,15 @@ S
endstream
endobj
47 0 obj
43 0 obj
52
endobj
48 0 obj
44 0 obj
<<
/EF <<
/F 58 0 R
/UF 58 0 R
/F 56 0 R
/UF 56 0 R
>>
/F (attachment1.txt)
/Type /Filespec
@ -860,7 +845,7 @@ endobj
>>
endobj
49 0 obj
45 0 obj
<<
/BBox [
0
@ -876,13 +861,79 @@ endobj
612
159.545455
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 46 0 R
>>
stream
1 0 0 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
46 0 obj
36
endobj
47 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
-0.772727
0
-0
-0.772727
-159.545455
612
]
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 48 0 R
>>
stream
0 1 0 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
48 0 obj
36
endobj
49 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
0
-0.772727
0.772727
-0
-612
-159.545455
]
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 50 0 R
>>
stream
1 0 0 RG
0 0 1 RG
0 0 20 10 re
0 0 5 10 re
S
@ -894,72 +945,6 @@ endobj
endobj
51 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
-0.772727
0
-0
-0.772727
-159.545455
612
]
/Resources 33 0 R
/Subtype /Form
/Type /XObject
/Length 52 0 R
>>
stream
0 1 0 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
52 0 obj
36
endobj
53 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
0
-0.772727
0.772727
-0
-612
-159.545455
]
/Resources 33 0 R
/Subtype /Form
/Type /XObject
/Length 54 0 R
>>
stream
0 0 1 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
54 0 obj
36
endobj
55 0 obj
<<
/BBox [
0
@ -975,10 +960,10 @@ endobj
159.545455
-612
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 56 0 R
/Length 52 0 R
>>
stream
0.5 0 1 RG
@ -988,13 +973,30 @@ S
endstream
endobj
56 0 obj
52 0 obj
38
endobj
57 0 obj
53 0 obj
<<
/Font 60 0 R
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
/Name /F1
/Subtype /Type1
/Type /Font
>>
endobj
54 0 obj
[
/PDF
/Text
]
endobj
55 0 obj
<<
/Font 58 0 R
/ProcSet [
/PDF
/Text
@ -1002,7 +1004,7 @@ endobj
>>
endobj
58 0 obj
56 0 obj
<<
/Params <<
/CheckSum <80a33fc110b5a7b8b4d58b8d57e814bc>
@ -1010,24 +1012,24 @@ endobj
/Subtype /text#2fplain
>>
/Type /EmbeddedFile
/Length 59 0 R
/Length 57 0 R
>>
stream
content of attachment
endstream
endobj
59 0 obj
57 0 obj
22
endobj
60 0 obj
58 0 obj
<<
/ZaDi 61 0 R
/ZaDi 59 0 R
>>
endobj
61 0 obj
59 0 obj
<<
/BaseFont /ZapfDingbats
/Subtype /Type1
@ -1036,7 +1038,7 @@ endobj
endobj
xref
0 62
0 60
0000000000 65535 f
0000000025 00000 n
0000000097 00000 n
@ -1046,64 +1048,62 @@ xref
0000000564 00000 n
0000000822 00000 n
0000000951 00000 n
0000001367 00000 n
0000001471 00000 n
0000001765 00000 n
0000001785 00000 n
0000002084 00000 n
0000002104 00000 n
0000002427 00000 n
0000002750 00000 n
0000003071 00000 n
0000003331 00000 n
0000003565 00000 n
0000003735 00000 n
0000003905 00000 n
0000004075 00000 n
0000004261 00000 n
0000004320 00000 n
0000004362 00000 n
0000004531 00000 n
0000004575 00000 n
0000004685 00000 n
0000004705 00000 n
0000004824 00000 n
0000004860 00000 n
0000005924 00000 n
0000005945 00000 n
0000005998 00000 n
0000006435 00000 n
0000006456 00000 n
0000006703 00000 n
0000006723 00000 n
0000007160 00000 n
0000007181 00000 n
0000007428 00000 n
0000007448 00000 n
0000007885 00000 n
0000007906 00000 n
0000008153 00000 n
0000008173 00000 n
0000008455 00000 n
0000008475 00000 n
0000008606 00000 n
0000008871 00000 n
0000008891 00000 n
0000009159 00000 n
0000009179 00000 n
0000009447 00000 n
0000009467 00000 n
0000009734 00000 n
0000009754 00000 n
0000009828 00000 n
0000010036 00000 n
0000010056 00000 n
0000010094 00000 n
0000001296 00000 n
0000001400 00000 n
0000001694 00000 n
0000001714 00000 n
0000002013 00000 n
0000002033 00000 n
0000002356 00000 n
0000002679 00000 n
0000003000 00000 n
0000003260 00000 n
0000003494 00000 n
0000003664 00000 n
0000003834 00000 n
0000004004 00000 n
0000004190 00000 n
0000004327 00000 n
0000004347 00000 n
0000004725 00000 n
0000004746 00000 n
0000005810 00000 n
0000005831 00000 n
0000005884 00000 n
0000006321 00000 n
0000006342 00000 n
0000006589 00000 n
0000006609 00000 n
0000007046 00000 n
0000007067 00000 n
0000007314 00000 n
0000007334 00000 n
0000007771 00000 n
0000007792 00000 n
0000008039 00000 n
0000008059 00000 n
0000008341 00000 n
0000008361 00000 n
0000008492 00000 n
0000008757 00000 n
0000008777 00000 n
0000009045 00000 n
0000009065 00000 n
0000009333 00000 n
0000009353 00000 n
0000009620 00000 n
0000009640 00000 n
0000009759 00000 n
0000009795 00000 n
0000009869 00000 n
0000010077 00000 n
0000010097 00000 n
0000010135 00000 n
trailer <<
/Root 1 0 R
/Size 62
/Size 60
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
10175
10216
%%EOF

570
qpdf/qtest/qpdf/overlay-copy-annotations-p6.pdf
View File

@ -116,11 +116,7 @@ endobj
15 0 R
16 0 R
]
/Contents [
23 0 R
25 0 R
27 0 R
]
/Contents 23 0 R
/MediaBox [
0
0
@ -129,12 +125,9 @@ endobj
]
/Parent 3 0 R
/Resources <<
/Font <<
/F1 29 0 R
>>
/ProcSet 30 0 R
/XObject <<
/Fx1 31 0 R
/Fx0 25 0 R
/Fx1 27 0 R
>>
>>
/Rotate 90
@ -168,7 +161,7 @@ endobj
570
192
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 11 0 R
@ -205,7 +198,7 @@ endobj
-192
570
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 13 0 R
@ -230,8 +223,8 @@ endobj
<<
/AP <<
/N <<
/1 34 0 R
/Off 36 0 R
/1 30 0 R
/Off 32 0 R
>>
>>
/AS /1
@ -258,8 +251,8 @@ endobj
<<
/AP <<
/N <<
/2 38 0 R
/Off 40 0 R
/2 34 0 R
/Off 36 0 R
>>
>>
/AS /2
@ -286,8 +279,8 @@ endobj
<<
/AP <<
/N <<
/3 42 0 R
/Off 44 0 R
/3 38 0 R
/Off 40 0 R
>>
>>
/AS /3
@ -341,10 +334,10 @@ endobj
18 0 obj
<<
/AP <<
/N 46 0 R
/N 42 0 R
>>
/Contents (attachment1.txt)
/FS 48 0 R
/FS 44 0 R
/NM (attachment1.txt)
/Rect [
290
@ -360,7 +353,7 @@ endobj
19 0 obj
<<
/AP <<
/N 49 0 R
/N 45 0 R
>>
/DA ()
/Rect [
@ -377,7 +370,7 @@ endobj
20 0 obj
<<
/AP <<
/N 51 0 R
/N 47 0 R
>>
/DA ()
/Rect [
@ -394,7 +387,7 @@ endobj
21 0 obj
<<
/AP <<
/N 53 0 R
/N 49 0 R
>>
/DA ()
/Rect [
@ -411,7 +404,7 @@ endobj
22 0 obj
<<
/AP <<
/N 55 0 R
/N 51 0 R
>>
/DA ()
/Rect [
@ -432,16 +425,44 @@ endobj
>>
stream
q
0 0.66667 -0.66667 0 612 0 cm
/Fx0 Do
Q
q
0 0.66667 -0.66667 0 570 192 cm
/Fx1 Do
Q
endstream
endobj
24 0 obj
2
86
endobj
%% Contents for page 1
25 0 obj
<<
/BBox [
0
0
612
792
]
/Matrix [
0
-1.5
1.5
0
0
918
]
/Resources <<
/Font <<
/F1 53 0 R
>>
/ProcSet 54 0 R
>>
/Subtype /Form
/Type /XObject
/Length 26 0 R
>>
stream
@ -462,43 +483,7 @@ endobj
123
endobj
%% Contents for page 1
27 0 obj
<<
/Length 28 0 R
>>
stream
Q
q
0 0.66667 -0.66667 0 570 192 cm
/Fx1 Do
Q
endstream
endobj
28 0 obj
47
endobj
29 0 obj
<<
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
/Name /F1
/Subtype /Type1
/Type /Font
>>
endobj
30 0 obj
[
/PDF
/Text
]
endobj
31 0 obj
<<
/BBox [
0
@ -513,7 +498,7 @@ endobj
>>
/Subtype /Form
/Type /XObject
/Length 32 0 R
/Length 28 0 R
>>
stream
q
@ -581,11 +566,11 @@ ET
endstream
endobj
32 0 obj
28 0 obj
874
endobj
33 0 obj
29 0 obj
<<
/Font <<
/F1 9 0 R
@ -593,6 +578,79 @@ endobj
>>
endobj
30 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Matrix [
0
0.666667
-0.666667
0
570
192
]
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 31 0 R
>>
stream
/Tx BMC
q BT
0.18039 0.20392 0.21176 rg /ZaDi 12.05 Tf
0 0 Td
ET
Q
1 0 0 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
3.6 7.35 4.65 8.4 6 8.4 c f*
EMC
endstream
endobj
31 0 obj
202
endobj
32 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Matrix [
0
0.666667
-0.666667
0
570
192
]
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 33 0 R
>>
stream
/Tx BMC
EMC
endstream
endobj
33 0 obj
12
endobj
34 0 obj
<<
/BBox [
@ -609,7 +667,7 @@ endobj
570
192
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 35 0 R
@ -621,7 +679,7 @@ q BT
0 0 Td
ET
Q
1 0 0 rg
0 1 0 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
@ -651,7 +709,7 @@ endobj
570
192
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 37 0 R
@ -682,7 +740,7 @@ endobj
570
192
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 39 0 R
@ -694,7 +752,7 @@ q BT
0 0 Td
ET
Q
0 1 0 rg
0 0 1 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
@ -724,7 +782,7 @@ endobj
570
192
]
/Resources 57 0 R
/Resources 55 0 R
/Subtype /Form
/Type /XObject
/Length 41 0 R
@ -740,79 +798,6 @@ endobj
endobj
42 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Matrix [
0
0.666667
-0.666667
0
570
192
]
/Resources 57 0 R
/Subtype /Form
/Type /XObject
/Length 43 0 R
>>
stream
/Tx BMC
q BT
0.18039 0.20392 0.21176 rg /ZaDi 12.05 Tf
0 0 Td
ET
Q
0 0 1 rg
6 8.4 m 7.35 8.4 8.45 7.35 8.45 6 c
8.45 4.65 7.35 3.55 6 3.55 c
4.65 3.55 3.6 4.65 3.6 6 c
3.6 7.35 4.65 8.4 6 8.4 c f*
EMC
endstream
endobj
43 0 obj
202
endobj
44 0 obj
<<
/BBox [
0
0
12.05
12.05
]
/Matrix [
0
0.666667
-0.666667
0
570
192
]
/Resources 57 0 R
/Subtype /Form
/Type /XObject
/Length 45 0 R
>>
stream
/Tx BMC
EMC
endstream
endobj
45 0 obj
12
endobj
46 0 obj
<<
/BBox [
0
@ -832,7 +817,7 @@ endobj
>>
/Subtype /Form
/Type /XObject
/Length 47 0 R
/Length 43 0 R
>>
stream
0 10 m
@ -845,15 +830,15 @@ S
endstream
endobj
47 0 obj
43 0 obj
52
endobj
48 0 obj
44 0 obj
<<
/EF <<
/F 58 0 R
/UF 58 0 R
/F 56 0 R
/UF 56 0 R
>>
/F (attachment1.txt)
/Type /Filespec
@ -861,7 +846,7 @@ endobj
>>
endobj
49 0 obj
45 0 obj
<<
/BBox [
0
@ -877,13 +862,79 @@ endobj
570
192
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 46 0 R
>>
stream
1 0 0 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
46 0 obj
36
endobj
47 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
-0.666667
0
-0
-0.666667
-192
570
]
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 48 0 R
>>
stream
0 1 0 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
48 0 obj
36
endobj
49 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
0
-0.666667
0.666667
-0
-570
-192
]
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 50 0 R
>>
stream
1 0 0 RG
0 0 1 RG
0 0 20 10 re
0 0 5 10 re
S
@ -895,72 +946,6 @@ endobj
endobj
51 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
-0.666667
0
-0
-0.666667
-192
570
]
/Resources 33 0 R
/Subtype /Form
/Type /XObject
/Length 52 0 R
>>
stream
0 1 0 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
52 0 obj
36
endobj
53 0 obj
<<
/BBox [
0
0
20
10
]
/Matrix [
0
-0.666667
0.666667
-0
-570
-192
]
/Resources 33 0 R
/Subtype /Form
/Type /XObject
/Length 54 0 R
>>
stream
0 0 1 RG
0 0 20 10 re
0 0 5 10 re
S
endstream
endobj
54 0 obj
36
endobj
55 0 obj
<<
/BBox [
0
@ -976,10 +961,10 @@ endobj
192
-570
]
/Resources 33 0 R
/Resources 29 0 R
/Subtype /Form
/Type /XObject
/Length 56 0 R
/Length 52 0 R
>>
stream
0.5 0 1 RG
@ -989,13 +974,30 @@ S
endstream
endobj
56 0 obj
52 0 obj
38
endobj
57 0 obj
53 0 obj
<<
/Font 60 0 R
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
/Name /F1
/Subtype /Type1
/Type /Font
>>
endobj
54 0 obj
[
/PDF
/Text
]
endobj
55 0 obj
<<
/Font 58 0 R
/ProcSet [
/PDF
/Text
@ -1003,7 +1005,7 @@ endobj
>>
endobj
58 0 obj
56 0 obj
<<
/Params <<
/CheckSum <80a33fc110b5a7b8b4d58b8d57e814bc>
@ -1011,24 +1013,24 @@ endobj
/Subtype /text#2fplain
>>
/Type /EmbeddedFile
/Length 59 0 R
/Length 57 0 R
>>
stream
content of attachment
endstream
endobj
59 0 obj
57 0 obj
22
endobj
60 0 obj
58 0 obj
<<
/ZaDi 61 0 R
/ZaDi 59 0 R
>>
endobj
61 0 obj
59 0 obj
<<
/BaseFont /ZapfDingbats
/Subtype /Type1
@ -1037,7 +1039,7 @@ endobj
endobj
xref
0 62
0 60
0000000000 65535 f
0000000025 00000 n
0000000097 00000 n
@ -1047,64 +1049,62 @@ xref
0000000552 00000 n
0000000804 00000 n
0000000933 00000 n
0000001365 00000 n
0000001469 00000 n
0000001756 00000 n
0000001776 00000 n
0000002068 00000 n
0000002088 00000 n
0000002405 00000 n
0000002728 00000 n
0000003045 00000 n
0000003296 00000 n
0000003516 00000 n
0000003672 00000 n
0000003835 00000 n
0000003998 00000 n
0000004184 00000 n
0000004243 00000 n
0000004285 00000 n
0000004465 00000 n
0000004509 00000 n
0000004613 00000 n
0000004633 00000 n
0000004752 00000 n
0000004788 00000 n
0000005852 00000 n
0000005873 00000 n
0000005926 00000 n
0000006356 00000 n
0000006377 00000 n
0000006617 00000 n
0000006637 00000 n
0000007067 00000 n
0000007088 00000 n
0000007328 00000 n
0000007348 00000 n
0000007778 00000 n
0000007799 00000 n
0000008039 00000 n
0000008059 00000 n
0000008334 00000 n
0000008354 00000 n
0000008485 00000 n
0000008743 00000 n
0000008763 00000 n
0000009024 00000 n
0000009044 00000 n
0000009305 00000 n
0000009325 00000 n
0000009585 00000 n
0000009605 00000 n
0000009679 00000 n
0000009887 00000 n
0000009907 00000 n
0000009945 00000 n
0000001294 00000 n
0000001398 00000 n
0000001685 00000 n
0000001705 00000 n
0000001997 00000 n
0000002017 00000 n
0000002334 00000 n
0000002657 00000 n
0000002974 00000 n
0000003225 00000 n
0000003445 00000 n
0000003601 00000 n
0000003764 00000 n
0000003927 00000 n
0000004113 00000 n
0000004256 00000 n
0000004276 00000 n
0000004669 00000 n
0000004690 00000 n
0000005754 00000 n
0000005775 00000 n
0000005828 00000 n
0000006258 00000 n
0000006279 00000 n
0000006519 00000 n
0000006539 00000 n
0000006969 00000 n
0000006990 00000 n
0000007230 00000 n
0000007250 00000 n
0000007680 00000 n
0000007701 00000 n
0000007941 00000 n
0000007961 00000 n
0000008236 00000 n
0000008256 00000 n
0000008387 00000 n
0000008645 00000 n
0000008665 00000 n
0000008926 00000 n
0000008946 00000 n
0000009207 00000 n
0000009227 00000 n
0000009487 00000 n
0000009507 00000 n
0000009626 00000 n
0000009662 00000 n
0000009736 00000 n
0000009944 00000 n
0000009964 00000 n
0000010002 00000 n
trailer <<
/Root 1 0 R
/Size 62
/Size 60
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
10026
10083
%%EOF

8820
qpdf/qtest/qpdf/overlay-copy-annotations.pdf
View File

File diff suppressed because it is too large Load Diff

BIN
qpdf/qtest/qpdf/overlay-no-resources.pdf
View File

Binary file not shown.

3026
qpdf/qtest/qpdf/uo-1.pdf
View File

File diff suppressed because it is too large Load Diff

2946
qpdf/qtest/qpdf/uo-2.pdf
View File

File diff suppressed because it is too large Load Diff

1862
qpdf/qtest/qpdf/uo-3.pdf
View File

File diff suppressed because it is too large Load Diff

1206
qpdf/qtest/qpdf/uo-4.pdf
View File

File diff suppressed because it is too large Load Diff

565
qpdf/qtest/qpdf/uo-5.pdf
View File

File diff suppressed because it is too large Load Diff

216
qpdf/qtest/qpdf/uo-6.pdf
View File

@ -22,11 +22,7 @@ endobj
%% Page 1
3 0 obj
<<
/Contents [
4 0 R
6 0 R
8 0 R
]
/Contents 4 0 R
/MediaBox [
0
0
@ -35,15 +31,12 @@ endobj
]
/Parent 2 0 R
/Resources <<
/Font <<
/F1 10 0 R
>>
/ProcSet 11 0 R
/XObject <<
/Fx1 12 0 R
/Fx2 14 0 R
/Fx3 16 0 R
/Fx4 18 0 R
/Fx0 6 0 R
/Fx1 8 0 R
/Fx2 10 0 R
/Fx3 12 0 R
/Fx4 14 0 R
>>
>>
/Type /Page
@ -57,43 +50,8 @@ endobj
>>
stream
q
endstream
endobj
5 0 obj
2
endobj
%% Contents for page 1
6 0 obj
<<
/Length 7 0 R
>>
stream
1 0 0 RG
1 0 0 rg
BT
/F1 24 Tf
72 720 Td
(Page 1 - red) Tj
ET
5 w
0 0 612 792 re s
271 371 60 60 re f
endstream
endobj
7 0 obj
108
endobj
%% Contents for page 1
8 0 obj
<<
/Length 9 0 R
>>
stream
1 0 0 1 0 0 cm
/Fx0 Do
Q
q
1 0 0 1 0 0 cm
@ -114,28 +72,11 @@ Q
endstream
endobj
9 0 obj
159
5 0 obj
183
endobj
10 0 obj
<<
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
/Name /F1
/Subtype /Type1
/Type /Font
>>
endobj
11 0 obj
[
/PDF
/Text
]
endobj
12 0 obj
6 0 obj
<<
/BBox [
0
@ -145,13 +86,49 @@ endobj
]
/Resources <<
/Font <<
/F1 20 0 R
/F1 16 0 R
>>
/ProcSet 21 0 R
/ProcSet 17 0 R
>>
/Subtype /Form
/Type /XObject
/Length 13 0 R
/Length 7 0 R
>>
stream
1 0 0 RG
1 0 0 rg
BT
/F1 24 Tf
72 720 Td
(Page 1 - red) Tj
ET
5 w
0 0 612 792 re s
271 371 60 60 re f
endstream
endobj
7 0 obj
108
endobj
8 0 obj
<<
/BBox [
0
0
612
792
]
/Resources <<
/Font <<
/F1 18 0 R
>>
/ProcSet 19 0 R
>>
/Subtype /Form
/Type /XObject
/Length 9 0 R
>>
stream
0 0 1 RG
@ -167,11 +144,11 @@ ET
endstream
endobj
13 0 obj
9 0 obj
109
endobj
14 0 obj
10 0 obj
<<
/BBox [
0
@ -189,13 +166,13 @@ endobj
]
/Resources <<
/Font <<
/F1 20 0 R
/F1 18 0 R
>>
/ProcSet 21 0 R
/ProcSet 19 0 R
>>
/Subtype /Form
/Type /XObject
/Length 15 0 R
/Length 11 0 R
>>
stream
0 0 1 RG
@ -211,11 +188,11 @@ ET
endstream
endobj
15 0 obj
11 0 obj
113
endobj
16 0 obj
12 0 obj
<<
/BBox [
10
@ -233,13 +210,13 @@ endobj
]
/Resources <<
/Font <<
/F1 20 0 R
/F1 18 0 R
>>
/ProcSet 21 0 R
/ProcSet 19 0 R
>>
/Subtype /Form
/Type /XObject
/Length 17 0 R
/Length 13 0 R
>>
stream
0 0 1 RG
@ -256,11 +233,11 @@ ET
endstream
endobj
17 0 obj
13 0 obj
150
endobj
18 0 obj
14 0 obj
<<
/BBox [
20
@ -278,13 +255,13 @@ endobj
]
/Resources <<
/Font <<
/F1 20 0 R
/F1 18 0 R
>>
/ProcSet 21 0 R
/ProcSet 19 0 R
>>
/Subtype /Form
/Type /XObject
/Length 19 0 R
/Length 15 0 R
>>
stream
0 0 1 RG
@ -302,11 +279,11 @@ ET
endstream
endobj
19 0 obj
15 0 obj
170
endobj
20 0 obj
16 0 obj
<<
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
@ -316,7 +293,24 @@ endobj
>>
endobj
21 0 obj
17 0 obj
[
/PDF
/Text
]
endobj
18 0 obj
<<
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding
/Name /F1
/Subtype /Type1
/Type /Font
>>
endobj
19 0 obj
[
/PDF
/Text
@ -324,34 +318,32 @@ endobj
endobj
xref
0 22
0 20
0000000000 65535 f
0000000025 00000 n
0000000079 00000 n
0000000161 00000 n
0000000503 00000 n
0000000560 00000 n
0000000601 00000 n
0000000764 00000 n
0000000807 00000 n
0000001021 00000 n
0000001041 00000 n
0000001160 00000 n
0000001196 00000 n
0000001516 00000 n
0000001537 00000 n
0000001916 00000 n
0000001937 00000 n
0000002358 00000 n
0000002379 00000 n
0000002817 00000 n
0000002838 00000 n
0000002957 00000 n
0000000432 00000 n
0000000670 00000 n
0000000690 00000 n
0000001007 00000 n
0000001027 00000 n
0000001345 00000 n
0000001365 00000 n
0000001744 00000 n
0000001765 00000 n
0000002186 00000 n
0000002207 00000 n
0000002645 00000 n
0000002666 00000 n
0000002785 00000 n
0000002821 00000 n
0000002940 00000 n
trailer <<
/Root 1 0 R
/Size 22
/Size 20
/ID [<4866f3ccc81fb28dc4a27f0f976ce937><31415926535897932384626433832795>]
>>
startxref
2993
2976
%%EOF

1678
qpdf/qtest/qpdf/uo-7.pdf
View File

File diff suppressed because it is too large Load Diff