From c7b4357a70235063a725a467da8758b3491c373c Mon Sep 17 00:00:00 2001 From: Jun Fang Date: Thu, 24 Dec 2015 18:27:33 +0800 Subject: Merge to XFA: Fix failed JPX image rendering BUG=pdfium:338 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1549043003 . Review URL: https://codereview.chromium.org/1549083002 . --- core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 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 0306ff0227..6bb8033686 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -684,9 +684,8 @@ void CPDF_DIBSource::LoadJpxBitmap() { nonstd::unique_ptr context( new JpxBitMapContext(pJpxModule)); - context->set_decoder(pJpxModule->CreateDecoder(m_pStreamAcc->GetData(), - m_pStreamAcc->GetSize(), - m_pColorSpace == nullptr)); + context->set_decoder(pJpxModule->CreateDecoder( + m_pStreamAcc->GetData(), m_pStreamAcc->GetSize(), m_pColorSpace)); if (!context->decoder()) return; -- cgit v1.2.3