Remove include only barcode.h and IWYU.

xfa/src/fxbarcode/pdf417/BC_PDF417Detector.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
 // Original code is licensed as follows:
 /*
  * Copyright 2009 ZXing authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
 #include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "xfa/src/fxbarcode/barcode.h"
 #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h"
 #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
-#define INTERGER_MAX 2147483647
+#include "xfa/src/fxbarcode/utils.h"
+
+#define INTEGER_MAX 2147483647

[Lei Zhang, 2016/02/24 20:37:59]

Delete and use INT_MAX or std::numeric_limits<int32_t>::max() ?

Same in xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp

[dsinclair, 2016/02/24 20:39:21]

There are 3 of them, will do in a followup, just wanted to rename so I could
find it later.

+
 int32_t CBC_Detector::INDEXES_START_PATTERN[] = {0, 4, 1, 5};
 int32_t CBC_Detector::INDEXES_STOP_PATTERN[] = {6, 2, 7, 3};
 int32_t CBC_Detector::INTEGER_MATH_SHIFT = 8;
 int32_t CBC_Detector::PATTERN_MATCH_RESULT_SCALE_FACTOR = 1
                                                           << INTEGER_MATH_SHIFT;
 int32_t CBC_Detector::MAX_AVG_VARIANCE =
     (int32_t)(PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.42f);
 int32_t CBC_Detector::MAX_INDIVIDUAL_VARIANCE =
     (int32_t)(PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.8f);
 int32_t CBC_Detector::START_PATTERN[] = {8, 1, 1, 1, 1, 1, 1, 3};
 int32_t CBC_Detector::STOP_PATTERN[] = {7, 1, 1, 3, 1, 1, 1, 2, 1};
 int32_t CBC_Detector::MAX_PIXEL_DRIFT = 3;
 int32_t CBC_Detector::MAX_PATTERN_DRIFT = 5;
 int32_t CBC_Detector::SKIPPED_ROW_COUNT_MAX = 25;
 int32_t CBC_Detector::ROW_STEP = 5;
 int32_t CBC_Detector::BARCODE_MIN_HEIGHT = 10;
+
 CBC_Detector::CBC_Detector() {}
 CBC_Detector::~CBC_Detector() {}
 CBC_PDF417DetectorResult* CBC_Detector::detect(CBC_BinaryBitmap* image,
                                                int32_t hints,
                                                FX_BOOL multiple,
                                                int32_t& e) {
   CBC_CommonBitMatrix* bitMatrix = image->GetBlackMatrix(e);
   BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
   CFX_PtrArray* barcodeCoordinates = detect(multiple, bitMatrix);
   if (barcodeCoordinates->GetSize() == 0) {
@@ skipping 266 matching lines @@
                                            int32_t* pattern,
                                            int32_t maxIndividualVariance) {
   int32_t numCounters = counters.GetSize();
   int32_t total = 0;
   int32_t patternLength = 0;
   for (int32_t i = 0; i < numCounters; i++) {
     total += counters[i];
     patternLength += pattern[i];
   }
   if (total < patternLength) {
-    return INTERGER_MAX;
+    return INTEGER_MAX;
   }
   int32_t unitBarWidth = (total << INTEGER_MATH_SHIFT) / patternLength;
   maxIndividualVariance =
       (maxIndividualVariance * unitBarWidth) >> INTEGER_MATH_SHIFT;
   int32_t totalVariance = 0;
   for (int32_t x = 0; x < numCounters; x++) {
     int32_t counter = counters[x] << INTEGER_MATH_SHIFT;
     int32_t scaledPattern = pattern[x] * unitBarWidth;
     int32_t variance = counter > scaledPattern ? counter - scaledPattern
                                                : scaledPattern - counter;
     if (variance > maxIndividualVariance) {
-      return INTERGER_MAX;
+      return INTEGER_MAX;
     }
     totalVariance += variance;
   }
   return totalVariance / total;
 }