Check m_nComponents when using JBIG2Decode

core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp

Index: 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 f3a1996ab4aa60278db44e9ea2719ece3467135b..af6ca72dc175d337363a29962a692f154318ea6b 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
@@ -338,8 +338,14 @@ int	CPDF_DIBSource::StartLoadDIBSource(CPDF_Document* pDoc, const CPDF_Stream* p
         return 0;
     }
     const CFX_ByteString& decoder = m_pStreamAcc->GetImageDecoder();
-    if (!decoder.IsEmpty() && decoder == FX_BSTRC("CCITTFaxDecode")) {
-        m_bpc = 1;
+    if (!decoder.IsEmpty()) {
+        if (decoder == FX_BSTRC("CCITTFaxDecode")) {
+            m_bpc = 1;
+        }
+        if (decoder == FX_BSTRC("JBIG2Decode")) {
+            m_nComponents = 1;
+        }
+

[Tom Sepez, 2014/09/02 21:32:31]

nit: no blank line here.

     }
     int ret = CreateDecoder();
     if (ret != 1) {