diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-01-11 11:59:17 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-01-11 11:59:17 -0800 |
| commit | 375a86403b7fa8d17d7b142c270e2d8e33bb924f (patch) | |
| tree | 1db1ffddb2bbbcd429cd1d7954b1949bfa54e1ab /fpdfsdk/src/fpdf_flatten.cpp | |
| parent | 492961df3011ccc25646eae12ac6e6dcfe7f26da (diff) | |
| download | pdfium-375a86403b7fa8d17d7b142c270e2d8e33bb924f.tar.xz | |
Merge to XFA: Switch most min/max macros to std::min/max.
Fix lint errors along the way.
R=tsepez@chromium.org
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1567343002 .
(cherry picked from commit 9adfbb0920a258e916003b1ee9515e97879db82a)
Review URL: https://codereview.chromium.org/1577503002 .
Diffstat (limited to 'fpdfsdk/src/fpdf_flatten.cpp')
| -rw-r--r-- | fpdfsdk/src/fpdf_flatten.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp index 2a0c2d947c..50d5036724 100644 --- a/fpdfsdk/src/fpdf_flatten.cpp +++ b/fpdfsdk/src/fpdf_flatten.cpp @@ -6,6 +6,8 @@ #include "public/fpdf_flatten.h" +#include <algorithm> + #include "fpdfsdk/include/fsdk_define.h" typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray; @@ -300,8 +302,8 @@ void GetOffset(FX_FLOAT& fa, FX_FLOAT x4 = matrix.a * rcStream.right + matrix.c * rcStream.top + matrix.e; FX_FLOAT y4 = matrix.b * rcStream.right + matrix.d * rcStream.top + matrix.f; - FX_FLOAT left = FX_MIN(FX_MIN(x1, x2), FX_MIN(x3, x4)); - FX_FLOAT bottom = FX_MIN(FX_MIN(y1, y2), FX_MIN(y3, y4)); + FX_FLOAT left = std::min(std::min(x1, x2), std::min(x3, x4)); + FX_FLOAT bottom = std::min(std::min(y1, y2), std::min(y3, y4)); fa = (rcAnnot.right - rcAnnot.left) / fStreamWidth; fd = (rcAnnot.top - rcAnnot.bottom) / fStreamHeight; |