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

core/src/fpdfdoc/doc_formcontrol.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
 
+#include <algorithm>
+
 #include "core/include/fpdfdoc/fpdf_doc.h"
 
 CPDF_FormControl::CPDF_FormControl(CPDF_FormField* pField,
                                    CPDF_Dictionary* pWidgetDict) {
   m_pField = pField;
   m_pWidgetDict = pWidgetDict;
   m_pForm = m_pField->m_pForm;
 }
 CFX_FloatRect CPDF_FormControl::GetRect() const {
   return m_pWidgetDict->GetRect("Rect");
@@ skipping 329 matching lines @@
     FX_FLOAT r = pEntry->GetNumber(0) * 255;
     FX_FLOAT g = pEntry->GetNumber(1) * 255;
     FX_FLOAT b = pEntry->GetNumber(2) * 255;
     color = ArgbEncode(255, (int)r, (int)g, (int)b);
   } else if (dwCount == 4) {
     iColorType = COLORTYPE_CMYK;
     FX_FLOAT c = pEntry->GetNumber(0);
     FX_FLOAT m = pEntry->GetNumber(1);
     FX_FLOAT y = pEntry->GetNumber(2);
     FX_FLOAT k = pEntry->GetNumber(3);
-    FX_FLOAT r = 1.0f - FX_MIN(1.0f, c + k);
-    FX_FLOAT g = 1.0f - FX_MIN(1.0f, m + k);
-    FX_FLOAT b = 1.0f - FX_MIN(1.0f, y + k);
+    FX_FLOAT r = 1.0f - std::min(1.0f, c + k);
+    FX_FLOAT g = 1.0f - std::min(1.0f, m + k);
+    FX_FLOAT b = 1.0f - std::min(1.0f, y + k);
     color = ArgbEncode(255, (int)(r * 255), (int)(g * 255), (int)(b * 255));
   }
   return color;
 }
 
 FX_FLOAT CPDF_ApSettings::GetOriginalColor(
     int index,
     const CFX_ByteStringC& csEntry) const {
   if (!m_pDict)
     return 0;
@@ skipping 43 matching lines @@
   return m_pDict ? m_pDict->GetStream(csEntry) : nullptr;
 }
 
 CPDF_IconFit CPDF_ApSettings::GetIconFit() const {
   return m_pDict ? m_pDict->GetDict("IF") : nullptr;
 }
 
 int CPDF_ApSettings::GetTextPosition() const {
   return m_pDict ? m_pDict->GetInteger("TP", TEXTPOS_CAPTION) : TEXTPOS_CAPTION;
 }