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

xfa/src/fxbarcode/common/BC_CommonByteArray.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 "BC_CommonByteArray.h"
 CBC_CommonByteArray::CBC_CommonByteArray() {
   m_bytes = NULL;
   m_size = 0;
   m_index = 0;
 }
 CBC_CommonByteArray::CBC_CommonByteArray(int32_t size) {
   m_size = size;
   m_bytes = FX_Alloc(uint8_t, size);
@@ skipping 21 matching lines @@
   m_bytes[index] = (uint8_t)value;
 }
 int32_t CBC_CommonByteArray::Size() {
   return m_size;
 }
 FX_BOOL CBC_CommonByteArray::IsEmpty() {
   return m_size == 0;
 }
 void CBC_CommonByteArray::AppendByte(int32_t value) {
   if (m_size == 0 || m_index >= m_size) {
-    int32_t newSize = FX_MAX(32, m_size << 1);
+    int32_t newSize = std::max(32, m_size << 1);
     Reserve(newSize);
   }
   m_bytes[m_index] = (uint8_t)value;
   m_index++;
 }
 void CBC_CommonByteArray::Reserve(int32_t capacity) {
   if (m_bytes == NULL || m_size < capacity) {
     uint8_t* newArray = FX_Alloc(uint8_t, capacity);
     FXSYS_memset(newArray, 0, capacity);
     if (m_bytes != NULL) {
@@ skipping 20 matching lines @@
     FX_Free(m_bytes);
   }
   m_bytes = FX_Alloc(uint8_t, count);
   m_size = count;
   int32_t i;
   for (i = 0; i < count; i++) {
     m_bytes[i] = source->operator[](i + offset);
   }
   m_index = m_size;
 }