diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-09-03 14:44:16 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-09-03 14:44:16 -0700 |
| commit | 55512706477c035ee27413a7a2c9a75f31ceae34 (patch) | |
| tree | 8326c0a043bca4c945978c451ea27f3936c805a6 /core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | |
| parent | 662816e763bbefe21c8c1b154328e131321f56b6 (diff) | |
| download | pdfium-55512706477c035ee27413a7a2c9a75f31ceae34.tar.xz | |
Merge to XFA: Reapply Foxit's libopenjpeg modifications.
They were lost in commit d53e6fd.
BUG=pdfium:168
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1196523002 .
(cherry picked from commit 870b5b6793fa261f0c6f31f026010d2d715968bf)
Review URL: https://codereview.chromium.org/1301323007 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index f75453557d..0362ff2e90 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -700,7 +700,7 @@ void CPDF_DIBSource::LoadJpxBitmap() { new JpxBitMapContext(pJpxModule)); context->set_decoder(pJpxModule->CreateDecoder(m_pStreamAcc->GetData(), m_pStreamAcc->GetSize(), - m_pColorSpace != nullptr)); + m_pColorSpace == nullptr)); if (!context->decoder()) return; |