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

xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.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_ResultPoint.h"
 #include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h"
 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h"
 #include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h"
 #include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h"
 #include "BC_DataMatrixDetector.h"
 const int32_t CBC_DataMatrixDetector::INTEGERS[5] = {0, 1, 2, 3, 4};
 CBC_DataMatrixDetector::CBC_DataMatrixDetector(CBC_CommonBitMatrix* image)
@@ skipping 126 matching lines @@
       dimensionTop++;
     }
     if ((dimensionRight & 0x01) == 1) {
       dimensionRight++;
     }
     bits = CBC_AutoPtr<CBC_CommonBitMatrix>(
         SampleGrid(m_image, topLeft, bottomLeft, bottomRight,
                    correctedTopRight.get(), dimensionTop, dimensionRight, e));
     BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
   } else {
-    int32_t dimension = FX_MIN(dimensionRight, dimensionTop);
+    int32_t dimension = std::min(dimensionRight, dimensionTop);
     correctedTopRight = CBC_AutoPtr<CBC_ResultPoint>(
         CorrectTopRight(bottomLeft, bottomRight, topLeft, topRight, dimension));
     if (correctedTopRight.get() == NULL) {
       correctedTopRight = CBC_AutoPtr<CBC_ResultPoint>(topRight);
     } else {
       delete topRight;
       topRight = NULL;
     }
     int32_t dimensionCorrected =
-        FX_MAX(CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
-                   TransitionsBetween(topLeft, correctedTopRight.get()))
-                   ->GetTransitions(),
-               CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
-                   TransitionsBetween(bottomRight, correctedTopRight.get()))
-                   ->GetTransitions());
+        std::max(CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+                     TransitionsBetween(topLeft, correctedTopRight.get()))
+                     ->GetTransitions(),
+                 CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+                     TransitionsBetween(bottomRight, correctedTopRight.get()))
+                     ->GetTransitions());
     dimensionCorrected++;
     if ((dimensionCorrected & 0x01) == 1) {
       dimensionCorrected++;
     }
     bits = CBC_AutoPtr<CBC_CommonBitMatrix>(SampleGrid(
         m_image, topLeft, bottomLeft, bottomRight, correctedTopRight.get(),
         dimensionCorrected, dimensionCorrected, e));
     BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
   }
   CFX_PtrArray* result = new CFX_PtrArray;
@@ skipping 200 matching lines @@
       (bottomLeft->GetX() - topLeft->GetX()) *
           (topRight->GetY() - topLeft->GetY())) {
     CBC_ResultPoint* temp = topRight;
     topRight = bottomLeft;
     bottomLeft = temp;
   }
   (*patterns)[0] = bottomLeft;
   (*patterns)[1] = topLeft;
   (*patterns)[2] = topRight;
 }