diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-01-08 15:31:47 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-01-08 15:31:47 -0800 |
| commit | 9adfbb0920a258e916003b1ee9515e97879db82a (patch) | |
| tree | 69c568cf9857ea028da91cc3a73f15a21a2c4c73 /fpdfsdk/src/fsdk_baseannot.cpp | |
| parent | e5ae7226fc3ffad3f76995d31a0f6b2254d50656 (diff) | |
| download | pdfium-9adfbb0920a258e916003b1ee9515e97879db82a.tar.xz | |
Switch most min/max macros to std::min/max.
Fix lint errors along the way.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1567343002 .
Diffstat (limited to 'fpdfsdk/src/fsdk_baseannot.cpp')
| -rw-r--r-- | fpdfsdk/src/fsdk_baseannot.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp index ef7ab0c03a..9540c5766d 100644 --- a/fpdfsdk/src/fsdk_baseannot.cpp +++ b/fpdfsdk/src/fsdk_baseannot.cpp @@ -4,6 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include <algorithm> + #include "core/include/fxcrt/fx_ext.h" #include "fpdfsdk/include/fsdk_baseannot.h" #include "fpdfsdk/include/fsdk_define.h" @@ -815,9 +817,9 @@ FX_BOOL CPDFSDK_BAAnnot::GetColor(FX_COLORREF& color) const { 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 = FXSYS_RGB((int)(r * 255), (int)(g * 255), (int)(b * 255)); |