Merge to XFA: FX_BOOL combo patch.

core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "JBig2_GeneralDecoder.h"
 #include "JBig2_ArithDecoder.h"
 #include "JBig2_ArithIntDecoder.h"
 #include "JBig2_HuffmanDecoder.h"
@@ skipping 2083 matching lines @@
 {
     int32_t STRIPT, FIRSTS;
     FX_DWORD NINSTANCES;
     int32_t DT, DFS, CURS;
     int32_t CURT;
     int32_t SI, TI;
     FX_DWORD IDI;
     CJBig2_Image *IBI;
     FX_DWORD WI, HI;
     int32_t IDS;
-    FX_BOOL RI;
+    int RI;
     int32_t RDWI, RDHI, RDXI, RDYI;
     CJBig2_Image *IBOI;
     FX_DWORD WOI, HOI;
     CJBig2_Image *SBREG;
     FX_BOOL bFirst;
     int32_t nRet, nVal;
     int32_t bRetained;
     CJBig2_ArithIntDecoder *IADT, *IAFS, *IADS, *IAIT, *IARI, *IARDW, *IARDH, *IARDX, *IARDY;
     CJBig2_ArithIaidDecoder *IAID;
     CJBig2_GRRDProc *pGRRD;
@@ skipping 2207 matching lines @@
         }
         if(pPause && pPause->NeedToPauseNow()) {
             m_loopIndex++;
             m_ProssiveStatus = FXCODEC_STATUS_DECODE_TOBECONTINUE;
             return FXCODEC_STATUS_DECODE_TOBECONTINUE;
         }
     }
     m_ProssiveStatus = FXCODEC_STATUS_DECODE_FINISH;
     return FXCODEC_STATUS_DECODE_FINISH;
 }