Merge to XFA: FX_BOOL combo patch.

core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp

Index: core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp
diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp b/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp
index dd820ae4ca58f17389d2666f385f1b7cbdfc3c46..ef8454799289dd612710122b9dfd9f4124469756 100644
--- a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp
@@ -14,9 +14,10 @@ CJBig2_HuffmanDecoder::~CJBig2_HuffmanDecoder()
 }
 int CJBig2_HuffmanDecoder::decodeAValue(CJBig2_HuffmanTable *pTable, int *nResult)
 {
-    int nVal, nTmp, i, nBits;
-    nVal = 0;
-    nBits = 0;
+    int i;
+    int nVal = 0;
+    int nBits = 0;
+    FX_DWORD nTmp;
     while(1) {
         if(m_pStream->read1Bit(&nTmp) == -1) {
             return -1;