diff options
author | Lei Zhang <thestig@chromium.org> | 2015-09-29 12:26:30 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-09-29 12:26:30 -0700 |
commit | 0b8f2fee646c53b3e6eb1fbbf13211f286e8cb82 (patch) | |
tree | 5c8e9dc6eb0d16be81c5d7e82ad204233faffebb | |
parent | 472f1f75111f57c28eebd869af459f2662f32122 (diff) | |
download | pdfium-0b8f2fee646c53b3e6eb1fbbf13211f286e8cb82.tar.xz |
Merge to M46: Fix blank page issue caused by too strict correction on bpc
For bit per component (bpc), PDF spec mentions that a RunLengthDecode or DCTDecode filter shall always deliver 8-bit samples. However, some PDF files don't follow this rule. We can find that filter is RunLengthDecode but bpc is 1 in the provided test file. In this case, pdfium will correct bpc to 8 but the actual bpc is 1. It causes a failure because the data is much more than the expected. To handle this case, pdfium doesn't correct bpc to 8 when the original bpc is 1.
BUG=512557
R=tsepez@chromium.org
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1328213002 .
(cherry picked from commit 3500e90e9e42fa84dd6f07da16cfcf197ec98283)
Review URL: https://codereview.chromium.org/1377943002 .
-rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 7 | ||||
-rw-r--r-- | testing/resources/pixel/bug_512557.in | bin | 0 -> 1329 bytes | |||
-rw-r--r-- | testing/resources/pixel/bug_512557_expected.pdf.0.png | bin | 0 -> 185 bytes |
3 files changed, 5 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index 8a614810df..834623dd1f 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -965,8 +965,11 @@ void CPDF_DIBSource::ValidateDictParam() { m_bpc = 1; m_nComponents = 1; } - if (filter == FX_BSTRC("RunLengthDecode") || - filter == FX_BSTRC("DCTDecode")) { + if (filter == FX_BSTRC("RunLengthDecode")) { + if (m_bpc != 1) { + m_bpc = 8; + } + } else if (filter == FX_BSTRC("DCTDecode")) { m_bpc = 8; } } else if (pFilter->GetType() == PDFOBJ_ARRAY) { diff --git a/testing/resources/pixel/bug_512557.in b/testing/resources/pixel/bug_512557.in Binary files differnew file mode 100644 index 0000000000..5f353341d5 --- /dev/null +++ b/testing/resources/pixel/bug_512557.in diff --git a/testing/resources/pixel/bug_512557_expected.pdf.0.png b/testing/resources/pixel/bug_512557_expected.pdf.0.png Binary files differnew file mode 100644 index 0000000000..66c73aebea --- /dev/null +++ b/testing/resources/pixel/bug_512557_expected.pdf.0.png |