Fix error in testing/resources/xfa_catalog_1_0.fragment.
In the catalog, /Pages should refer to an indirect object, not an array
of objects. Regenerate PDFs as needed, and fix errors in the templates.
Change-Id: I9930ef3ba697fddda6ea18b7df72b6c256d59874
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/51352
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/testing/resources/xfa/xfa_combobox.pdf b/testing/resources/xfa/xfa_combobox.pdf
index 0208f3f..0989361 100644
--- a/testing/resources/xfa/xfa_combobox.pdf
+++ b/testing/resources/xfa/xfa_combobox.pdf
@@ -1,6 +1,5 @@
%PDF-1.7
% ò¤ô
-
1 0 obj <<
/AcroForm 2 0 R
/Extensions <<
@@ -10,6 +9,7 @@
>>
>>
/NeedsRendering true
+ /Pages 8 0 R
/Type /Catalog
>>
endobj
@@ -71,9 +71,7 @@
</config>
endstream
endobj
-
-5 0 obj
-<<
+5 0 obj <<
/Length 716
>>
stream
@@ -101,7 +99,6 @@
</template>
endstream
endobj
-
6 0 obj <<
/Length 3455
>>
@@ -219,21 +216,34 @@
</xdp:xdp>
endstream
endobj
-
+8 0 obj <<
+ /Type /Pages
+ /Count 1
+ /Kids [9 0 R]
+>>
+endobj
+9 0 obj <<
+ /Type /Page
+ /Parent 2 0 R
+ /MediaBox [0 0 612 792]
+>>
+endobj
xref
-0 8
+0 10
0000000000 65535 f
-0000000016 00000 n
-0000000185 00000 n
-0000000344 00000 n
-0000000520 00000 n
-0000001215 00000 n
-0000001984 00000 n
-0000005492 00000 n
+0000000015 00000 n
+0000000199 00000 n
+0000000358 00000 n
+0000000534 00000 n
+0000001228 00000 n
+0000001996 00000 n
+0000005504 00000 n
+0000005566 00000 n
+0000005629 00000 n
trailer <<
/Root 1 0 R
- /Size 8
+ /Size 10
>>
startxref
-5555
+5706
%%EOF
diff --git a/testing/resources/xfa/xfa_date_time_edit.pdf b/testing/resources/xfa/xfa_date_time_edit.pdf
index cfa891d..04ea239 100644
--- a/testing/resources/xfa/xfa_date_time_edit.pdf
+++ b/testing/resources/xfa/xfa_date_time_edit.pdf
@@ -1,6 +1,5 @@
%PDF-1.7
% ò¤ô
-
1 0 obj <<
/AcroForm 2 0 R
/Extensions <<
@@ -10,6 +9,7 @@
>>
>>
/NeedsRendering true
+ /Pages 8 0 R
/Type /Catalog
>>
endobj
@@ -71,9 +71,7 @@
</config>
endstream
endobj
-
-5 0 obj
-<<
+5 0 obj <<
/Length 567
>>
stream
@@ -96,7 +94,6 @@
</template>
endstream
endobj
-
6 0 obj <<
/Length 3455
>>
@@ -214,21 +211,34 @@
</xdp:xdp>
endstream
endobj
-
+8 0 obj <<
+ /Type /Pages
+ /Count 1
+ /Kids [9 0 R]
+>>
+endobj
+9 0 obj <<
+ /Type /Page
+ /Parent 2 0 R
+ /MediaBox [0 0 612 792]
+>>
+endobj
xref
-0 8
+0 10
0000000000 65535 f
-0000000016 00000 n
-0000000185 00000 n
-0000000344 00000 n
-0000000520 00000 n
-0000001215 00000 n
-0000001835 00000 n
-0000005343 00000 n
+0000000015 00000 n
+0000000199 00000 n
+0000000358 00000 n
+0000000534 00000 n
+0000001228 00000 n
+0000001847 00000 n
+0000005355 00000 n
+0000005417 00000 n
+0000005480 00000 n
trailer <<
/Root 1 0 R
- /Size 8
+ /Size 10
>>
startxref
-5406
+5557
%%EOF
diff --git a/testing/resources/xfa/xfa_image_edit.in b/testing/resources/xfa/xfa_image_edit.in
index a24c0ca..0e36fdd 100644
--- a/testing/resources/xfa/xfa_image_edit.in
+++ b/testing/resources/xfa/xfa_image_edit.in
@@ -31,7 +31,7 @@
endobj
{{include ../xfa_locale_6_0.fragment}}
{{include ../xfa_postamble_7_0.fragment}}
-{{include ../../../xfa_pages_8_0.fragment}}
+{{include ../xfa_pages_8_0.fragment}}
{{xref}}
{{trailer}}
{{startxref}}
diff --git a/testing/resources/xfa/xfa_image_edit.pdf b/testing/resources/xfa/xfa_image_edit.pdf
index d450fb4..7496367 100644
--- a/testing/resources/xfa/xfa_image_edit.pdf
+++ b/testing/resources/xfa/xfa_image_edit.pdf
@@ -1,6 +1,5 @@
%PDF-1.7
% ò¤ô
-
1 0 obj <<
/AcroForm 2 0 R
/Extensions <<
@@ -10,6 +9,7 @@
>>
>>
/NeedsRendering true
+ /Pages 8 0 R
/Type /Catalog
>>
endobj
@@ -71,9 +71,7 @@
</config>
endstream
endobj
-
-5 0 obj
-<<
+5 0 obj <<
/Length 667
>>
stream
@@ -99,7 +97,6 @@
</template>
endstream
endobj
-
6 0 obj <<
/Length 3455
>>
@@ -217,21 +214,34 @@
</xdp:xdp>
endstream
endobj
-
+8 0 obj <<
+ /Type /Pages
+ /Count 1
+ /Kids [9 0 R]
+>>
+endobj
+9 0 obj <<
+ /Type /Page
+ /Parent 2 0 R
+ /MediaBox [0 0 612 792]
+>>
+endobj
xref
-0 8
+0 10
0000000000 65535 f
-0000000016 00000 n
-0000000185 00000 n
-0000000344 00000 n
-0000000520 00000 n
-0000001215 00000 n
-0000001935 00000 n
-0000005443 00000 n
+0000000015 00000 n
+0000000199 00000 n
+0000000358 00000 n
+0000000534 00000 n
+0000001228 00000 n
+0000001947 00000 n
+0000005455 00000 n
+0000005517 00000 n
+0000005580 00000 n
trailer <<
/Root 1 0 R
- /Size 8
+ /Size 10
>>
startxref
-5506
+5657
%%EOF
diff --git a/testing/resources/xfa/xfa_multiline_textfield.in b/testing/resources/xfa/xfa_multiline_textfield.in
index 796be52..235f723 100644
--- a/testing/resources/xfa/xfa_multiline_textfield.in
+++ b/testing/resources/xfa/xfa_multiline_textfield.in
@@ -30,7 +30,7 @@
endobj
{{include ../xfa_locale_6_0.fragment}}
{{include ../xfa_postamble_7_0.fragment}}
-{{include ../../../xfa_pages_8_0.fragment}}
+{{include ../xfa_pages_8_0.fragment}}
{{xref}}
{{trailer}}
{{startxref}}
diff --git a/testing/resources/xfa/xfa_multiline_textfield.pdf b/testing/resources/xfa/xfa_multiline_textfield.pdf
index f88af5b..6b7eae4 100644
--- a/testing/resources/xfa/xfa_multiline_textfield.pdf
+++ b/testing/resources/xfa/xfa_multiline_textfield.pdf
@@ -1,9 +1,6 @@
%PDF-1.7
% ò¤ô
-
-%% Original object ID: 24 0
-1 0 obj
-<<
+1 0 obj <<
/AcroForm 2 0 R
/Extensions <<
/ADBE <<
@@ -12,13 +9,11 @@
>>
>>
/NeedsRendering true
+ /Pages 8 0 R
/Type /Catalog
>>
endobj
-
-%% Original object ID: 32 0
-2 0 obj
-<<
+2 0 obj <<
/XFA [
(preamble)
3 0 R
@@ -33,55 +28,50 @@
]
>>
endobj
-
-3 0 obj
-<<
- /Length 123
+3 0 obj <<
+ /Length 124
>>
stream
<xdp:xdp xmlns:xdp="http://ns.adobe.com/xdp/" timeStamp="2018-02-23T21:37:11Z" uuid="21482798-7bf0-40a4-bc5d-3cefdccf32b5">
endstream
endobj
-4 0 obj
-<<
- /Length 697
+4 0 obj <<
+ /Length 642
>>
stream
<config xmlns="http://www.xfa.org/schema/xci/3.0/">
- <agent name="designer">
- <destination>pdf</destination>
- <pdf>
- <fontInfo/>
- </pdf>
- </agent>
- <present>
- <pdf>
- <version>1.7</version>
- <adobeExtensionLevel>8</adobeExtensionLevel>
- <renderPolicy>client</renderPolicy>
- <scriptModel>XFA</scriptModel>
- <interactive>1</interactive>
- </pdf>
- <xdp>
- <packets>*</packets>
- </xdp>
- <destination>pdf</destination>
- <script>
- <runScripts>server</runScripts>
- </script>
- </present>
- <acrobat>
- <acrobat7>
- <dynamicRender>required</dynamicRender>
- </acrobat7>
- <validate>preSubmit</validate>
- </acrobat>
+<agent name="designer">
+ <destination>pdf</destination>
+ <pdf>
+ <fontInfo/>
+ </pdf>
+</agent>
+<present>
+ <pdf>
+ <version>1.7</version>
+ <adobeExtensionLevel>8</adobeExtensionLevel>
+ <renderPolicy>client</renderPolicy>
+ <scriptModel>XFA</scriptModel>
+ <interactive>1</interactive>
+ </pdf>
+ <xdp>
+ <packets>*</packets>
+ </xdp>
+ <destination>pdf</destination>
+ <script>
+ <runScripts>server</runScripts>
+ </script>
+</present>
+<acrobat>
+ <acrobat7>
+ <dynamicRender>required</dynamicRender>
+ </acrobat7>
+ <validate>preSubmit</validate>
+</acrobat>
</config>
endstream
endobj
-
-5 0 obj
-<<
+5 0 obj <<
/Length 651
>>
stream
@@ -106,10 +96,8 @@
</template>
endstream
endobj
-
-6 0 obj
-<<
- /Length 3454
+6 0 obj <<
+ /Length 3455
>>
stream
<localeSet xmlns="http://www.xfa.org/schema/xfa-locale-set/2.7/">
@@ -218,27 +206,41 @@
</localeSet>
endstream
endobj
-
-7 0 obj
-<<
- /Length 10
+7 0 obj <<
+ /Length 11
>>
stream
</xdp:xdp>
endstream
endobj
-
+8 0 obj <<
+ /Type /Pages
+ /Count 1
+ /Kids [9 0 R]
+>>
+endobj
+9 0 obj <<
+ /Type /Page
+ /Parent 2 0 R
+ /MediaBox [0 0 612 792]
+>>
+endobj
xref
-0 8
+0 10
0000000000 65535 f
-0000000044 00000 n
-0000000242 00000 n
-0000000402 00000 n
-0000000578 00000 n
-0000001329 00000 n
-0000002033 00000 n
-0000005542 00000 n
-trailer<< /Root 1 0 R /Size 8 >>
+0000000015 00000 n
+0000000199 00000 n
+0000000358 00000 n
+0000000534 00000 n
+0000001228 00000 n
+0000001931 00000 n
+0000005439 00000 n
+0000005501 00000 n
+0000005564 00000 n
+trailer <<
+ /Root 1 0 R
+ /Size 10
+>>
startxref
-5605
+5641
%%EOF
diff --git a/testing/resources/xfa_catalog_1_0.fragment b/testing/resources/xfa_catalog_1_0.fragment
index 4e3c83f..8793a00 100644
--- a/testing/resources/xfa_catalog_1_0.fragment
+++ b/testing/resources/xfa_catalog_1_0.fragment
@@ -7,7 +7,7 @@
>>
>>
/NeedsRendering true
- /Pages [8 0 R]
+ /Pages 8 0 R
/Type /Catalog
>>
endobj
