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

xfa/src/fxbarcode/oned/BC_OneDReader.cpp

Index: xfa/src/fxbarcode/oned/BC_OneDReader.cpp
diff --git a/xfa/src/fxbarcode/oned/BC_OneDReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp
index 61448d21e7398d0bb5967a5fc49789f655d3d7ae..b89f76423e465e411a1ce09081477cbbc9e9884b 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp
@@ -20,6 +20,8 @@
  * 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"
@@ -48,7 +50,7 @@ CFX_ByteString CBC_OneDReader::DeDecode(CBC_BinaryBitmap* image,
   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;