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

xfa/src/fxbarcode/oned/BC_OnedCode128Reader.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 "BC_OneDReader.h"
 #include "BC_OnedCode128Reader.h"
 const int32_t CBC_OnedCode128Reader::CODE_PATTERNS[107][7] = {
     {2, 1, 2, 2, 2, 2, 0}, {2, 2, 2, 1, 2, 2, 0}, {2, 2, 2, 2, 2, 1, 0},
     {1, 2, 1, 2, 2, 3, 0}, {1, 2, 1, 3, 2, 2, 0}, {1, 3, 1, 2, 2, 2, 0},
     {1, 2, 2, 2, 1, 3, 0}, {1, 2, 2, 3, 1, 2, 0}, {1, 3, 2, 2, 1, 2, 0},
     {2, 2, 1, 2, 1, 3, 0}, {2, 2, 1, 3, 1, 2, 0}, {2, 3, 1, 2, 1, 2, 0},
@@ skipping 75 matching lines @@
              startCode++) {
           int32_t variance = PatternMatchVariance(
               &counters, &CODE_PATTERNS[startCode][0], MAX_INDIVIDUAL_VARIANCE);
           if (variance < bestVariance) {
             bestVariance = variance;
             bestMatch = startCode;
           }
         }
         if (bestMatch >= 0) {
           FX_BOOL btemp2 =
-              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 (btemp2) {
             CFX_Int32Array* result = new CFX_Int32Array;
             result->SetSize(3);
             (*result)[0] = patternStart;
             (*result)[1] = i;
             (*result)[2] = bestMatch;
             return result;
           }
@@ skipping 202 matching lines @@
     }
     if (unshift) {
       codeSet = codeSet == CODE_CODE_A ? CODE_CODE_B : CODE_CODE_A;
     }
   }
   int32_t width = row->GetSize();
   while (nextStart < width && row->Get(nextStart)) {
     nextStart++;
   }
   FX_BOOL boolT1 = row->IsRange(
-      nextStart, FX_MIN(width, nextStart + (nextStart - lastStart) / 2), FALSE,
-      e);
+      nextStart, std::min(width, nextStart + (nextStart - lastStart) / 2),
+      FALSE, e);
   BC_EXCEPTION_CHECK_ReturnValue(e, "");
   if (!boolT1) {
     e = BCExceptionNotFound;
     return "";
   }
   checksumTotal -= multiplier * lastCode;
   if (checksumTotal % 103 != lastCode) {
     e = BCExceptionChecksumException;
     return "";
   }
   int32_t resultLength = result.GetLength();
   if (resultLength > 0 && lastCharacterWasPrintable) {
     if (codeSet == CODE_CODE_C) {
       result = result.Mid(0, result.GetLength() - 2);
     } else {
       result = result.Mid(0, result.GetLength() - 1);
     }
   }
   if (result.GetLength() == 0) {
     e = BCExceptionFormatException;
     return "";
   }
   return result;
 }