Fix more code which has shadow variables

core/fxcodec/jbig2/JBig2_GrrdProc.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_GrrdProc.h"
 
 #include <memory>
 
@@ skipping 141 matching lines @@
   if (!GRREFERENCE->m_pData)
     return nullptr;
 
   FX_BOOL LTP, SLTP, bVal;
   uint32_t CONTEXT;
   uint32_t line1, line1_r, line2_r, line3_r;
   uint8_t *pLine, *pLineR, cVal;
   intptr_t nStride, nStrideR, nOffset;
   int32_t k, nBits;
   int32_t GRWR, GRHR;
-  int32_t GRW, GRH;
-  GRW = (int32_t)CJBig2_GRRDProc::GRW;
-  GRH = (int32_t)CJBig2_GRRDProc::GRH;
+  int32_t iGRW, iGRH;

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

nit: one per line

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

Done.

+  iGRW = static_cast<int32_t>(GRW);
+  iGRH = static_cast<int32_t>(GRH);
   LTP = 0;
-  std::unique_ptr<CJBig2_Image> GRREG(new CJBig2_Image(GRW, GRH));
+  std::unique_ptr<CJBig2_Image> GRREG(new CJBig2_Image(iGRW, iGRH));
   if (!GRREG->m_pData)
     return nullptr;
 
   pLine = GRREG->m_pData;
   pLineR = GRREFERENCE->m_pData;
   nStride = GRREG->m_nStride;
   nStrideR = GRREFERENCE->m_nStride;
   GRWR = (int32_t)GRREFERENCE->m_nWidth;
   GRHR = (int32_t)GRREFERENCE->m_nHeight;
   if (GRREFERENCEDY < -GRHR + 1 || GRREFERENCEDY > GRHR - 1) {
     GRREFERENCEDY = 0;
   }
   nOffset = -GRREFERENCEDY * nStrideR;
