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

xfa/src/fxbarcode/qrcode/BC_QRDetector.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 2007 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/common/BC_CommonBitMatrix.h"
 #include "xfa/src/fxbarcode/BC_ResultPoint.h"
 #include "BC_QRFinderPattern.h"
 #include "BC_QRCoderVersion.h"
 #include "BC_FinderPatternInfo.h"
 #include "BC_QRGridSampler.h"
 #include "BC_QRAlignmentPatternFinder.h"
 #include "BC_QRFinderPatternFinder.h"
 #include "BC_QRDetectorResult.h"
@@ skipping 215 matching lines @@
   int32_t diffY = toY - fromY;
   return (FX_FLOAT)sqrt((double)(diffX * diffX + diffY * diffY));
 }
 CBC_QRAlignmentPattern* CBC_QRDetector::FindAlignmentInRegion(
     FX_FLOAT overallEstModuleSize,
     int32_t estAlignmentX,
     int32_t estAlignmentY,
     FX_FLOAT allowanceFactor,
     int32_t& e) {
   int32_t allowance = (int32_t)(allowanceFactor * overallEstModuleSize);
-  int32_t alignmentAreaLeftX = FX_MAX(0, estAlignmentX - allowance);
+  int32_t alignmentAreaLeftX = std::max(0, estAlignmentX - allowance);
   int32_t alignmentAreaRightX =
-      FX_MIN(m_image->GetWidth() - 1, estAlignmentX + allowance);
+      std::min(m_image->GetWidth() - 1, estAlignmentX + allowance);
   if (alignmentAreaRightX - alignmentAreaLeftX < overallEstModuleSize * 3) {
     e = BCExceptionRead;
     BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
   }
-  int32_t alignmentAreaTopY = FX_MAX(0, estAlignmentY - allowance);
+  int32_t alignmentAreaTopY = std::max(0, estAlignmentY - allowance);
   int32_t alignmentAreaBottomY =
-      FX_MIN(m_image->GetHeight() - 1, estAlignmentY + allowance);
+      std::min(m_image->GetHeight() - 1, estAlignmentY + allowance);
   CBC_QRAlignmentPatternFinder alignmentFinder(
       m_image, alignmentAreaLeftX, alignmentAreaTopY,
       alignmentAreaRightX - alignmentAreaLeftX,
       alignmentAreaBottomY - alignmentAreaTopY, overallEstModuleSize);
   CBC_QRAlignmentPattern* qap = alignmentFinder.Find(e);
   BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
   return qap;
 }