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

xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp

Index: xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp
index 601baa2a4c562f996fd1e28a784ace4668504b46..cbc7a5a85950e6612b19acf0d2e3b139f8273317 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.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/common/BC_CommonBitArray.h"
@@ -115,7 +117,7 @@ CFX_Int32Array* CBC_OnedCode128Reader::FindStartPattern(CBC_CommonBitArray* row,
         }
         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) {
@@ -338,8 +340,8 @@ CFX_ByteString CBC_OnedCode128Reader::DecodeRow(int32_t rowNumber,
     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;