diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-03-17 15:14:19 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-17 22:54:26 +0000 |
| commit | 85f019a8e7d33cbba368a6c6b75fd091269e14a1 (patch) | |
| tree | 8dcf6fcd98309a48ebbd9e46cc8c0d23a57c0965 /core/fxge | |
| parent | 240fe6d79f234896a966ddce0b9a125776dc9171 (diff) | |
| download | pdfium-85f019a8e7d33cbba368a6c6b75fd091269e14a1.tar.xz | |
Add pdfium::clamp() as a placeholder for std::clamp().chromium/3046
Ue it to fix a typo as well.
BUG=pdfium:634
Change-Id: I2d686242ffb841aedc2fae6a3cf7a00bea667404
Reviewed-on: https://pdfium-review.googlesource.com/3113
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxge')
| -rw-r--r-- | core/fxge/agg/fx_agg_driver.cpp | 5 | ||||
| -rw-r--r-- | core/fxge/dib/fx_dib_engine.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp index 4534ee1425..b435c032bc 100644 --- a/core/fxge/agg/fx_agg_driver.cpp +++ b/core/fxge/agg/fx_agg_driver.cpp @@ -24,14 +24,15 @@ #include "third_party/agg23/agg_renderer_scanline.h" #include "third_party/agg23/agg_scanline_u.h" #include "third_party/base/ptr_util.h" +#include "third_party/base/stl_util.h" namespace { const float kMaxPos = 32000.0f; CFX_PointF HardClip(const CFX_PointF& pos) { - return CFX_PointF(std::max(std::min(pos.x, kMaxPos), -kMaxPos), - std::max(std::min(pos.y, kMaxPos), -kMaxPos)); + return CFX_PointF(pdfium::clamp(pos.x, -kMaxPos, kMaxPos), + pdfium::clamp(pos.y, -kMaxPos, kMaxPos)); } void RgbByteOrderSetPixel(CFX_DIBitmap* pBitmap, int x, int y, uint32_t argb) { diff --git a/core/fxge/dib/fx_dib_engine.cpp b/core/fxge/dib/fx_dib_engine.cpp index 8d90a72401..5975a5e975 100644 --- a/core/fxge/dib/fx_dib_engine.cpp +++ b/core/fxge/dib/fx_dib_engine.cpp @@ -11,6 +11,7 @@ #include "core/fxge/dib/dib_int.h" #include "core/fxge/fx_dib.h" #include "third_party/base/ptr_util.h" +#include "third_party/base/stl_util.h" namespace { @@ -984,7 +985,7 @@ bool CFX_ImageStretcher::ContinueQuickStretch(IFX_Pause* pPause) { dest_y = m_LineIndex; src_y = (dest_y + m_ClipRect.top) * src_height / m_DestHeight; } - src_y = std::max(std::min(src_y, src_height - 1), 0); + src_y = pdfium::clamp(src_y, 0, src_height - 1); if (m_pSource->SkipToScanline(src_y, pPause)) return true; |