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

xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.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/common/BC_CommonBitArray.h"
 #include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
 #include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h"
 #include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h"
 const FX_CHAR* CBC_OnedCodaBarReader::ALPHABET_STRING =
     "0123456789-$:/.+ABCDTN";
 const int32_t CBC_OnedCodaBarReader::CHARACTER_ENCODINGS[22] = {
     0x003, 0x006, 0x009, 0x060, 0x012, 0x042, 0x021, 0x024,
@@ skipping 100 matching lines @@
   FX_BOOL isWhite = FALSE;
   int32_t patternLength = counters.GetSize();
   for (int32_t i = rowOffset; i < width; i++) {
     FX_BOOL pixel = row->Get(i);
     if (pixel ^ isWhite) {
       counters[counterPosition]++;
     } else {
       if (counterPosition == patternLength - 1) {
         if (ArrayContains(STARTEND_ENCODING, ToNarrowWidePattern(&counters))) {
           FX_BOOL btemp3 =
-              row->IsRange(FX_MAX(0, patternStart - (i - patternStart) / 2),
+              row->IsRange(std::max(0, patternStart - (i - patternStart) / 2),
                            patternStart, FALSE, e);
           BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
           if (btemp3) {
             CFX_Int32Array* result = new CFX_Int32Array();
             result->SetSize(2);
             (*result)[0] = patternStart;
             (*result)[1] = i;
             return result;
           }
         }
@@ skipping 44 matching lines @@
   }
   if ((wideCounters == 2) || (wideCounters == 3)) {
     for (int32_t k = 0; k < 22; k++) {
       if (CHARACTER_ENCODINGS[k] == pattern) {
         return (ALPHABET_STRING)[k];
       }
     }
   }
   return '!';
 }