Merge to XFA: Cleanup JBig2_ArithIntDecoder.

core/src/fxcodec/jbig2/JBig2_TrdProc.cpp

 // Copyright 2015 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_TrdProc.h"
 
 #include "../../../../third_party/base/nonstd_unique_ptr.h"
 #include "JBig2_ArithDecoder.h"
 #include "JBig2_ArithIntDecoder.h"
 #include "JBig2_HuffmanDecoder.h"
 #include "JBig2_GrrdProc.h"
 
 CJBig2_Image* CJBig2_TRDProc::decode_Huffman(CJBig2_BitStream* pStream,
                                              JBig2ArithCtx* grContext) {
   int32_t STRIPT, FIRSTS;
   FX_DWORD NINSTANCES;
   int32_t DT, DFS, CURS;
-  uint8_t CURT;
   int32_t SI, TI;
-  FX_DWORD IDI;
   CJBig2_Image* IBI;
   FX_DWORD WI, HI;
   int32_t IDS;
   FX_BOOL RI;
   int32_t RDWI, RDHI, RDXI, RDYI;
   CJBig2_Image* IBOI;
   FX_DWORD WOI, HOI;
   FX_BOOL bFirst;
   FX_DWORD nTmp;
   int32_t nVal, nBits;
@@ skipping 26 matching lines @@
       } else {
         nVal = pHuffmanDecoder->decodeAValue(SBHUFFDS, &IDS);
         if (nVal == JBIG2_OOB) {
           break;
         } else if (nVal != 0) {
           return nullptr;
         } else {
           CURS = CURS + IDS + SBDSOFFSET;
         }
       }
