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

core/src/fpdfdoc/doc_utils.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"
 #include "doc_utils.h"
 
 static const int FPDFDOC_UTILS_MAXRECURSION = 32;
 
 CFX_WideString GetFullName(CPDF_Dictionary* pFieldDict) {
   CFX_WideString full_name;
   CPDF_Dictionary* pLevel = pFieldDict;
   while (pLevel) {
     CFX_WideString short_name = pLevel->GetUnicodeText("T");
@@ skipping 155 matching lines @@
     color = ArgbEncode(255, (int)r, (int)g, (int)b);
     return;
   }
   syntax.SetPos(0);
   if (syntax.FindTagParam(bStrokingOperation ? "K" : "k", 4)) {
     iColorType = COLORTYPE_CMYK;
     FX_FLOAT c = FX_atof((CFX_ByteString)syntax.GetWord());
     FX_FLOAT m = FX_atof((CFX_ByteString)syntax.GetWord());
     FX_FLOAT y = FX_atof((CFX_ByteString)syntax.GetWord());
     FX_FLOAT k = FX_atof((CFX_ByteString)syntax.GetWord());
-    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 + 0.5f), (int)(g * 255 + 0.5f),
                        (int)(b * 255 + 0.5f));
   }
 }
 FX_BOOL CPDF_DefaultAppearance::HasTextMatrix() {
   if (m_csDA.IsEmpty()) {
     return FALSE;
   }
   CPDF_SimpleParser syntax(m_csDA);
   return syntax.FindTagParam("Tm", 6);
@@ skipping 504 matching lines @@
   CPDF_Object* pAttr = pFieldDict->GetElementValue(name);
   if (pAttr) {
     return pAttr;
   }
   CPDF_Dictionary* pParent = pFieldDict->GetDict("Parent");
   if (!pParent) {
     return NULL;
   }
   return FPDF_GetFieldAttr(pParent, name, nLevel + 1);
 }