Reduce signed/unsigned comparison warnings

core/fxcodec/jbig2/JBig2_Context.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 "core/fxcodec/jbig2/JBig2_Context.h"
 
 #include <algorithm>
 #include <list>
@@ skipping 1259 matching lines @@
   }
   return JBIG2_SUCCESS;
 }
 
 JBig2HuffmanCode* CJBig2_Context::decodeSymbolIDHuffmanTable(
     CJBig2_BitStream* pStream,
     FX_DWORD SBNUMSYMS) {
   const size_t kRunCodesSize = 35;
   int32_t runcodes[kRunCodesSize];
   int32_t runcodes_len[kRunCodesSize];
-  for (int32_t i = 0; i < kRunCodesSize; ++i) {
+  for (size_t i = 0; i < kRunCodesSize; ++i) {
     if (pStream->readNBits(4, &runcodes_len[i]) != 0)
       return nullptr;
   }
   huffman_assign_code(runcodes, runcodes_len, kRunCodesSize);
 
   std::unique_ptr<JBig2HuffmanCode, FxFreeDeleter> SBSYMCODES(
       FX_Alloc(JBig2HuffmanCode, SBNUMSYMS));
   int32_t run;
   int32_t i = 0;
   while (i < (int)SBNUMSYMS) {
-    int32_t j;
+    size_t j;
     int32_t nVal = 0;
     int32_t nBits = 0;
     FX_DWORD nTemp;
     while (true) {
       if (pStream->read1Bit(&nTemp) != 0)
         return nullptr;
 
       nVal = (nVal << 1) | nTemp;
       ++nBits;
       for (j = 0; j < kRunCodesSize; ++j) {
         if (nBits == runcodes_len[j] && nVal == runcodes[j]) {

[Tom Sepez, 2016/03/25 22:31:40]

nit: no inner {}

[Wei Li, 2016/03/26 01:04:10]

Done.

           break;
         }
       }
       if (j < kRunCodesSize) {

[Tom Sepez, 2016/03/25 22:31:40]

nit: no {} needed.

[Wei Li, 2016/03/26 01:04:10]

Done.

         break;
       }
     }
     int32_t runcode = j;

[Tom Sepez, 2016/03/25 22:31:40]

This may require a cast to avoid a truncation warning?

[Wei Li, 2016/03/26 01:04:10]

Done.

     if (runcode < 32) {
       SBSYMCODES.get()[i].codelen = runcode;
       run = 0;
     } else if (runcode == 32) {
       if (pStream->readNBits(2, &nTemp) != 0)
         return nullptr;
       run = nTemp + 3;
     } else if (runcode == 33) {
       if (pStream->readNBits(3, &nTemp) != 0)
         return nullptr;
       run = nTemp + 3;
     } else if (runcode == 34) {
       if (pStream->readNBits(7, &nTemp) != 0)
         return nullptr;
       run = nTemp + 11;
     }
     if (run > 0) {
       if (i + run > (int)SBNUMSYMS)
         return nullptr;
-      for (j = 0; j < run; ++j) {
+      for (int32_t k = 0; k < run; ++k) {
         if (runcode == 32 && i > 0) {
-          SBSYMCODES.get()[i + j].codelen = SBSYMCODES.get()[i - 1].codelen;
+          SBSYMCODES.get()[i + k].codelen = SBSYMCODES.get()[i - 1].codelen;
         } else {
-          SBSYMCODES.get()[i + j].codelen = 0;
+          SBSYMCODES.get()[i + k].codelen = 0;
         }
       }
       i += run;
     } else {
       ++i;
     }
   }
   huffman_assign_code(SBSYMCODES.get(), SBNUMSYMS);
   return SBSYMCODES.release();
 }
@@ skipping 63 matching lines @@
         SBSYMCODES[CURTEMP].code = CURCODE;
         CURCODE = CURCODE + 1;
       }
       CURTEMP = CURTEMP + 1;
     }
     CURLEN = CURLEN + 1;
   }
   FX_Free(LENCOUNT);
   FX_Free(FIRSTCODE);
 }