-      if (SBSTRIPS == 1) {
-        CURT = 0;
-      } else {
+      uint8_t CURT = 0;
+      if (SBSTRIPS != 1) {
         nTmp = 1;
         while ((FX_DWORD)(1 << nTmp) < SBSTRIPS) {
           nTmp++;
         }
         if (pStream->readNBits(nTmp, &nVal) != 0)
           return nullptr;
 
         CURT = nVal;
       }
       TI = STRIPT + CURT;
       nVal = 0;
       nBits = 0;
+      FX_DWORD IDI;
       for (;;) {
         if (pStream->read1Bit(&nTmp) != 0)
           return nullptr;
 
         nVal = (nVal << 1) | nTmp;
         nBits++;
         for (IDI = 0; IDI < SBNUMSYMS; IDI++) {
           if ((nBits == SBSYMCODES[IDI].codelen) &&
               (nVal == SBSYMCODES[IDI].code)) {
             break;
@@ skipping 118 matching lines @@
   }
   return SBREG.release();
 }
 
 CJBig2_Image* CJBig2_TRDProc::decode_Arith(CJBig2_ArithDecoder* pArithDecoder,
                                            JBig2ArithCtx* grContext,
                                            JBig2IntDecoderState* pIDS) {
   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;
   int RI;
   int32_t RDWI, RDHI, RDXI, RDYI;
   CJBig2_Image* IBOI;
   FX_DWORD WOI, HOI;
   FX_BOOL bFirst;
-  int32_t nRet, nVal;
+  int32_t nRet;
   int32_t bRetained;
   CJBig2_ArithIntDecoder* IADT, *IAFS, *IADS, *IAIT, *IARI, *IARDW, *IARDH,
       *IARDX, *IARDY;
   CJBig2_ArithIaidDecoder* IAID;
   if (pIDS) {
     IADT = pIDS->IADT;
     IAFS = pIDS->IAFS;
     IADS = pIDS->IADS;
     IAIT = pIDS->IAIT;
     IARI = pIDS->IARI;
@@ skipping 11 matching lines @@
     IARI = new CJBig2_ArithIntDecoder();
     IARDW = new CJBig2_ArithIntDecoder();
     IARDH = new CJBig2_ArithIntDecoder();
     IARDX = new CJBig2_ArithIntDecoder();
     IARDY = new CJBig2_ArithIntDecoder();
     IAID = new CJBig2_ArithIaidDecoder(SBSYMCODELEN);
     bRetained = FALSE;
   }
   nonstd::unique_ptr<CJBig2_Image> SBREG(new CJBig2_Image(SBW, SBH));
   SBREG->fill(SBDEFPIXEL);
-  if (IADT->decode(pArithDecoder, &STRIPT) == -1) {
+  if (!IADT->decode(pArithDecoder, &STRIPT)) {
     goto failed;
   }
   STRIPT *= SBSTRIPS;
   STRIPT = -STRIPT;
   FIRSTS = 0;
   NINSTANCES = 0;
   while (NINSTANCES < SBNUMINSTANCES) {
-    if (IADT->decode(pArithDecoder, &DT) == -1) {
+    if (!IADT->decode(pArithDecoder, &DT)) {
       goto failed;
     }
     DT *= SBSTRIPS;
     STRIPT = STRIPT + DT;
     bFirst = TRUE;
     for (;;) {
       if (bFirst) {
-        if (IAFS->decode(pArithDecoder, &DFS) == -1) {
+        if (!IAFS->decode(pArithDecoder, &DFS)) {
           goto failed;
         }
         FIRSTS = FIRSTS + DFS;
         CURS = FIRSTS;
         bFirst = FALSE;
       } else {
         nRet = IADS->decode(pArithDecoder, &IDS);
         if (nRet == JBIG2_OOB) {
           break;
         } else if (nRet != 0) {
           goto failed;
         } else {
           CURS = CURS + IDS + SBDSOFFSET;
         }
       }
       if (NINSTANCES >= SBNUMINSTANCES) {
         break;
       }
-      if (SBSTRIPS == 1) {
-        CURT = 0;
-      } else {
-        if (IAIT->decode(pArithDecoder, &nVal) == -1) {
+      int CURT = 0;
+      if (SBSTRIPS != 1) {
+        if (!IAIT->decode(pArithDecoder, &CURT)) {
           goto failed;
         }
-        CURT = nVal;
       }
       TI = STRIPT + CURT;
-      if (IAID->decode(pArithDecoder, &nVal) == -1) {
-        goto failed;
-      }
-      IDI = nVal;
+      FX_DWORD IDI;
+      IAID->decode(pArithDecoder, &IDI);
       if (IDI >= SBNUMSYMS) {
         goto failed;
       }
       if (SBREFINE == 0) {
         RI = 0;
       } else {
-        if (IARI->decode(pArithDecoder, &RI) == -1) {
+        if (!IARI->decode(pArithDecoder, &RI)) {
           goto failed;
         }
       }
       if (!SBSYMS[IDI]) {
         goto failed;
       }
       if (RI == 0) {
         IBI = SBSYMS[IDI];
       } else {
-        if ((IARDW->decode(pArithDecoder, &RDWI) == -1) ||
-            (IARDH->decode(pArithDecoder, &RDHI) == -1) ||
-            (IARDX->decode(pArithDecoder, &RDXI) == -1) ||
-            (IARDY->decode(pArithDecoder, &RDYI) == -1)) {
+        if (!IARDW->decode(pArithDecoder, &RDWI) ||
+            !IARDH->decode(pArithDecoder, &RDHI) ||
+            !IARDX->decode(pArithDecoder, &RDXI) ||
+            !IARDY->decode(pArithDecoder, &RDYI)) {
           goto failed;
         }
         IBOI = SBSYMS[IDI];
         WOI = IBOI->m_nWidth;
         HOI = IBOI->m_nHeight;
         if ((int)(WOI + RDWI) < 0 || (int)(HOI + RDHI) < 0) {
           goto failed;
         }
         nonstd::unique_ptr<CJBig2_GRRDProc> pGRRD(new CJBig2_GRRDProc());
         pGRRD->GRW = WOI + RDWI;
@@ skipping 86 matching lines @@
     delete IAIT;
     delete IARI;
     delete IARDW;
     delete IARDH;
     delete IARDX;
     delete IARDY;
     delete IAID;
   }
   return nullptr;
 }