Merge to XFA: Switch most min/max macros to std::min/max.

xfa/src/fxbarcode/oned/BC_OneDReader.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 2008 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 <algorithm>
+
 #include "xfa/src/fxbarcode/barcode.h"
 #include "xfa/src/fxbarcode/BC_Reader.h"
 #include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
 #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
 #include "BC_OneDReader.h"
 const int32_t CBC_OneDReader::INTEGER_MATH_SHIFT = 8;
 const int32_t CBC_OneDReader::PATTERN_MATCH_RESULT_SCALE_FACTOR = 1 << 8;
 CBC_OneDReader::CBC_OneDReader() {}
 CBC_OneDReader::~CBC_OneDReader() {}
 CFX_ByteString CBC_OneDReader::Decode(CBC_BinaryBitmap* image, int32_t& e) {
   CFX_ByteString strtemp = Decode(image, 0, e);
   BC_EXCEPTION_CHECK_ReturnValue(e, "");
   return strtemp;
 }
 CFX_ByteString CBC_OneDReader::Decode(CBC_BinaryBitmap* image,
                                       int32_t hints,
                                       int32_t& e) {
   CFX_ByteString strtemp = DeDecode(image, hints, e);
   BC_EXCEPTION_CHECK_ReturnValue(e, "");
   return strtemp;
 }
 CFX_ByteString CBC_OneDReader::DeDecode(CBC_BinaryBitmap* image,
                                         int32_t hints,
                                         int32_t& e) {
   int32_t height = image->GetHeight();
   CBC_CommonBitArray* row = NULL;
   int32_t middle = height >> 1;
   FX_BOOL tryHarder = FALSE;
-  int32_t rowStep = FX_MAX(1, height >> (tryHarder ? 8 : 5));
+  int32_t rowStep = std::max(1, height >> (tryHarder ? 8 : 5));
   int32_t maxLines;
   if (tryHarder) {
     maxLines = height;
   } else {
     maxLines = 15;
   }
   for (int32_t x = 0; x < maxLines; x++) {
     int32_t rowStepsAboveOrBelow = (x + 1) >> 1;
     FX_BOOL isAbove = (x & 0x01) == 0;
     int32_t rowNumber =
@@ skipping 114 matching lines @@
     int32_t variance = counter > scaledPattern ? counter - scaledPattern
                                                : scaledPattern - counter;
     if (variance > maxIndividualVariance) {
 #undef max
       return FXSYS_IntMax;
     }
     totalVariance += variance;
   }
   return totalVariance / total;
 }