From a4161734ee7f2b64cbe3431385a4b4c9a426ca47 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 17 Mar 2015 11:48:22 -0700 Subject: Revert "Fix a problem that JP2 image is not displayed because index color space is used" This reverts commit 5a0e504d53195892458d819e52c62bea0c710bd5. Original review URL https://codereview.chromium.org/1009513003 Reason for revert: New "corpus" tests show that this is no longer rendering some images. See, e.g. http://chromegw/i/client.pdfium/builders/linux/builds/144/steps/corpus%20tests/logs/stdio for those that diff'd. TBR=jun_fang@foxitsoftware.com Review URL: https://codereview.chromium.org/1016823003 --- core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp') diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index 4ed17cdfe5..79d73518a1 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -505,14 +505,10 @@ DIB_COMP_DATA* CPDF_DIBSource::GetDecodeAndMaskArray(FX_BOOL& bDefaultDecode, FX } int max_data = (1 << m_bpc) - 1; CPDF_Array* pDecode = m_pDict->GetArray(FX_BSTRC("Decode")); - FX_DWORD arrSize = pDecode ? pDecode->GetCount() : 0; - if (arrSize == 0) { - return NULL; - } if (pDecode) { for (FX_DWORD i = 0; i < m_nComponents; i ++) { - pCompData[i].m_DecodeMin = pDecode->GetNumber((i * 2) % arrSize); - FX_FLOAT max = pDecode->GetNumber((i * 2 + 1) % arrSize); + pCompData[i].m_DecodeMin = pDecode->GetNumber(i * 2); + FX_FLOAT max = pDecode->GetNumber(i * 2 + 1); pCompData[i].m_DecodeStep = (max - pCompData[i].m_DecodeMin) / max_data; FX_FLOAT def_value, def_min, def_max; m_pColorSpace->GetDefaultValue(i, def_value, def_min, def_max); -- cgit v1.2.3