Fix more code which has shadow variables

core/fxcodec/jbig2/JBig2_GrdProc.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 "core/fxcodec/jbig2/JBig2_GrdProc.h"
 
 #include <memory>
 
 #include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
 #include "core/fxcodec/jbig2/JBig2_BitStream.h"
 #include "core/fxcodec/jbig2/JBig2_Image.h"
 
 CJBig2_GRDProc::CJBig2_GRDProc()
     : m_loopIndex(0),
       m_pLine(nullptr),
       m_pPause(nullptr),
       m_DecodeType(0),
-      LTP(0) {
+      m_LTP(0) {

[dsinclair, 2016/06/06 12:50:11]

nit: FALSE

[Wei Li, 2016/06/07 17:33:53]

Done.

   m_ReplaceRect.left = 0;
   m_ReplaceRect.bottom = 0;
   m_ReplaceRect.top = 0;
   m_ReplaceRect.right = 0;
 }
 
 bool CJBig2_GRDProc::UseTemplate0Opt3() const {
   return (GBAT[0] == 3) && (GBAT[1] == -1) && (GBAT[2] == -3) &&
          (GBAT[3] == -1) && (GBAT[4] == 2) && (GBAT[5] == -2) &&
          (GBAT[6] == -2) && (GBAT[7] == -2);
@@ skipping 567 matching lines @@
     delete *pImage;
     *pImage = nullptr;
     m_ProssiveStatus = FXCODEC_STATUS_ERROR;
     return FXCODEC_STATUS_ERROR;
   }
   m_DecodeType = 1;
   m_pImage = pImage;
   (*m_pImage)->fill(0);
   m_pArithDecoder = pArithDecoder;
   m_gbContext = gbContext;
-  LTP = 0;
+  m_LTP = 0;

[dsinclair, 2016/06/06 12:50:10]

nit: FALSE

[Wei Li, 2016/06/07 17:33:52]

Done.

   m_pLine = nullptr;
   m_loopIndex = 0;
   return decode_Arith(pPause);
 }
 
 FXCODEC_STATUS CJBig2_GRDProc::decode_Arith(IFX_Pause* pPause) {
   int iline = m_loopIndex;
   CJBig2_Image* pImage = *m_pImage;
   if (GBTEMPLATE == 0) {
     if (UseTemplate0Opt3()) {
@@ skipping 87 matching lines @@
     m_pLine = pImage->m_pData;
   }
   nStride = pImage->m_nStride;
   nStride2 = nStride << 1;
   nLineBytes = ((GBW + 7) >> 3) - 1;
   nBitsLeft = GBW - (nLineBytes << 3);
   uint32_t height = GBH & 0x7fffffff;
   for (; m_loopIndex < height; m_loopIndex++) {
     if (TPGDON) {
       SLTP = pArithDecoder->DECODE(&gbContext[0x9b25]);
-      LTP = LTP ^ SLTP;
+      m_LTP = m_LTP ^ SLTP;
     }
-    if (LTP == 1) {
+    if (m_LTP == 1) {

[dsinclair, 2016/06/06 12:50:10]

nit: TRUE  (and others below)

[Tom Sepez, 2016/06/06 16:43:33]

just if (m_LTP) {

[Wei Li, 2016/06/07 17:33:53]

Done.

       pImage->copyLine(m_loopIndex, m_loopIndex - 1);
     } else {
       if (m_loopIndex > 1) {
         pLine1 = m_pLine - nStride2;
         pLine2 = m_pLine - nStride;
         line1 = (*pLine1++) << 6;
         line2 = *pLine2++;
         CONTEXT = ((line1 & 0xf800) | (line2 & 0x07f0));
         for (cc = 0; cc < nLineBytes; cc++) {
           line1 = (line1 << 8) | ((*pLine1++) << 6);
@@ skipping 61 matching lines @@
     CJBig2_Image* pImage,
     CJBig2_ArithDecoder* pArithDecoder,
     JBig2ArithCtx* gbContext,
     IFX_Pause* pPause) {
   FX_BOOL SLTP, bVal;
   uint32_t CONTEXT;
   uint32_t line1, line2, line3;
   for (; m_loopIndex < GBH; m_loopIndex++) {
     if (TPGDON) {
       SLTP = pArithDecoder->DECODE(&gbContext[0x9b25]);
-      LTP = LTP ^ SLTP;
+      m_LTP = m_LTP ^ SLTP;
     }
-    if (LTP == 1) {
+    if (m_LTP == 1) {
       pImage->copyLine(m_loopIndex, m_loopIndex - 1);
     } else {
       line1 = pImage->getPixel(1, m_loopIndex - 2);
       line1 |= pImage->getPixel(0, m_loopIndex - 2) << 1;
       line2 = pImage->getPixel(2, m_loopIndex - 1);
       line2 |= pImage->getPixel(1, m_loopIndex - 1) << 1;
       line2 |= pImage->getPixel(0, m_loopIndex - 1) << 2;
       line3 = 0;
       for (uint32_t w = 0; w < GBW; w++) {
         if (USESKIP && SKIP->getPixel(w, m_loopIndex)) {
@@ skipping 42 matching lines @@
   if (!m_pLine) {
     m_pLine = pImage->m_pData;
   }
   nStride = pImage->m_nStride;
   nStride2 = nStride << 1;
   nLineBytes = ((GBW + 7) >> 3) - 1;
   nBitsLeft = GBW - (nLineBytes << 3);
   for (; m_loopIndex < GBH; m_loopIndex++) {
     if (TPGDON) {
       SLTP = pArithDecoder->DECODE(&gbContext[0x0795]);
-      LTP = LTP ^ SLTP;
+      m_LTP = m_LTP ^ SLTP;
     }
-    if (LTP == 1) {
+    if (m_LTP == 1) {
       pImage->copyLine(m_loopIndex, m_loopIndex - 1);
     } else {
       if (m_loopIndex > 1) {
         pLine1 = m_pLine - nStride2;
         pLine2 = m_pLine - nStride;
         line1 = (*pLine1++) << 4;
         line2 = *pLine2++;
         CONTEXT = (line1 & 0x1e00) | ((line2 >> 1) & 0x01f8);
         for (cc = 0; cc < nLineBytes; cc++) {
           line1 = (line1 << 8) | ((*pLine1++) << 4);
@@ skipping 61 matching lines @@
     CJBig2_Image* pImage,
     CJBig2_ArithDecoder* pArithDecoder,
     JBig2ArithCtx* gbContext,
     IFX_Pause* pPause) {
   FX_BOOL SLTP, bVal;
   uint32_t CONTEXT;
   uint32_t line1, line2, line3;
   for (uint32_t h = 0; h < GBH; h++) {
     if (TPGDON) {
       SLTP = pArithDecoder->DECODE(&gbContext[0x0795]);
-      LTP = LTP ^ SLTP;
+      m_LTP = m_LTP ^ SLTP;
     }
-    if (LTP == 1) {
+    if (m_LTP == 1) {
       pImage->copyLine(h, h - 1);
     } else {
       line1 = pImage->getPixel(2, h - 2);
       line1 |= pImage->getPixel(1, h - 2) << 1;
       line1 |= pImage->getPixel(0, h - 2) << 2;
       line2 = pImage->getPixel(2, h - 1);
       line2 |= pImage->getPixel(1, h - 1) << 1;
       line2 |= pImage->getPixel(0, h - 1) << 2;
       line3 = 0;
       for (uint32_t w = 0; w < GBW; w++) {
@@ skipping 38 matching lines @@
   if (!m_pLine) {
     m_pLine = pImage->m_pData;
   }
   nStride = pImage->m_nStride;
   nStride2 = nStride << 1;
   nLineBytes = ((GBW + 7) >> 3) - 1;
   nBitsLeft = GBW - (nLineBytes << 3);
   for (; m_loopIndex < GBH; m_loopIndex++) {
     if (TPGDON) {
       SLTP = pArithDecoder->DECODE(&gbContext[0x00e5]);
-      LTP = LTP ^ SLTP;
+      m_LTP = m_LTP ^ SLTP;
     }
-    if (LTP == 1) {
+    if (m_LTP == 1) {
       pImage->copyLine(m_loopIndex, m_loopIndex - 1);
     } else {
       if (m_loopIndex > 1) {
         pLine1 = m_pLine - nStride2;
         pLine2 = m_pLine - nStride;
         line1 = (*pLine1++) << 1;
         line2 = *pLine2++;
         CONTEXT = (line1 & 0x0380) | ((line2 >> 3) & 0x007c);
         for (cc = 0; cc < nLineBytes; cc++) {
           line1 = (line1 << 8) | ((*pLine1++) << 1);
@@ skipping 61 matching lines @@
     CJBig2_Image* pImage,
     CJBig2_ArithDecoder* pArithDecoder,
     JBig2ArithCtx* gbContext,
     IFX_Pause* pPause) {
   FX_BOOL SLTP, bVal;
   uint32_t CONTEXT;
   uint32_t line1, line2, line3;
   for (; m_loopIndex < GBH; m_loopIndex++) {
     if (TPGDON) {
       SLTP = pArithDecoder->DECODE(&gbContext[0x00e5]);
-      LTP = LTP ^ SLTP;
+      m_LTP = m_LTP ^ SLTP;
     }
-    if (LTP == 1) {
+    if (m_LTP == 1) {
       pImage->copyLine(m_loopIndex, m_loopIndex - 1);
     } else {
       line1 = pImage->getPixel(1, m_loopIndex - 2);
       line1 |= pImage->getPixel(0, m_loopIndex - 2) << 1;
       line2 = pImage->getPixel(1, m_loopIndex - 1);
       line2 |= pImage->getPixel(0, m_loopIndex - 1) << 1;
       line3 = 0;
       for (uint32_t w = 0; w < GBW; w++) {
         if (USESKIP && SKIP->getPixel(w, m_loopIndex)) {
           bVal = 0;
@@ skipping 37 matching lines @@
   int32_t nLineBytes, nBitsLeft, cc;
   if (!m_pLine) {
     m_pLine = pImage->m_pData;
   }
   nStride = pImage->m_nStride;
   nLineBytes = ((GBW + 7) >> 3) - 1;
   nBitsLeft = GBW - (nLineBytes << 3);
   for (; m_loopIndex < GBH; m_loopIndex++) {
     if (TPGDON) {
       SLTP = pArithDecoder->DECODE(&gbContext[0x0195]);
-      LTP = LTP ^ SLTP;
+      m_LTP = m_LTP ^ SLTP;
     }
-    if (LTP == 1) {
+    if (m_LTP == 1) {
       pImage->copyLine(m_loopIndex, m_loopIndex - 1);
     } else {
       if (m_loopIndex > 0) {
         pLine1 = m_pLine - nStride;
         line1 = *pLine1++;
         CONTEXT = (line1 >> 1) & 0x03f0;
         for (cc = 0; cc < nLineBytes; cc++) {
           line1 = (line1 << 8) | (*pLine1++);
           cVal = 0;
           for (k = 7; k >= 0; k--) {
@@ skipping 48 matching lines @@
     CJBig2_Image* pImage,
     CJBig2_ArithDecoder* pArithDecoder,
     JBig2ArithCtx* gbContext,
     IFX_Pause* pPause) {
   FX_BOOL SLTP, bVal;
   uint32_t CONTEXT;
   uint32_t line1, line2;
   for (; m_loopIndex < GBH; m_loopIndex++) {
     if (TPGDON) {
       SLTP = pArithDecoder->DECODE(&gbContext[0x0195]);
-      LTP = LTP ^ SLTP;
+      m_LTP = m_LTP ^ SLTP;
     }
-    if (LTP == 1) {
+    if (m_LTP == 1) {
       pImage->copyLine(m_loopIndex, m_loopIndex - 1);
     } else {
       line1 = pImage->getPixel(1, m_loopIndex - 1);
       line1 |= pImage->getPixel(0, m_loopIndex - 1) << 1;
       line2 = 0;
       for (uint32_t w = 0; w < GBW; w++) {
         if (USESKIP && SKIP->getPixel(w, m_loopIndex)) {
           bVal = 0;
         } else {
           CONTEXT = line2;
@@ skipping 11 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;
 }