-  for (int32_t h = 0; h < GRH; h++) {
+  for (int32_t h = 0; h < iGRH; h++) {
     if (TPGRON) {
       SLTP = pArithDecoder->DECODE(&grContext[0x0010]);
       LTP = LTP ^ SLTP;
     }
     line1 = (h > 0) ? pLine[-nStride] << 4 : 0;
     int32_t reference_h = h - GRREFERENCEDY;
     FX_BOOL line1_r_ok = (reference_h > 0 && reference_h < GRHR + 1);
     FX_BOOL line2_r_ok = (reference_h > -1 && reference_h < GRHR);
     FX_BOOL line3_r_ok = (reference_h > -2 && reference_h < GRHR - 1);
     line1_r = line1_r_ok ? pLineR[nOffset - nStrideR] : 0;
     line2_r = line2_r_ok ? pLineR[nOffset] : 0;
     line3_r = line3_r_ok ? pLineR[nOffset + nStrideR] : 0;
     if (LTP == 0) {
       CONTEXT = (line1 & 0x1c00) | (line1_r & 0x01c0) |
                 ((line2_r >> 3) & 0x0038) | ((line3_r >> 6) & 0x0007);
-      for (int32_t w = 0; w < GRW; w += 8) {
-        nBits = GRW - w > 8 ? 8 : GRW - w;
+      for (int32_t w = 0; w < iGRW; w += 8) {
+        nBits = iGRW - w > 8 ? 8 : iGRW - w;
         if (h > 0)
           line1 = (line1 << 8) |
-                  (w + 8 < GRW ? pLine[-nStride + (w >> 3) + 1] << 4 : 0);
+                  (w + 8 < iGRW ? pLine[-nStride + (w >> 3) + 1] << 4 : 0);
         if (h > GRHR + GRREFERENCEDY + 1) {
           line1_r = 0;
           line2_r = 0;
           line3_r = 0;
         } else {
           if (line1_r_ok)
             line1_r =
                 (line1_r << 8) |
                 (w + 8 < GRWR ? pLineR[nOffset - nStrideR + (w >> 3) + 1] : 0);
           if (line2_r_ok)
@@ skipping 15 matching lines @@
                     ((line1 >> (7 - k)) & 0x0400) |
                     ((line1_r >> (7 - k)) & 0x0040) |
                     ((line2_r >> (10 - k)) & 0x0008) |
                     ((line3_r >> (13 - k)) & 0x0001);
         }
         pLine[w >> 3] = cVal;
       }
     } else {
       CONTEXT = (line1 & 0x1c00) | (line1_r & 0x01c0) |
                 ((line2_r >> 3) & 0x0038) | ((line3_r >> 6) & 0x0007);
-      for (int32_t w = 0; w < GRW; w += 8) {
-        nBits = GRW - w > 8 ? 8 : GRW - w;
+      for (int32_t w = 0; w < iGRW; w += 8) {
+        nBits = iGRW - w > 8 ? 8 : iGRW - w;
         if (h > 0)
           line1 = (line1 << 8) |
-                  (w + 8 < GRW ? pLine[-nStride + (w >> 3) + 1] << 4 : 0);
+                  (w + 8 < iGRW ? pLine[-nStride + (w >> 3) + 1] << 4 : 0);
         if (line1_r_ok)
           line1_r =
               (line1_r << 8) |
               (w + 8 < GRWR ? pLineR[nOffset - nStrideR + (w >> 3) + 1] : 0);
         if (line2_r_ok)
           line2_r = (line2_r << 8) |
                     (w + 8 < GRWR ? pLineR[nOffset + (w >> 3) + 1] : 0);
         if (line3_r_ok) {
           line3_r =
               (line3_r << 8) |
@@ skipping 138 matching lines @@
     JBig2ArithCtx* grContext) {
   if (!GRREFERENCE->m_pData)
     return nullptr;
 
   FX_BOOL LTP, SLTP, bVal;
   uint32_t CONTEXT;
   uint32_t line1, line1_r, line2_r, line3_r;
   uint8_t *pLine, *pLineR, cVal;
   intptr_t nStride, nStrideR, nOffset;
   int32_t k, nBits;
   int32_t GRWR, GRHR;

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

nit: move to line 412 while at it.

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

Done.

-  int32_t GRW, GRH;
-  GRW = (int32_t)CJBig2_GRRDProc::GRW;
-  GRH = (int32_t)CJBig2_GRRDProc::GRH;
+  int32_t iGRW, iGRH;

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

ditto

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

Also combine definition and initialization onto one line.

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

Done.

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

Done.

+  iGRW = static_cast<int32_t>(GRW);
+  iGRH = static_cast<int32_t>(GRH);
   LTP = 0;
-  std::unique_ptr<CJBig2_Image> GRREG(new CJBig2_Image(GRW, GRH));
+  std::unique_ptr<CJBig2_Image> GRREG(new CJBig2_Image(iGRW, iGRH));
   if (!GRREG->m_pData)
     return nullptr;
 
   pLine = GRREG->m_pData;
   pLineR = GRREFERENCE->m_pData;
   nStride = GRREG->m_nStride;
   nStrideR = GRREFERENCE->m_nStride;
   GRWR = (int32_t)GRREFERENCE->m_nWidth;
   GRHR = (int32_t)GRREFERENCE->m_nHeight;
   if (GRREFERENCEDY < -GRHR + 1 || GRREFERENCEDY > GRHR - 1) {
     GRREFERENCEDY = 0;
   }
   nOffset = -GRREFERENCEDY * nStrideR;
-  for (int32_t h = 0; h < GRH; h++) {
+  for (int32_t h = 0; h < iGRH; h++) {
     if (TPGRON) {
       SLTP = pArithDecoder->DECODE(&grContext[0x0008]);
       LTP = LTP ^ SLTP;
     }
     line1 = (h > 0) ? pLine[-nStride] << 1 : 0;
     int32_t reference_h = h - GRREFERENCEDY;
     FX_BOOL line1_r_ok = (reference_h > 0 && reference_h < GRHR + 1);
     FX_BOOL line2_r_ok = (reference_h > -1 && reference_h < GRHR);
     FX_BOOL line3_r_ok = (reference_h > -2 && reference_h < GRHR - 1);
     line1_r = line1_r_ok ? pLineR[nOffset - nStrideR] : 0;
     line2_r = line2_r_ok ? pLineR[nOffset] : 0;
     line3_r = line3_r_ok ? pLineR[nOffset + nStrideR] : 0;
     if (LTP == 0) {
       CONTEXT = (line1 & 0x0380) | ((line1_r >> 2) & 0x0020) |
                 ((line2_r >> 4) & 0x001c) | ((line3_r >> 6) & 0x0003);
-      for (int32_t w = 0; w < GRW; w += 8) {
-        nBits = GRW - w > 8 ? 8 : GRW - w;
+      for (int32_t w = 0; w < iGRW; w += 8) {
+        nBits = iGRW - w > 8 ? 8 : iGRW - w;
         if (h > 0)
           line1 = (line1 << 8) |
-                  (w + 8 < GRW ? pLine[-nStride + (w >> 3) + 1] << 1 : 0);
+                  (w + 8 < iGRW ? pLine[-nStride + (w >> 3) + 1] << 1 : 0);
         if (line1_r_ok)
           line1_r =
               (line1_r << 8) |
               (w + 8 < GRWR ? pLineR[nOffset - nStrideR + (w >> 3) + 1] : 0);
         if (line2_r_ok)
           line2_r = (line2_r << 8) |
                     (w + 8 < GRWR ? pLineR[nOffset + (w >> 3) + 1] : 0);
         if (line3_r_ok) {
           line3_r =
               (line3_r << 8) |
               (w + 8 < GRWR ? pLineR[nOffset + nStrideR + (w >> 3) + 1] : 0);
         } else {
           line3_r = 0;
         }
         cVal = 0;
         for (k = 0; k < nBits; k++) {
           bVal = pArithDecoder->DECODE(&grContext[CONTEXT]);
           cVal |= bVal << (7 - k);
           CONTEXT = ((CONTEXT & 0x018d) << 1) | (bVal << 6) |
                     ((line1 >> (7 - k)) & 0x0080) |
                     ((line1_r >> (9 - k)) & 0x0020) |
                     ((line2_r >> (11 - k)) & 0x0004) |
                     ((line3_r >> (13 - k)) & 0x0001);
         }
         pLine[w >> 3] = cVal;
       }
     } else {
       CONTEXT = (line1 & 0x0380) | ((line1_r >> 2) & 0x0020) |
                 ((line2_r >> 4) & 0x001c) | ((line3_r >> 6) & 0x0003);
-      for (int32_t w = 0; w < GRW; w += 8) {
-        nBits = GRW - w > 8 ? 8 : GRW - w;
+      for (int32_t w = 0; w < iGRW; w += 8) {
+        nBits = iGRW - w > 8 ? 8 : iGRW - w;
         if (h > 0)
           line1 = (line1 << 8) |
-                  (w + 8 < GRW ? pLine[-nStride + (w >> 3) + 1] << 1 : 0);
+                  (w + 8 < iGRW ? pLine[-nStride + (w >> 3) + 1] << 1 : 0);
         if (line1_r_ok)
           line1_r =
               (line1_r << 8) |
               (w + 8 < GRWR ? pLineR[nOffset - nStrideR + (w >> 3) + 1] : 0);
         if (line2_r_ok)
           line2_r = (line2_r << 8) |
                     (w + 8 < GRWR ? pLineR[nOffset + (w >> 3) + 1] : 0);
         if (line3_r_ok) {
           line3_r =
               (line3_r << 8) |
@@ skipping 24 matching lines @@
         pLine[w >> 3] = cVal;
       }
     }
     pLine += nStride;
     if (h < GRHR + GRREFERENCEDY) {
       pLineR += nStrideR;
     }
   }
   return GRREG.release();
 }