Remove CRLF line endings from link_annots.in.
Due to https://crbug.com/pdfium/1302, this is not automatic.
Also update the bug reference in .gitattributes.
Bug: pdfium:1302
Change-Id: I2154e729b077fbe95a2e5061f8928fd9b5eb002a
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/60050
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/.gitattributes b/.gitattributes
index 4c7b465..5d75502 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,7 +6,7 @@
*.gn text eol=lf
*.gni text eol=lf
*.h text eol=lf
-# Temporarily disabled. https://crbug.com/pdfium/1299
+# Temporarily disabled. https://crbug.com/pdfium/1302
# *.in text eol=lf
*.js text eol=lf
*.md text eol=lf
diff --git a/testing/resources/link_annots.in b/testing/resources/link_annots.in
index c80b32b..076069c 100644
--- a/testing/resources/link_annots.in
+++ b/testing/resources/link_annots.in
@@ -9,7 +9,7 @@
/Count 2
/Kids [3 0 R 4 0 R]
/MediaBox [0 0 612 792]
- /CropBox [0 0 612 792]
+ /CropBox [0 0 612 792]
/Resources <<
/Font <<
/F1 7 0 R
@@ -19,7 +19,7 @@
/ExtGState <<
/GS0 23 0 R
>>
- >>
+ >>
>>
endobj
{{object 3 0}} <<
@@ -92,11 +92,11 @@
>>
endobj
{{object 9 0}} <<
- /Type /XObject
- /Subtype /Form
- /FormType 1
+ /Type /XObject
+ /Subtype /Form
+ /FormType 1
{{streamlen}}
- /BBox [293 530 349 542]
+ /BBox [293 530 349 542]
/Resources <<
/XObject <<
/Form0 10 0 R
@@ -104,38 +104,38 @@
/ExtGState <<
/GS0 24 0 R
>>
- >>
->>
-stream
-/GS0 gs
-/Form0 Do
-endstream
-endobj
-{{object 10 0}} <<
- /Type /XObject
- /Subtype /Form
- /FormType 1
- /Group <<
- /S /Transparency
- >>
- {{streamlen}}
- /BBox [293 530 349 542]
+ >>
>>
stream
-1.0 1.0 0.0 rg
-293 530 m
-349 530 l
-349 542 l
-293 542 l
+/GS0 gs
+/Form0 Do
+endstream
+endobj
+{{object 10 0}} <<
+ /Type /XObject
+ /Subtype /Form
+ /FormType 1
+ /Group <<
+ /S /Transparency
+ >>
+ {{streamlen}}
+ /BBox [293 530 349 542]
+>>
+stream
+1.0 1.0 0.0 rg
+293 530 m
+349 530 l
+349 542 l
+293 542 l
h f
endstream
endobj
{{object 11 0}} <<
- /Type /XObject
- /Subtype /Form
- /FormType 1
+ /Type /XObject
+ /Subtype /Form
+ /FormType 1
{{streamlen}}
- /BBox [83 440 178 453]
+ /BBox [83 440 178 453]
/Resources <<
/XObject <<
/Form0 12 0 R
@@ -143,38 +143,38 @@
/ExtGState <<
/GS0 24 0 R
>>
- >>
->>
-stream
-/GS0 gs
-/Form0 Do
-endstream
-endobj
-{{object 12 0}} <<
- /Type /XObject
- /Subtype /Form
- /FormType 1
- /Group <<
- /S /Transparency
- >>
- {{streamlen}}
- /BBox [83 440 178 453]
+ >>
>>
stream
-0.0 1.0 1.0 rg
-83 440 m
-178 440 l
-178 453 l
-83 453 l
+/GS0 gs
+/Form0 Do
+endstream
+endobj
+{{object 12 0}} <<
+ /Type /XObject
+ /Subtype /Form
+ /FormType 1
+ /Group <<
+ /S /Transparency
+ >>
+ {{streamlen}}
+ /BBox [83 440 178 453]
+>>
+stream
+0.0 1.0 1.0 rg
+83 440 m
+178 440 l
+178 453 l
+83 453 l
h f
endstream
endobj
{{object 13 0}} <<
- /Type /XObject
- /Subtype /Form
- /FormType 1
+ /Type /XObject
+ /Subtype /Form
+ /FormType 1
{{streamlen}}
- /BBox [149 476 191 487]
+ /BBox [149 476 191 487]
/Resources <<
/XObject <<
/Form0 14 0 R
@@ -182,141 +182,141 @@
/ExtGState <<
/GS0 24 0 R
>>
- >>
->>
-stream
-/GS0 gs
-/Form0 Do
-endstream
-endobj
-{{object 14 0}} <<
- /Type /XObject
- /Subtype /Form
- /FormType 1
- /Group <<
- /S /Transparency
- >>
- {{streamlen}}
- /BBox [149 476 191 487]
+ >>
>>
stream
-0.0 1.0 0.0 rg
-149 476 m
-191 476 l
-191 487 l
-149 487 l
-h f
+/GS0 gs
+/Form0 Do
+endstream
+endobj
+{{object 14 0}} <<
+ /Type /XObject
+ /Subtype /Form
+ /FormType 1
+ /Group <<
+ /S /Transparency
+ >>
+ {{streamlen}}
+ /BBox [149 476 191 487]
+>>
+stream
+0.0 1.0 0.0 rg
+149 476 m
+191 476 l
+191 487 l
+149 487 l
+h f
endstream
endobj
{{object 15 0}} <<
- /Type /Annot
- /Subtype /Link
+ /Type /Annot
+ /Subtype /Link
/BS <<
/W 0
- >>
- /Rect [69 633 542 653]
- /Dest [3 0 R /XYZ 200 725 0]
+ >>
+ /Rect [69 633 542 653]
+ /Dest [3 0 R /XYZ 200 725 0]
/F 4
->>
+>>
endobj
{{object 16 0}} <<
- /Type /Annot
- /Subtype /Link
+ /Type /Annot
+ /Subtype /Link
/BS <<
/W 0
- >>
- /Rect [80 613 542 633]
- /Dest [4 0 R /XYZ 200 725 0]
+ >>
+ /Rect [80 613 542 633]
+ /Dest [4 0 R /XYZ 200 725 0]
/F 4
>>
endobj
{{object 17 0}} <<
- /Type /Annot
- /Subtype /Link
+ /Type /Annot
+ /Subtype /Link
/BS <<
/W 0
- >>
- /Rect [66 529 196 544]
+ >>
+ /Rect [66 529 196 544]
/A <<
/Type /Action
/URI (https://www.adobe.com/content/dam/acom/en/devnet/acrobat/pdfs/pdf_reference_1-7.pdf)
/S /URI
- >>
+ >>
/F 4
>>
endobj
{{object 18 0}} <<
- /Type /Annot
- /Subtype /Link
+ /Type /Annot
+ /Subtype /Link
/BS <<
/W 0
- >>
- /Rect [83 440 178 453]
- /QuadPoints [83 453 178 453 83 440 178 440]
+ >>
+ /Rect [83 440 178 453]
+ /QuadPoints [83 453 178 453 83 440 178 440]
/A <<
/Type /Action
/URI (https://cs.chromium.org/chromium/src/third_party/pdfium/public/fpdf_text.h)
/S /URI
- >>
- /F 4
->>
+ >>
+ /F 4
+>>
endobj
{{object 19 0}} <<
- /Type /Annot
- /Subtype /Highlight
+ /Type /Annot
+ /Subtype /Highlight
/AP <<
/N 9 0 R
- >>
- /NM (Highlight-1)
- /F 4
- /QuadPoints [293 542 349 542 293 530 349 530]
- /P 3 0 R
- /C [1 0.90196 0]
- /Rect [293 530 349 542]
->>
+ >>
+ /NM (Highlight-1)
+ /F 4
+ /QuadPoints [293 542 349 542 293 530 349 530]
+ /P 3 0 R
+ /C [1 0.90196 0]
+ /Rect [293 530 349 542]
+>>
endobj
{{object 20 0}} <<
- /Type /Annot
- /Subtype /Highlight
+ /Type /Annot
+ /Subtype /Highlight
/AP <<
/N 11 0 R
- >>
- /NM (Highlight-2)
- /F 4
- /QuadPoints [83 453 178 453 83 440 178 440]
- /P 3 0 R
- /C [0.26667 0.78431 0.96078]
- /Rect [83 440 178 453]
->>
+ >>
+ /NM (Highlight-2)
+ /F 4
+ /QuadPoints [83 453 178 453 83 440 178 440]
+ /P 3 0 R
+ /C [0.26667 0.78431 0.96078]
+ /Rect [83 440 178 453]
+>>
endobj
{{object 21 0}} <<
- /Type /Annot
- /Subtype /Popup
+ /Type /Annot
+ /Subtype /Popup
/Parent 22 0 R
- /Rect [191 377 443 488]
->>
+ /Rect [191 377 443 488]
+>>
endobj
{{object 22 0}} <<
- /Type /Annot
- /Subtype /Highlight
- /Popup 21 0 R
+ /Type /Annot
+ /Subtype /Highlight
+ /Popup 21 0 R
/AP <<
/N 13 0 R
- >>
- /NM (Highlight-With-Popup-1)
- /Contents (Text Note)
- /QuadPoints [149 487 191 487 149 476 191 476]
- /P 3 0 R
- /C [0.14902 0.90196 0]
- /Rect [149 476 191 487]
- /F 4
->>
+ >>
+ /NM (Highlight-With-Popup-1)
+ /Contents (Text Note)
+ /QuadPoints [149 487 191 487 149 476 191 476]
+ /P 3 0 R
+ /C [0.14902 0.90196 0]
+ /Rect [149 476 191 487]
+ /F 4
+>>
endobj
{{object 23 0}} <<
- /ca 1
- /Type /ExtGState
- /CA 1
- /BM /Normal
+ /ca 1
+ /Type /ExtGState
+ /CA 1
+ /BM /Normal
>>
endobj
{{object 24 0}} <<
diff --git a/testing/resources/link_annots.pdf b/testing/resources/link_annots.pdf
index f7e3802..b964bf5 100644
--- a/testing/resources/link_annots.pdf
+++ b/testing/resources/link_annots.pdf
@@ -10,7 +10,7 @@
/Count 2
/Kids [3 0 R 4 0 R]
/MediaBox [0 0 612 792]
- /CropBox [0 0 612 792]
+ /CropBox [0 0 612 792]
/Resources <<
/Font <<
/F1 7 0 R
@@ -20,7 +20,7 @@
/ExtGState <<
/GS0 23 0 R
>>
- >>
+ >>
>>
endobj
3 0 obj <<
@@ -93,11 +93,11 @@
>>
endobj
9 0 obj <<
- /Type /XObject
- /Subtype /Form
- /FormType 1
- /Length 20
- /BBox [293 530 349 542]
+ /Type /XObject
+ /Subtype /Form
+ /FormType 1
+ /Length 18
+ /BBox [293 530 349 542]
/Resources <<
/XObject <<
/Form0 10 0 R
@@ -105,38 +105,38 @@
/ExtGState <<
/GS0 24 0 R
>>
- >>
->>
-stream
-/GS0 gs
-/Form0 Do
-endstream
-endobj
-10 0 obj <<
- /Type /XObject
- /Subtype /Form
- /FormType 1
- /Group <<
- /S /Transparency
- >>
- /Length 64
- /BBox [293 530 349 542]
+ >>
>>
stream
-1.0 1.0 0.0 rg
-293 530 m
-349 530 l
-349 542 l
-293 542 l
+/GS0 gs
+/Form0 Do
+endstream
+endobj
+10 0 obj <<
+ /Type /XObject
+ /Subtype /Form
+ /FormType 1
+ /Group <<
+ /S /Transparency
+ >>
+ /Length 59
+ /BBox [293 530 349 542]
+>>
+stream
+1.0 1.0 0.0 rg
+293 530 m
+349 530 l
+349 542 l
+293 542 l
h f
endstream
endobj
11 0 obj <<
- /Type /XObject
- /Subtype /Form
- /FormType 1
- /Length 20
- /BBox [83 440 178 453]
+ /Type /XObject
+ /Subtype /Form
+ /FormType 1
+ /Length 18
+ /BBox [83 440 178 453]
/Resources <<
/XObject <<
/Form0 12 0 R
@@ -144,38 +144,38 @@
/ExtGState <<
/GS0 24 0 R
>>
- >>
->>
-stream
-/GS0 gs
-/Form0 Do
-endstream
-endobj
-12 0 obj <<
- /Type /XObject
- /Subtype /Form
- /FormType 1
- /Group <<
- /S /Transparency
- >>
- /Length 62
- /BBox [83 440 178 453]
+ >>
>>
stream
-0.0 1.0 1.0 rg
-83 440 m
-178 440 l
-178 453 l
-83 453 l
+/GS0 gs
+/Form0 Do
+endstream
+endobj
+12 0 obj <<
+ /Type /XObject
+ /Subtype /Form
+ /FormType 1
+ /Group <<
+ /S /Transparency
+ >>
+ /Length 57
+ /BBox [83 440 178 453]
+>>
+stream
+0.0 1.0 1.0 rg
+83 440 m
+178 440 l
+178 453 l
+83 453 l
h f
endstream
endobj
13 0 obj <<
- /Type /XObject
- /Subtype /Form
- /FormType 1
- /Length 20
- /BBox [149 476 191 487]
+ /Type /XObject
+ /Subtype /Form
+ /FormType 1
+ /Length 18
+ /BBox [149 476 191 487]
/Resources <<
/XObject <<
/Form0 14 0 R
@@ -183,141 +183,141 @@
/ExtGState <<
/GS0 24 0 R
>>
- >>
->>
-stream
-/GS0 gs
-/Form0 Do
-endstream
-endobj
-14 0 obj <<
- /Type /XObject
- /Subtype /Form
- /FormType 1
- /Group <<
- /S /Transparency
- >>
- /Length 65
- /BBox [149 476 191 487]
+ >>
>>
stream
-0.0 1.0 0.0 rg
-149 476 m
-191 476 l
-191 487 l
-149 487 l
-h f
+/GS0 gs
+/Form0 Do
+endstream
+endobj
+14 0 obj <<
+ /Type /XObject
+ /Subtype /Form
+ /FormType 1
+ /Group <<
+ /S /Transparency
+ >>
+ /Length 59
+ /BBox [149 476 191 487]
+>>
+stream
+0.0 1.0 0.0 rg
+149 476 m
+191 476 l
+191 487 l
+149 487 l
+h f
endstream
endobj
15 0 obj <<
- /Type /Annot
- /Subtype /Link
+ /Type /Annot
+ /Subtype /Link
/BS <<
/W 0
- >>
- /Rect [69 633 542 653]
- /Dest [3 0 R /XYZ 200 725 0]
+ >>
+ /Rect [69 633 542 653]
+ /Dest [3 0 R /XYZ 200 725 0]
/F 4
->>
+>>
endobj
16 0 obj <<
- /Type /Annot
- /Subtype /Link
+ /Type /Annot
+ /Subtype /Link
/BS <<
/W 0
- >>
- /Rect [80 613 542 633]
- /Dest [4 0 R /XYZ 200 725 0]
+ >>
+ /Rect [80 613 542 633]
+ /Dest [4 0 R /XYZ 200 725 0]
/F 4
>>
endobj
17 0 obj <<
- /Type /Annot
- /Subtype /Link
+ /Type /Annot
+ /Subtype /Link
/BS <<
/W 0
- >>
- /Rect [66 529 196 544]
+ >>
+ /Rect [66 529 196 544]
/A <<
/Type /Action
/URI (https://www.adobe.com/content/dam/acom/en/devnet/acrobat/pdfs/pdf_reference_1-7.pdf)
/S /URI
- >>
+ >>
/F 4
>>
endobj
18 0 obj <<
- /Type /Annot
- /Subtype /Link
+ /Type /Annot
+ /Subtype /Link
/BS <<
/W 0
- >>
- /Rect [83 440 178 453]
- /QuadPoints [83 453 178 453 83 440 178 440]
+ >>
+ /Rect [83 440 178 453]
+ /QuadPoints [83 453 178 453 83 440 178 440]
/A <<
/Type /Action
/URI (https://cs.chromium.org/chromium/src/third_party/pdfium/public/fpdf_text.h)
/S /URI
- >>
- /F 4
->>
+ >>
+ /F 4
+>>
endobj
19 0 obj <<
- /Type /Annot
- /Subtype /Highlight
+ /Type /Annot
+ /Subtype /Highlight
/AP <<
/N 9 0 R
- >>
- /NM (Highlight-1)
- /F 4
- /QuadPoints [293 542 349 542 293 530 349 530]
- /P 3 0 R
- /C [1 0.90196 0]
- /Rect [293 530 349 542]
->>
+ >>
+ /NM (Highlight-1)
+ /F 4
+ /QuadPoints [293 542 349 542 293 530 349 530]
+ /P 3 0 R
+ /C [1 0.90196 0]
+ /Rect [293 530 349 542]
+>>
endobj
20 0 obj <<
- /Type /Annot
- /Subtype /Highlight
+ /Type /Annot
+ /Subtype /Highlight
/AP <<
/N 11 0 R
- >>
- /NM (Highlight-2)
- /F 4
- /QuadPoints [83 453 178 453 83 440 178 440]
- /P 3 0 R
- /C [0.26667 0.78431 0.96078]
- /Rect [83 440 178 453]
->>
+ >>
+ /NM (Highlight-2)
+ /F 4
+ /QuadPoints [83 453 178 453 83 440 178 440]
+ /P 3 0 R
+ /C [0.26667 0.78431 0.96078]
+ /Rect [83 440 178 453]
+>>
endobj
21 0 obj <<
- /Type /Annot
- /Subtype /Popup
+ /Type /Annot
+ /Subtype /Popup
/Parent 22 0 R
- /Rect [191 377 443 488]
->>
+ /Rect [191 377 443 488]
+>>
endobj
22 0 obj <<
- /Type /Annot
- /Subtype /Highlight
- /Popup 21 0 R
+ /Type /Annot
+ /Subtype /Highlight
+ /Popup 21 0 R
/AP <<
/N 13 0 R
- >>
- /NM (Highlight-With-Popup-1)
- /Contents (Text Note)
- /QuadPoints [149 487 191 487 149 476 191 476]
- /P 3 0 R
- /C [0.14902 0.90196 0]
- /Rect [149 476 191 487]
- /F 4
->>
+ >>
+ /NM (Highlight-With-Popup-1)
+ /Contents (Text Note)
+ /QuadPoints [149 487 191 487 149 476 191 476]
+ /P 3 0 R
+ /C [0.14902 0.90196 0]
+ /Rect [149 476 191 487]
+ /F 4
+>>
endobj
23 0 obj <<
- /ca 1
- /Type /ExtGState
- /CA 1
- /BM /Normal
+ /ca 1
+ /Type /ExtGState
+ /CA 1
+ /BM /Normal
>>
endobj
24 0 obj <<
@@ -333,32 +333,32 @@
0000000000 65535 f
0000000015 00000 n
0000000068 00000 n
-0000000340 00000 n
-0000000477 00000 n
-0000000572 00000 n
-0000001110 00000 n
-0000001347 00000 n
-0000001425 00000 n
-0000001501 00000 n
-0000001761 00000 n
-0000001993 00000 n
-0000002253 00000 n
-0000002482 00000 n
-0000002743 00000 n
-0000002976 00000 n
-0000003122 00000 n
-0000003267 00000 n
-0000003519 00000 n
-0000003811 00000 n
-0000004038 00000 n
-0000004275 00000 n
-0000004377 00000 n
-0000004664 00000 n
-0000004739 00000 n
+0000000338 00000 n
+0000000475 00000 n
+0000000570 00000 n
+0000001108 00000 n
+0000001345 00000 n
+0000001423 00000 n
+0000001499 00000 n
+0000001749 00000 n
+0000001972 00000 n
+0000002222 00000 n
+0000002442 00000 n
+0000002693 00000 n
+0000002916 00000 n
+0000003056 00000 n
+0000003196 00000 n
+0000003443 00000 n
+0000003727 00000 n
+0000003944 00000 n
+0000004171 00000 n
+0000004269 00000 n
+0000004544 00000 n
+0000004615 00000 n
trailer <<
/Root 1 0 R
/Size 25
>>
startxref
-4825
+4701
%%EOF
