summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Xu <bo_xu@foxitsoftware.com>2014-12-10 16:45:46 -0800
committerBo Xu <bo_xu@foxitsoftware.com>2014-12-10 16:47:05 -0800
commit9f13eb38989ca48582998ff4c71d8f5af647327b (patch)
treef2057be15d7e9f1554e4f05e67558070b42e243b
parent17d734e2c0d2852bbfd4e93c54f21ead6e67c12a (diff)
downloadpdfium-9f13eb38989ca48582998ff4c71d8f5af647327b.tar.xz
Merge to XFA: patch from CL 790363002
Do not do strict check of BitsPerComponent for RunLengthDecode filter BUG=438421 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/790363002
-rw-r--r--core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp5
1 files changed, 3 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 c5a96d67f4..f053e559b3 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
@@ -946,8 +946,9 @@ void CPDF_DIBSource::ValidateDictParam()
m_bpc = 1;
m_nComponents = 1;
}
- if (pArray->GetString(pArray->GetCount() - 1) == FX_BSTRC("RunLengthDecode") ||
- pArray->GetString(pArray->GetCount() - 1) == FX_BSTRC("DCTDecode")) {
+ if (pArray->GetString(pArray->GetCount() - 1) == FX_BSTRC("DCTDecode")) {
+ // Previously, pArray->GetString(pArray->GetCount() - 1) == FX_BSTRC("RunLengthDecode") was checked in the "if" statement as well,
+ // but too many documents don't conform to it.
m_bpc = 8;
}
}