diff options
author | Ralf Sippl <ralf.sippl@gmail.com> | 2018-03-19 23:30:28 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-03-19 23:30:28 +0000 |
commit | b3a5240832fce3f0b706c16070a1e69c2c1edb86 (patch) | |
tree | 36d6f6ab3853a5c241b3b437a1dc181be5329f27 /testing/resources | |
parent | 3448143cc2aa517958b6551b9419e1e6141fb5cd (diff) | |
download | pdfium-b3a5240832fce3f0b706c16070a1e69c2c1edb86.tar.xz |
Calculate AP for multi-line markup annotations correctly
Currently, when constructing AP for multi-line markup annotations, we
only take into account the first set of quadpoints, resulting in only
the first line of the annotation being displayed if the annotation spans
multiple lines.
This CL, initially written by Jane Liu <janeliulwq@google.com>
(https://pdfium-review.googlesource.com/12010) takes into account all
the quadpoints, so multi-line annotations can be displayed correctly.
BUG=pdfium:876
Change-Id: I8be10ee38e01eb6525ddef556df1b727189455c7
Reviewed-on: https://pdfium-review.googlesource.com/28590
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'testing/resources')
-rw-r--r-- | testing/resources/annotation_markup_multiline_no_ap.in | 97 | ||||
-rw-r--r-- | testing/resources/annotation_markup_multiline_no_ap.pdf | 108 |
2 files changed, 205 insertions, 0 deletions
diff --git a/testing/resources/annotation_markup_multiline_no_ap.in b/testing/resources/annotation_markup_multiline_no_ap.in new file mode 100644 index 0000000000..5107831ac9 --- /dev/null +++ b/testing/resources/annotation_markup_multiline_no_ap.in @@ -0,0 +1,97 @@ +{{header}} + +{{object 1 0}} << + /Type /Catalog + /Pages 2 0 R +>> +endobj + +{{object 2 0}} << + /Type /Pages + /Count 1 + /Kids [ 3 0 R ] +>> +endobj + +{{object 3 0}} << + /Type /Page + /Parent 2 0 R + /MediaBox [0 0 595 842] + /Annots [ + 4 0 R + 5 0 R + 6 0 R + 7 0 R + ] + /Tabs /R +>> +endobj + +{{object 4 0}} << + /Type /Annot + /Subtype /Highlight + /Rect [ 108 602 506 640 ] + /NM (Hilight-1) + /F 4 + /QuadPoints [ + 107.7896 639.9486 505.8939 639.9486 107.7896 629.1634 505.8939 629.1634 + 107.7896 626.2871 505.8939 626.2871 107.7896 615.5011 505.8939 615.5011 + 107.7896 612.6248 380.1389 612.6248 107.7896 601.8397 380.1389 601.8397 + ] + /C [ 1 1 0 ] + /Contents () +>> +endobj + +{{object 5 0}} << + /Type /Annot + /Subtype /Underline + /Rect [ 108 552 506 590 ] + /NM (Underline-1) + /F 4 + /QuadPoints [ + 107.7896 589.9486 505.8939 589.9486 107.7896 579.1634 505.8939 579.1634 + 107.7896 576.2871 505.8939 576.2871 107.7896 565.5011 505.8939 565.5011 + 107.7896 562.6248 380.1389 562.6248 107.7896 551.8397 380.1389 551.8397 + ] + /C [ 0 0 0 ] + /Contents () +>> +endobj + +{{object 6 0}} << + /Type /Annot + /Subtype /Squiggly + /Rect [ 108 502 506 540 ] + /NM (Squiggly-1) + /F 4 + /QuadPoints [ + 107.7896 539.9486 505.8939 539.9486 107.7896 529.1634 505.8939 529.1634 + 107.7896 526.2871 505.8939 526.2871 107.7896 515.5011 505.8939 515.5011 + 107.7896 512.6248 380.1389 512.6248 107.7896 501.8397 380.1389 501.8397 + ] + /C [ 0 0 0 ] + /Contents () +>> +endobj + +{{object 7 0}} << + /Type /Annot + /Subtype /StrikeOut + /Rect [ 108 452 506 490 ] + /NM (StrikeOut-1) + /F 4 + /QuadPoints [ + 107.7896 489.9486 505.8939 489.9486 107.7896 479.1634 505.8939 479.1634 + 107.7896 476.2871 505.8939 476.2871 107.7896 465.5011 505.8939 465.5011 + 107.7896 462.6248 380.1389 462.6248 107.7896 451.8397 380.1389 451.8397 + ] + /C [ 0 0 0 ] + /Contents () +>> +endobj + +{{xref}} +{{trailer}} +{{startxref}} +%%EOF diff --git a/testing/resources/annotation_markup_multiline_no_ap.pdf b/testing/resources/annotation_markup_multiline_no_ap.pdf new file mode 100644 index 0000000000..deac036e18 --- /dev/null +++ b/testing/resources/annotation_markup_multiline_no_ap.pdf @@ -0,0 +1,108 @@ +%PDF-1.7 +% ò¤ô + +1 0 obj << + /Type /Catalog + /Pages 2 0 R +>> +endobj + +2 0 obj << + /Type /Pages + /Count 1 + /Kids [ 3 0 R ] +>> +endobj + +3 0 obj << + /Type /Page + /Parent 2 0 R + /MediaBox [0 0 595 842] + /Annots [ + 4 0 R + 5 0 R + 6 0 R + 7 0 R + ] + /Tabs /R +>> +endobj + +4 0 obj << + /Type /Annot + /Subtype /Highlight + /Rect [ 108 602 506 640 ] + /NM (Hilight-1) + /F 4 + /QuadPoints [ + 107.7896 639.9486 505.8939 639.9486 107.7896 629.1634 505.8939 629.1634 + 107.7896 626.2871 505.8939 626.2871 107.7896 615.5011 505.8939 615.5011 + 107.7896 612.6248 380.1389 612.6248 107.7896 601.8397 380.1389 601.8397 + ] + /C [ 1 1 0 ] + /Contents () +>> +endobj + +5 0 obj << + /Type /Annot + /Subtype /Underline + /Rect [ 108 552 506 590 ] + /NM (Underline-1) + /F 4 + /QuadPoints [ + 107.7896 589.9486 505.8939 589.9486 107.7896 579.1634 505.8939 579.1634 + 107.7896 576.2871 505.8939 576.2871 107.7896 565.5011 505.8939 565.5011 + 107.7896 562.6248 380.1389 562.6248 107.7896 551.8397 380.1389 551.8397 + ] + /C [ 0 0 0 ] + /Contents () +>> +endobj + +6 0 obj << + /Type /Annot + /Subtype /Squiggly + /Rect [ 108 502 506 540 ] + /NM (Squiggly-1) + /F 4 + /QuadPoints [ + 107.7896 539.9486 505.8939 539.9486 107.7896 529.1634 505.8939 529.1634 + 107.7896 526.2871 505.8939 526.2871 107.7896 515.5011 505.8939 515.5011 + 107.7896 512.6248 380.1389 512.6248 107.7896 501.8397 380.1389 501.8397 + ] + /C [ 0 0 0 ] + /Contents () +>> +endobj + +7 0 obj << + /Type /Annot + /Subtype /StrikeOut + /Rect [ 108 452 506 490 ] + /NM (StrikeOut-1) + /F 4 + /QuadPoints [ + 107.7896 489.9486 505.8939 489.9486 107.7896 479.1634 505.8939 479.1634 + 107.7896 476.2871 505.8939 476.2871 107.7896 465.5011 505.8939 465.5011 + 107.7896 462.6248 380.1389 462.6248 107.7896 451.8397 380.1389 451.8397 + ] + /C [ 0 0 0 ] + /Contents () +>> +endobj + +xref +0 8 +0000000000 65535 f +0000000016 00000 n +0000000070 00000 n +0000000136 00000 n +0000000281 00000 n +0000000671 00000 n +0000001063 00000 n +0000001453 00000 n +trailer<< /Root 1 0 R /Size 8 >> +startxref +1845 +%%EOF |