From 9f13eb38989ca48582998ff4c71d8f5af647327b Mon Sep 17 00:00:00 2001 From: Bo Xu Date: Wed, 10 Dec 2014 16:45:46 -0800 Subject: 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 --- core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'core/src') 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; } } -- cgit v1.2.3