Continue fixing FX_BOOL / int noise

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 12 matching lines @@
 #include "core/fxcodec/jbig2/JBig2_SddProc.h"
 #include "core/fxcodec/jbig2/JBig2_TrdProc.h"
 #include "third_party/base/stl_util.h"
 
 namespace {
 
 size_t GetHuffContextSize(uint8_t val) {
   return val == 0 ? 65536 : val == 1 ? 8192 : 1024;
 }
 
-size_t GetRefAggContextSize(FX_BOOL val) {
-  return val ? 1024 : 8192;
+size_t GetRefAggContextSize(int bVal) {

[Lei Zhang, 2016/10/28 18:00:52]

Why can't this be a bool?

[Tom Sepez, 2016/10/28 18:04:44]

It's only called with things that are ints, so we'd be sticking a bunch of !!s
in several places.  Would you prefer that?

[Lei Zhang, 2016/10/28 18:09:50]

All those ints can be converted to bools: GRTEMPLATE, SBRTEMPLATE, and
SDRTEMPLATE. Want to leave this one alone and do a separate CL?

+  return bVal ? 1024 : 8192;
 }
 
 }  // namespace
 
 // Implement a very small least recently used (LRU) cache. It is very
 // common for a JBIG2 dictionary to span multiple pages in a PDF file,
 // and we do not want to decode the same dictionary over and over
 // again. We key off of the memory location of the dictionary. The
 // list keeps track of the freshness of entries, with freshest ones
 // at the front. Even a tiny cache size like 2 makes a dramatic
@@ skipping 1342 matching lines @@
         SBSYMCODES[CURTEMP].code = CURCODE;
         CURCODE = CURCODE + 1;
       }
       CURTEMP = CURTEMP + 1;
     }
     CURLEN = CURLEN + 1;
   }
   FX_Free(LENCOUNT);
   FX_Free(FIRSTCODE);
 }