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

xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.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_UtilCodingConvert.h"
 #include "xfa/src/fxbarcode/common/BC_CommonByteArray.h"
 #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
 #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h"
 #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
 #include "BC_QRCoder.h"
 #include "BC_QRCoderEncoder.h"
 #include "BC_QRCoderMode.h"
 #include "BC_QRCoderEncoder.h"
@@ skipping 836 matching lines @@
     int32_t numEcBytesInBlosk;
     GetNumDataBytesAndNumECBytesForBlockID(numTotalBytes, numDataBytes,
                                            numRSBlocks, i, numDataBytesInBlock,
                                            numEcBytesInBlosk);
     CBC_CommonByteArray* dataBytes = new CBC_CommonByteArray;
     dataBytes->Set(bits->GetArray(), dataBytesOffset, numDataBytesInBlock);
     CBC_CommonByteArray* ecBytes =
         GenerateECBytes(dataBytes, numEcBytesInBlosk, e);
     BC_EXCEPTION_CHECK_ReturnVoid(e);
     blocks.Add(new CBC_QRCoderBlockPair(dataBytes, ecBytes));
-    maxNumDataBytes = FX_MAX(maxNumDataBytes, dataBytes->Size());
-    maxNumEcBytes = FX_MAX(maxNumEcBytes, ecBytes->Size());
+    maxNumDataBytes = std::max(maxNumDataBytes, dataBytes->Size());
+    maxNumEcBytes = std::max(maxNumEcBytes, ecBytes->Size());
     dataBytesOffset += numDataBytesInBlock;
   }
   if (numDataBytes != dataBytesOffset) {
     e = BCExceptionBytesNotMatchOffset;
     BC_EXCEPTION_CHECK_ReturnVoid(e);
   }
   for (int32_t x = 0; x < maxNumDataBytes; x++) {
     for (int32_t j = 0; j < blocks.GetSize(); j++) {
       CBC_CommonByteArray* dataBytes =
           ((CBC_QRCoderBlockPair*)blocks[j])->GetDataBytes();
@@ skipping 60 matching lines @@
   CBC_ReedSolomonEncoder encode(CBC_ReedSolomonGF256::QRCodeFild);
   encode.Init();
   encode.Encode(&toEncode, numEcBytesInBlock, e);
   BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
   CBC_CommonByteArray* ecBytes = new CBC_CommonByteArray(numEcBytesInBlock);
   for (int32_t j = 0; j < numEcBytesInBlock; j++) {
     ecBytes->Set(j, toEncode[numDataBytes + j]);
   }
   return ecBytes;
 }