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

fpdfsdk/src/pdfwindow/PWL_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 "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+
+#include <algorithm>
+
 #include "fpdfsdk/include/pdfwindow/PWL_Icon.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 #define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
 #define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
 #define IsFloatSmaller(fa, fb) ((fa) < (fb) && !IsFloatZero((fa) - (fb)))
 #define IsFloatEqual(fa, fb) IsFloatZero((fa) - (fb))
 
 CFX_ByteString CPWL_Utils::GetAppStreamFromArray(const CPWL_PathData* pPathData,
                                                  int32_t nCount) {
   CFX_ByteTextBuf csAP;
@@ skipping 1230 matching lines @@
 }
 
 void CPWL_Utils::ConvertCMYK2GRAY(FX_FLOAT dC,
                                   FX_FLOAT dM,
                                   FX_FLOAT dY,
                                   FX_FLOAT dK,
                                   FX_FLOAT& dGray) {
   if (dC < 0 || dC > 1 || dM < 0 || dM > 1 || dY < 0 || dY > 1 || dK < 0 ||
       dK > 1)
     return;
-  dGray = 1.0f - FX_MIN(1.0f, 0.3f * dC + 0.59f * dM + 0.11f * dY + dK);
+  dGray = 1.0f - std::min(1.0f, 0.3f * dC + 0.59f * dM + 0.11f * dY + dK);
 }
 
 void CPWL_Utils::ConvertGRAY2CMYK(FX_FLOAT dGray,
                                   FX_FLOAT& dC,
                                   FX_FLOAT& dM,
                                   FX_FLOAT& dY,
                                   FX_FLOAT& dK) {
   if (dGray < 0 || dGray > 1)
     return;
   dC = 0.0f;
@@ skipping 25 matching lines @@
 void CPWL_Utils::ConvertCMYK2RGB(FX_FLOAT dC,
                                  FX_FLOAT dM,
                                  FX_FLOAT dY,
                                  FX_FLOAT dK,
                                  FX_FLOAT& dR,
                                  FX_FLOAT& dG,
                                  FX_FLOAT& dB) {
   if (dC < 0 || dC > 1 || dM < 0 || dM > 1 || dY < 0 || dY > 1 || dK < 0 ||
       dK > 1)
     return;
-  dR = 1.0f - FX_MIN(1.0f, dC + dK);
-  dG = 1.0f - FX_MIN(1.0f, dM + dK);
-  dB = 1.0f - FX_MIN(1.0f, dY + dK);
+  dR = 1.0f - std::min(1.0f, dC + dK);
+  dG = 1.0f - std::min(1.0f, dM + dK);
+  dB = 1.0f - std::min(1.0f, dY + dK);
 }
 
 void CPWL_Utils::ConvertRGB2CMYK(FX_FLOAT dR,
                                  FX_FLOAT dG,
                                  FX_FLOAT dB,
                                  FX_FLOAT& dC,
                                  FX_FLOAT& dM,
                                  FX_FLOAT& dY,
                                  FX_FLOAT& dK) {
   if (dR < 0 || dR > 1 || dG < 0 || dG > 1 || dB < 0 || dB > 1)
     return;
 
   dC = 1.0f - dR;
   dM = 1.0f - dG;
   dY = 1.0f - dB;
-  dK = FX_MIN(dC, FX_MIN(dM, dY));
+  dK = std::min(dC, std::min(dM, dY));
 }
 
 void CPWL_Utils::PWLColorToARGB(const CPWL_Color& color,
                                 int32_t& alpha,
                                 FX_FLOAT& red,
                                 FX_FLOAT& green,
                                 FX_FLOAT& blue) {
   switch (color.nColorType) {
     case COLORTYPE_TRANSPARENT: {
       alpha = 0;
@@ skipping 2340 matching lines @@
           break;
         case COLORTYPE_RGB:
           CPWL_Utils::ConvertCMYK2RGB(fColor1, fColor2, fColor3, fColor4,
                                       fColor1, fColor2, fColor3);
           break;
       }
       break;
   }
   nColorType = other_nColorType;
 }