From 53f555a619bfa9eed7b80ff3e1f01fd08e174195 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Tue, 27 Feb 2018 22:01:25 +0000 Subject: Move XFA pixel tests under pixel/ This removes the need for them to have their own runner. Due to other upstream changes some of the expectation files needed to be updated. The suppressions have been updated to make sure the tests do not run for non-XFA builds. Having these tests run on the bots surfaced an MSAN issue in the XFA code, which is fixed in this CL. BUG=pdfium:1020,pdfium:1008 Change-Id: I44e2fa1cba2d07f30f56f5792749acbe1ebf4b62 Reviewed-on: https://pdfium-review.googlesource.com/27710 Reviewed-by: dsinclair Commit-Queue: Ryan Harrison --- testing/SUPPRESSIONS | 5 +- .../resources/pixel/xfa_specific/barcode_test.pdf | Bin 0 -> 80879 bytes .../dynamic_list_box_allow_multiple_selection.pdf | Bin 0 -> 84183 bytes .../dynamic_password_field_background_fill.pdf | Bin 0 -> 84184 bytes .../xfa_specific/dynamic_table_color_and_width.pdf | Bin 0 -> 84901 bytes ...ynamic_table_color_and_width_expected.pdf.0.png | Bin 0 -> 16156 bytes ...ic_table_color_and_width_expected_win.pdf.0.png | Bin 0 -> 16155 bytes .../resources/pixel/xfa_specific/resolve_nodes.pdf | Bin 0 -> 213700 bytes .../pixel/xfa_specific/standard_symbols.pdf | Bin 0 -> 49726 bytes .../pixel/xfa_specific/static_list_box_caption.pdf | Bin 0 -> 99600 bytes .../static_list_box_caption_expected.pdf.0.png | Bin 0 -> 17875 bytes .../static_list_box_caption_expected_mac.pdf.0.png | Bin 0 -> 17363 bytes .../static_list_box_caption_expected_win.pdf.0.png | Bin 0 -> 17874 bytes .../xfa_specific/static_password_field_rotate.pdf | Bin 0 -> 130866 bytes ...static_password_field_rotate_expected.pdf.0.png | Bin 0 -> 47951 bytes ...static_password_field_rotate_expected.pdf.1.png | Bin 0 -> 44339 bytes ...ic_password_field_rotate_expected_mac.pdf.0.png | Bin 0 -> 46538 bytes ...ic_password_field_rotate_expected_mac.pdf.1.png | Bin 0 -> 41794 bytes ...ic_password_field_rotate_expected_win.pdf.0.png | Bin 0 -> 47951 bytes ...ic_password_field_rotate_expected_win.pdf.1.png | Bin 0 -> 44339 bytes .../resources/pixel/xfa_specific/xfa_example.in | 71 +++++++++++++++++++++ .../xfa_specific/xfa_example_expected.pdf.0.png | Bin 0 -> 5073 bytes .../xfa_example_expected_mac.pdf.0.png | Bin 0 -> 4806 bytes .../xfa_example_expected_win.pdf.0.png | Bin 0 -> 4806 bytes .../pixel/xfa_specific/xfa_node_caption.pdf | Bin 0 -> 87521 bytes testing/resources/xfa/barcode_test.pdf | Bin 80879 -> 0 bytes .../dynamic_list_box_allow_multiple_selection.pdf | Bin 84183 -> 0 bytes .../xfa/dynamic_password_field_background_fill.pdf | Bin 84184 -> 0 bytes .../xfa/dynamic_table_color_and_width.pdf | Bin 84901 -> 0 bytes ...ynamic_table_color_and_width_expected.pdf.0.png | Bin 16156 -> 0 bytes testing/resources/xfa/resolve_nodes.pdf | Bin 213700 -> 0 bytes testing/resources/xfa/standard_symbols.pdf | Bin 49726 -> 0 bytes testing/resources/xfa/static_list_box_caption.pdf | Bin 99600 -> 0 bytes .../xfa/static_list_box_caption_expected.pdf.0.png | Bin 17363 -> 0 bytes .../resources/xfa/static_password_field_rotate.pdf | Bin 130866 -> 0 bytes ...static_password_field_rotate_expected.pdf.0.png | Bin 46538 -> 0 bytes ...static_password_field_rotate_expected.pdf.1.png | Bin 41794 -> 0 bytes testing/resources/xfa/xfa_example.in | 71 --------------------- .../resources/xfa/xfa_example_expected.pdf.0.png | Bin 4806 -> 0 bytes testing/resources/xfa/xfa_node_caption.pdf | Bin 87521 -> 0 bytes testing/tools/run_xfa_tests.py | 16 ----- xfa/fxfa/cxfa_textparser.cpp | 4 +- 42 files changed, 76 insertions(+), 91 deletions(-) create mode 100644 testing/resources/pixel/xfa_specific/barcode_test.pdf create mode 100644 testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection.pdf create mode 100644 testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill.pdf create mode 100644 testing/resources/pixel/xfa_specific/dynamic_table_color_and_width.pdf create mode 100644 testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected.pdf.0.png create mode 100644 testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_win.pdf.0.png create mode 100644 testing/resources/pixel/xfa_specific/resolve_nodes.pdf create mode 100644 testing/resources/pixel/xfa_specific/standard_symbols.pdf create mode 100644 testing/resources/pixel/xfa_specific/static_list_box_caption.pdf create mode 100644 testing/resources/pixel/xfa_specific/static_list_box_caption_expected.pdf.0.png create mode 100644 testing/resources/pixel/xfa_specific/static_list_box_caption_expected_mac.pdf.0.png create mode 100644 testing/resources/pixel/xfa_specific/static_list_box_caption_expected_win.pdf.0.png create mode 100644 testing/resources/pixel/xfa_specific/static_password_field_rotate.pdf create mode 100644 testing/resources/pixel/xfa_specific/static_password_field_rotate_expected.pdf.0.png create mode 100644 testing/resources/pixel/xfa_specific/static_password_field_rotate_expected.pdf.1.png create mode 100644 testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_mac.pdf.0.png create mode 100644 testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_mac.pdf.1.png create mode 100644 testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.0.png create mode 100644 testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.1.png create mode 100644 testing/resources/pixel/xfa_specific/xfa_example.in create mode 100644 testing/resources/pixel/xfa_specific/xfa_example_expected.pdf.0.png create mode 100644 testing/resources/pixel/xfa_specific/xfa_example_expected_mac.pdf.0.png create mode 100644 testing/resources/pixel/xfa_specific/xfa_example_expected_win.pdf.0.png create mode 100644 testing/resources/pixel/xfa_specific/xfa_node_caption.pdf delete mode 100644 testing/resources/xfa/barcode_test.pdf delete mode 100644 testing/resources/xfa/dynamic_list_box_allow_multiple_selection.pdf delete mode 100644 testing/resources/xfa/dynamic_password_field_background_fill.pdf delete mode 100644 testing/resources/xfa/dynamic_table_color_and_width.pdf delete mode 100644 testing/resources/xfa/dynamic_table_color_and_width_expected.pdf.0.png delete mode 100644 testing/resources/xfa/resolve_nodes.pdf delete mode 100644 testing/resources/xfa/standard_symbols.pdf delete mode 100644 testing/resources/xfa/static_list_box_caption.pdf delete mode 100644 testing/resources/xfa/static_list_box_caption_expected.pdf.0.png delete mode 100644 testing/resources/xfa/static_password_field_rotate.pdf delete mode 100644 testing/resources/xfa/static_password_field_rotate_expected.pdf.0.png delete mode 100644 testing/resources/xfa/static_password_field_rotate_expected.pdf.1.png delete mode 100644 testing/resources/xfa/xfa_example.in delete mode 100644 testing/resources/xfa/xfa_example_expected.pdf.0.png delete mode 100644 testing/resources/xfa/xfa_node_caption.pdf delete mode 100755 testing/tools/run_xfa_tests.py diff --git a/testing/SUPPRESSIONS b/testing/SUPPRESSIONS index ce852fd8ac..2572203384 100644 --- a/testing/SUPPRESSIONS +++ b/testing/SUPPRESSIONS @@ -322,13 +322,12 @@ bug_735912.in * * noxfa bug_492.in * nov8 * # -# XFA Tests -# +# xfa_specific + # TODO(rharrison): Create expectations for existing files. barcode_test.pdf * * * dynamic_list_box_allow_multiple_selection.pdf * * * dynamic_password_field_background_fill.pdf * * * -email_recommended.pdf * * * resolve_nodes.pdf * * * standard_symbols.pdf * * * xfa_node_caption.pdf * * * diff --git a/testing/resources/pixel/xfa_specific/barcode_test.pdf b/testing/resources/pixel/xfa_specific/barcode_test.pdf new file mode 100644 index 0000000000..8454cd0752 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/barcode_test.pdf differ diff --git a/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection.pdf b/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection.pdf new file mode 100644 index 0000000000..5c3aa79028 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection.pdf differ diff --git a/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill.pdf b/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill.pdf new file mode 100644 index 0000000000..f9d74cd6ad Binary files /dev/null and b/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill.pdf differ diff --git a/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width.pdf b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width.pdf new file mode 100644 index 0000000000..7b59c1825e Binary files /dev/null and b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width.pdf differ diff --git a/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected.pdf.0.png new file mode 100644 index 0000000000..6b2203150a Binary files /dev/null and b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected.pdf.0.png differ diff --git a/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_win.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_win.pdf.0.png new file mode 100644 index 0000000000..fc31cfaf2b Binary files /dev/null and b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_win.pdf.0.png differ diff --git a/testing/resources/pixel/xfa_specific/resolve_nodes.pdf b/testing/resources/pixel/xfa_specific/resolve_nodes.pdf new file mode 100644 index 0000000000..9694f7fe50 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/resolve_nodes.pdf differ diff --git a/testing/resources/pixel/xfa_specific/standard_symbols.pdf b/testing/resources/pixel/xfa_specific/standard_symbols.pdf new file mode 100644 index 0000000000..6a06520f34 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/standard_symbols.pdf differ diff --git a/testing/resources/pixel/xfa_specific/static_list_box_caption.pdf b/testing/resources/pixel/xfa_specific/static_list_box_caption.pdf new file mode 100644 index 0000000000..5b166cd214 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/static_list_box_caption.pdf differ diff --git a/testing/resources/pixel/xfa_specific/static_list_box_caption_expected.pdf.0.png b/testing/resources/pixel/xfa_specific/static_list_box_caption_expected.pdf.0.png new file mode 100644 index 0000000000..45a898326f Binary files /dev/null and b/testing/resources/pixel/xfa_specific/static_list_box_caption_expected.pdf.0.png differ diff --git a/testing/resources/pixel/xfa_specific/static_list_box_caption_expected_mac.pdf.0.png b/testing/resources/pixel/xfa_specific/static_list_box_caption_expected_mac.pdf.0.png new file mode 100644 index 0000000000..677ba280a4 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/static_list_box_caption_expected_mac.pdf.0.png differ diff --git a/testing/resources/pixel/xfa_specific/static_list_box_caption_expected_win.pdf.0.png b/testing/resources/pixel/xfa_specific/static_list_box_caption_expected_win.pdf.0.png new file mode 100644 index 0000000000..71edafd0a9 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/static_list_box_caption_expected_win.pdf.0.png differ diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate.pdf b/testing/resources/pixel/xfa_specific/static_password_field_rotate.pdf new file mode 100644 index 0000000000..1ea45b68cc Binary files /dev/null and b/testing/resources/pixel/xfa_specific/static_password_field_rotate.pdf differ diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected.pdf.0.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected.pdf.0.png new file mode 100644 index 0000000000..d49fc369bf Binary files /dev/null and b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected.pdf.0.png differ diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected.pdf.1.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected.pdf.1.png new file mode 100644 index 0000000000..3e60b4d893 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected.pdf.1.png differ diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_mac.pdf.0.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_mac.pdf.0.png new file mode 100644 index 0000000000..79f2e3fd0a Binary files /dev/null and b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_mac.pdf.0.png differ diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_mac.pdf.1.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_mac.pdf.1.png new file mode 100644 index 0000000000..1d99751a65 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_mac.pdf.1.png differ diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.0.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.0.png new file mode 100644 index 0000000000..9530509f61 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.0.png differ diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.1.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.1.png new file mode 100644 index 0000000000..3e60b4d893 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.1.png differ diff --git a/testing/resources/pixel/xfa_specific/xfa_example.in b/testing/resources/pixel/xfa_specific/xfa_example.in new file mode 100644 index 0000000000..d8be96f305 --- /dev/null +++ b/testing/resources/pixel/xfa_specific/xfa_example.in @@ -0,0 +1,71 @@ +{{header}} + +%% Original object ID: 24 0 +{{object 1 0}} +<< + /AcroForm 2 0 R + /Extensions << + /ADBE << + /BaseVersion /1.7 + /ExtensionLevel 8 + >> + >> + /NeedsRendering true + /Type /Catalog +>> +endobj + +%% Original object ID: 32 0 +{{object 2 0}} +<< + /XFA [ + (preamble) + 3 0 R + (config) + 4 0 R + (template) + 5 0 R + (localeSet) + 6 0 R + (postamble) + 7 0 R + ] +>> +endobj + +{{xfapreamble 3 0}} +{{xfaconfig 4 0}} + +{{object 5 0}} +<< + {{streamlen}} +>> +stream + +endstream +endobj + +{{xfalocale 6 0}} + +{{xfapostamble 7 0}} + +{{xref}} +{{trailer}} +{{startxref}} +%%EOF \ No newline at end of file diff --git a/testing/resources/pixel/xfa_specific/xfa_example_expected.pdf.0.png b/testing/resources/pixel/xfa_specific/xfa_example_expected.pdf.0.png new file mode 100644 index 0000000000..81c317a1e7 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/xfa_example_expected.pdf.0.png differ diff --git a/testing/resources/pixel/xfa_specific/xfa_example_expected_mac.pdf.0.png b/testing/resources/pixel/xfa_specific/xfa_example_expected_mac.pdf.0.png new file mode 100644 index 0000000000..9a682f7186 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/xfa_example_expected_mac.pdf.0.png differ diff --git a/testing/resources/pixel/xfa_specific/xfa_example_expected_win.pdf.0.png b/testing/resources/pixel/xfa_specific/xfa_example_expected_win.pdf.0.png new file mode 100644 index 0000000000..9a682f7186 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/xfa_example_expected_win.pdf.0.png differ diff --git a/testing/resources/pixel/xfa_specific/xfa_node_caption.pdf b/testing/resources/pixel/xfa_specific/xfa_node_caption.pdf new file mode 100644 index 0000000000..ef8eb7dcc9 Binary files /dev/null and b/testing/resources/pixel/xfa_specific/xfa_node_caption.pdf differ diff --git a/testing/resources/xfa/barcode_test.pdf b/testing/resources/xfa/barcode_test.pdf deleted file mode 100644 index 8454cd0752..0000000000 Binary files a/testing/resources/xfa/barcode_test.pdf and /dev/null differ diff --git a/testing/resources/xfa/dynamic_list_box_allow_multiple_selection.pdf b/testing/resources/xfa/dynamic_list_box_allow_multiple_selection.pdf deleted file mode 100644 index 5c3aa79028..0000000000 Binary files a/testing/resources/xfa/dynamic_list_box_allow_multiple_selection.pdf and /dev/null differ diff --git a/testing/resources/xfa/dynamic_password_field_background_fill.pdf b/testing/resources/xfa/dynamic_password_field_background_fill.pdf deleted file mode 100644 index f9d74cd6ad..0000000000 Binary files a/testing/resources/xfa/dynamic_password_field_background_fill.pdf and /dev/null differ diff --git a/testing/resources/xfa/dynamic_table_color_and_width.pdf b/testing/resources/xfa/dynamic_table_color_and_width.pdf deleted file mode 100644 index 7b59c1825e..0000000000 Binary files a/testing/resources/xfa/dynamic_table_color_and_width.pdf and /dev/null differ diff --git a/testing/resources/xfa/dynamic_table_color_and_width_expected.pdf.0.png b/testing/resources/xfa/dynamic_table_color_and_width_expected.pdf.0.png deleted file mode 100644 index 6b2203150a..0000000000 Binary files a/testing/resources/xfa/dynamic_table_color_and_width_expected.pdf.0.png and /dev/null differ diff --git a/testing/resources/xfa/resolve_nodes.pdf b/testing/resources/xfa/resolve_nodes.pdf deleted file mode 100644 index 9694f7fe50..0000000000 Binary files a/testing/resources/xfa/resolve_nodes.pdf and /dev/null differ diff --git a/testing/resources/xfa/standard_symbols.pdf b/testing/resources/xfa/standard_symbols.pdf deleted file mode 100644 index 6a06520f34..0000000000 Binary files a/testing/resources/xfa/standard_symbols.pdf and /dev/null differ diff --git a/testing/resources/xfa/static_list_box_caption.pdf b/testing/resources/xfa/static_list_box_caption.pdf deleted file mode 100644 index 5b166cd214..0000000000 Binary files a/testing/resources/xfa/static_list_box_caption.pdf and /dev/null differ diff --git a/testing/resources/xfa/static_list_box_caption_expected.pdf.0.png b/testing/resources/xfa/static_list_box_caption_expected.pdf.0.png deleted file mode 100644 index 677ba280a4..0000000000 Binary files a/testing/resources/xfa/static_list_box_caption_expected.pdf.0.png and /dev/null differ diff --git a/testing/resources/xfa/static_password_field_rotate.pdf b/testing/resources/xfa/static_password_field_rotate.pdf deleted file mode 100644 index 1ea45b68cc..0000000000 Binary files a/testing/resources/xfa/static_password_field_rotate.pdf and /dev/null differ diff --git a/testing/resources/xfa/static_password_field_rotate_expected.pdf.0.png b/testing/resources/xfa/static_password_field_rotate_expected.pdf.0.png deleted file mode 100644 index 79f2e3fd0a..0000000000 Binary files a/testing/resources/xfa/static_password_field_rotate_expected.pdf.0.png and /dev/null differ diff --git a/testing/resources/xfa/static_password_field_rotate_expected.pdf.1.png b/testing/resources/xfa/static_password_field_rotate_expected.pdf.1.png deleted file mode 100644 index 1d99751a65..0000000000 Binary files a/testing/resources/xfa/static_password_field_rotate_expected.pdf.1.png and /dev/null differ diff --git a/testing/resources/xfa/xfa_example.in b/testing/resources/xfa/xfa_example.in deleted file mode 100644 index d8be96f305..0000000000 --- a/testing/resources/xfa/xfa_example.in +++ /dev/null @@ -1,71 +0,0 @@ -{{header}} - -%% Original object ID: 24 0 -{{object 1 0}} -<< - /AcroForm 2 0 R - /Extensions << - /ADBE << - /BaseVersion /1.7 - /ExtensionLevel 8 - >> - >> - /NeedsRendering true - /Type /Catalog ->> -endobj - -%% Original object ID: 32 0 -{{object 2 0}} -<< - /XFA [ - (preamble) - 3 0 R - (config) - 4 0 R - (template) - 5 0 R - (localeSet) - 6 0 R - (postamble) - 7 0 R - ] ->> -endobj - -{{xfapreamble 3 0}} -{{xfaconfig 4 0}} - -{{object 5 0}} -<< - {{streamlen}} ->> -stream - -endstream -endobj - -{{xfalocale 6 0}} - -{{xfapostamble 7 0}} - -{{xref}} -{{trailer}} -{{startxref}} -%%EOF \ No newline at end of file diff --git a/testing/resources/xfa/xfa_example_expected.pdf.0.png b/testing/resources/xfa/xfa_example_expected.pdf.0.png deleted file mode 100644 index 9a682f7186..0000000000 Binary files a/testing/resources/xfa/xfa_example_expected.pdf.0.png and /dev/null differ diff --git a/testing/resources/xfa/xfa_node_caption.pdf b/testing/resources/xfa/xfa_node_caption.pdf deleted file mode 100644 index ef8eb7dcc9..0000000000 Binary files a/testing/resources/xfa/xfa_node_caption.pdf and /dev/null differ diff --git a/testing/tools/run_xfa_tests.py b/testing/tools/run_xfa_tests.py deleted file mode 100755 index 6647cfd939..0000000000 --- a/testing/tools/run_xfa_tests.py +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env python -# Copyright 2018 The PDFium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import sys - -import test_runner - -def main(): - runner = test_runner.TestRunner('xfa') - runner.SetEnforceExpectedImages(True) - return runner.Run() - -if __name__ == '__main__': - sys.exit(main()) diff --git a/xfa/fxfa/cxfa_textparser.cpp b/xfa/fxfa/cxfa_textparser.cpp index bcadbea5c0..a957147762 100644 --- a/xfa/fxfa/cxfa_textparser.cpp +++ b/xfa/fxfa/cxfa_textparser.cpp @@ -434,9 +434,11 @@ void CXFA_TextParser::GetUnderline(CXFA_TextProvider* pTextProvider, void CXFA_TextParser::GetLinethrough(CXFA_TextProvider* pTextProvider, CFX_CSSComputedStyle* pStyle, int32_t& iLinethrough) const { + iLinethrough = 0; if (pStyle) { uint32_t dwDecoration = pStyle->GetTextDecoration(); - iLinethrough = (dwDecoration & CFX_CSSTEXTDECORATION_LineThrough) ? 1 : 0; + if (dwDecoration & CFX_CSSTEXTDECORATION_LineThrough) + iLinethrough = 1; return; } -- cgit v1.2.3