diff options
| author | Jun Fang <jun_fang@foxitsoftware.com> | 2015-12-24 18:27:33 +0800 |
|---|---|---|
| committer | Jun Fang <jun_fang@foxitsoftware.com> | 2015-12-24 18:27:33 +0800 |
| commit | c7b4357a70235063a725a467da8758b3491c373c (patch) | |
| tree | c01d036e1c0e61eee89bf45c684816bef05cf410 /core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | |
| parent | c70bd39ec72921cc10b613ce9adcd8f07d7f3039 (diff) | |
| download | pdfium-c7b4357a70235063a725a467da8758b3491c373c.tar.xz | |
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 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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<JpxBitMapContext> 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; |