Merge to XFA: Fix a bunch of -Wunused-but-set-variable warnings.

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 870 matching lines @@
     }
     return GBREG;
 }
 CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template3_opt2(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext)
 {
     FX_BOOL LTP, SLTP, bVal;
     FX_DWORD CONTEXT;
     CJBig2_Image *GBREG;
     FX_DWORD line1;
     FX_BYTE *pLine, cVal;
-    FX_INTPTR nStride, nStride2;
+    FX_INTPTR nStride;
     FX_INT32 nBits, k;
     LTP = 0;
     JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
     if (GBREG->m_pData == NULL) {
         delete GBREG;
         m_pModule->JBig2_Error("Generic region decoding procedure: Create Image Failed with width = %d, height = %d\n", GBW, GBH);
         return NULL;
     }
     pLine = GBREG->m_pData;
     nStride = GBREG->m_nStride;
-    nStride2 = nStride << 1;
     for(FX_DWORD h = 0; h < GBH; h++) {
         if(TPGDON) {
             SLTP = pArithDecoder->DECODE(&gbContext[0x0195]);
             LTP = LTP ^ SLTP;
         }
         if(LTP == 1) {
             GBREG->copyLine(h, h - 1);
         } else {
             line1 = (h > 0) ? pLine[-nStride] : 0;
             CONTEXT = (line1 >> 1) & 0x03f0;
@@ skipping 1415 matching lines @@
     }
     delete SBREG;
     return NULL;
 }
 CJBig2_SymbolDict *CJBig2_SDDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecoder,
         JBig2ArithCtx *gbContext, JBig2ArithCtx *grContext)
 {
     CJBig2_Image **SDNEWSYMS;
     FX_DWORD HCHEIGHT, NSYMSDECODED;
     FX_INT32 HCDH;
-    FX_DWORD SYMWIDTH, TOTWIDTH, HCFIRSTSYM;
+    FX_DWORD SYMWIDTH, TOTWIDTH;
     FX_INT32 DW;
     CJBig2_Image *BS;
     FX_DWORD I, J, REFAGGNINST;
     FX_BOOL *EXFLAGS;
     FX_DWORD EXINDEX;
     FX_BOOL CUREXFLAG;
     FX_DWORD EXRUNLENGTH;
     FX_INT32 nVal;
     FX_DWORD nTmp;
-    FX_BOOL SBHUFF;
     FX_DWORD SBNUMSYMS;
     FX_BYTE SBSYMCODELEN;
     FX_DWORD IDI;
     FX_INT32 RDXI, RDYI;
     CJBig2_Image **SBSYMS;
     CJBig2_HuffmanTable *SBHUFFFS, *SBHUFFDS, *SBHUFFDT, *SBHUFFRDW, *SBHUFFRDH, *SBHUFFRDX, *SBHUFFRDY,
                         *SBHUFFRSIZE;
     CJBig2_GRRDProc *pGRRD;
     CJBig2_GRDProc *pGRD;
     CJBig2_ArithIntDecoder *IADH, *IADW, *IAAI, *IARDX, *IARDY, *IAEX,
@@ skipping 28 matching lines @@
             m_pModule->JBig2_Error("symbol dictionary decoding procedure (arith): too short.");
             goto failed;
         }
         HCHEIGHT = HCHEIGHT + HCDH;
         if ((int)HCHEIGHT < 0 || (int)HCHEIGHT > JBIG2_MAX_IMAGE_SIZE) {
             m_pModule->JBig2_Error("symbol dictionary decoding procedure (arith): invalid HCHEIGHT value.");
             goto failed;
         }
         SYMWIDTH = 0;
         TOTWIDTH = 0;
-        HCFIRSTSYM = NSYMSDECODED;
         for(;;) {
             nVal = IADW->decode(pArithDecoder, &DW);
             if(nVal == JBIG2_OOB) {
                 break;
             } else if(nVal != 0) {
                 m_pModule->JBig2_Error("symbol dictionary decoding procedure (arith): too short.");
                 goto failed;
             } else {
                 if (NSYMSDECODED >= SDNUMNEWSYMS) {
                     m_pModule->JBig2_Error("symbol dictionary decoding procedure (arith): NSYMSDECODED >= SDNUMNEWSYMS.");
@@ skipping 122 matching lines @@
                     delete SBHUFFFS;
                     delete SBHUFFDS;
                     delete SBHUFFDT;
                     delete SBHUFFRDW;
                     delete SBHUFFRDH;
                     delete SBHUFFRDX;
                     delete SBHUFFRDY;
                     delete SBHUFFRSIZE;
                     delete pDecoder;
                 } else if(REFAGGNINST == 1) {
-                    SBHUFF = SDHUFF;
                     SBNUMSYMS = SDNUMINSYMS + NSYMSDECODED;
                     if(IAID->decode(pArithDecoder, (int*)&IDI) == -1) {
                         m_pModule->JBig2_Error("symbol dictionary decoding procedure (arith): too short.");
                         goto failed;
                     }
                     if((IARDX->decode(pArithDecoder, &RDXI) == -1)
                             || (IARDY->decode(pArithDecoder, &RDYI) == -1)) {
                         m_pModule->JBig2_Error("symbol dictionary decoding procedure (arith): too short.");
                         goto failed;
                     }
@@ skipping 128 matching lines @@
     FX_DWORD SYMWIDTH, TOTWIDTH, HCFIRSTSYM;
     FX_INT32 DW;
     CJBig2_Image *BS, *BHC;
     FX_DWORD I, J, REFAGGNINST;
     FX_BOOL *EXFLAGS;
     FX_DWORD EXINDEX;
     FX_BOOL CUREXFLAG;
     FX_DWORD EXRUNLENGTH;
     FX_INT32 nVal, nBits;
     FX_DWORD nTmp;
-    FX_BOOL SBHUFF;
     FX_DWORD SBNUMSYMS;
     FX_BYTE SBSYMCODELEN;
     JBig2HuffmanCode *SBSYMCODES;
     FX_DWORD IDI;
     FX_INT32 RDXI, RDYI;
     FX_DWORD BMSIZE;
     FX_DWORD stride;
     CJBig2_Image **SBSYMS;
     CJBig2_HuffmanTable *SBHUFFFS, *SBHUFFDS, *SBHUFFDT, *SBHUFFRDW, *SBHUFFRDH, *SBHUFFRDX, *SBHUFFRDY,
                         *SBHUFFRSIZE, *pTable;
@@ skipping 136 matching lines @@
                     delete SBHUFFFS;
                     delete SBHUFFDS;
                     delete SBHUFFDT;
                     delete SBHUFFRDW;
                     delete SBHUFFRDH;
                     delete SBHUFFRDX;
                     delete SBHUFFRDY;
                     delete SBHUFFRSIZE;
                     delete pDecoder;
                 } else if(REFAGGNINST == 1) {
-                    SBHUFF = SDHUFF;
                     SBNUMSYMS = SDNUMINSYMS + SDNUMNEWSYMS;
                     nTmp = 1;
                     while((FX_DWORD)(1 << nTmp) < SBNUMSYMS) {
                         nTmp ++;
                     }
                     SBSYMCODELEN = (FX_BYTE)nTmp;
                     SBSYMCODES = (JBig2HuffmanCode*)m_pModule->JBig2_Malloc2(SBNUMSYMS, sizeof(JBig2HuffmanCode));
                     for(I = 0; I < SBNUMSYMS; I++) {
                         SBSYMCODES[I].codelen = SBSYMCODELEN;
                         SBSYMCODES[I].code = I;
@@ skipping 1477 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;
 }