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

xfa/src/fxbarcode/oned/BC_OneDimWriter.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 2011 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 "BC_OneDimWriter.h"
 
+#include <algorithm>
 #include <memory>
 
 #include "xfa/src/fxbarcode/BC_Writer.h"
 #include "xfa/src/fxbarcode/barcode.h"
 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 
 CBC_OneDimWriter::CBC_OneDimWriter() {
   m_locTextLoc = BC_TEXT_LOC_BELOWEMBED;
   m_bPrintChecksum = TRUE;
   m_iDataLenth = 0;
@@ skipping 349 matching lines @@
   if (m_bRightPadding) {
     rightPadding = 7;
   }
   codeLength += leftPadding;
   codeLength += rightPadding;
   m_outputHScale = 1.0;
   if (m_Width > 0) {
     m_outputHScale = (FX_FLOAT)m_Width / (FX_FLOAT)codeLength;
   }
   if (!isDevice) {
-    m_outputHScale = FX_MAX(m_outputHScale, m_ModuleWidth);
+    m_outputHScale =
+        std::max(m_outputHScale, static_cast<FX_FLOAT>(m_ModuleWidth));
   }
   FX_FLOAT dataLengthScale = 1.0;
   if (m_iDataLenth > 0 && contents.GetLength() != 0) {
     dataLengthScale = FX_FLOAT(contents.GetLength()) / FX_FLOAT(m_iDataLenth);
   }
   if (m_iDataLenth > 0 && contents.GetLength() == 0) {
     dataLengthScale = FX_FLOAT(1) / FX_FLOAT(m_iDataLenth);
   }
   m_multiple = 1;
   if (!isDevice) {
     m_multiple = (int32_t)ceil(m_outputHScale * dataLengthScale);
   }
   int32_t outputHeight = 1;
   if (!isDevice) {
     if (m_Height == 0) {
-      outputHeight = FX_MAX(20, m_ModuleHeight);
+      outputHeight = std::max(20, m_ModuleHeight);
     } else {
       outputHeight = m_Height;
     }
   }
   int32_t outputWidth = codeLength;
   if (!isDevice) {
     outputWidth = (int32_t)(codeLength * m_multiple / dataLengthScale);
   }
   m_barWidth = m_Width;
   if (!isDevice) {
@@ skipping 10 matching lines @@
       if (outputX + m_multiple > outputWidth && outputWidth - outputX > 0) {
         m_output->SetRegion(outputX, 0, outputWidth - outputX, outputHeight, e);
         break;
       }
       m_output->SetRegion(outputX, 0, m_multiple, outputHeight, e);
       BC_EXCEPTION_CHECK_ReturnVoid(e);
     }
     outputX += m_multiple;
   }
 }