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/fpdfapi/render | |
| 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/fpdfapi/render')
| -rw-r--r-- | core/fpdfapi/render/cpdf_imagerenderer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp index 7903ad4a62..d3778452a3 100644 --- a/core/fpdfapi/render/cpdf_imagerenderer.cpp +++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp @@ -30,6 +30,7 @@ #include "core/fxge/cfx_fxgedevice.h" #include "core/fxge/cfx_pathdata.h" #include "third_party/base/ptr_util.h" +#include "third_party/base/stl_util.h" #ifdef _SKIA_SUPPORT_ #include "core/fxge/skia/fx_skia_device.h" @@ -273,11 +274,11 @@ void CPDF_ImageRenderer::CalculateDrawImage(CFX_FxgeDevice* pBitmapDevice1, continue; } int orig = (*dest_scan - matte_b) * 255 / alpha + matte_b; - *dest_scan++ = std::min(std::max(orig, 0), 255); + *dest_scan++ = pdfium::clamp(orig, 0, 255); orig = (*dest_scan - matte_g) * 255 / alpha + matte_g; - *dest_scan++ = std::min(std::max(orig, 0), 255); + *dest_scan++ = pdfium::clamp(orig, 0, 255); orig = (*dest_scan - matte_r) * 255 / alpha + matte_r; - *dest_scan++ = std::min(std::max(orig, 0), 255); + *dest_scan++ = pdfium::clamp(orig, 0, 255); dest_scan++; } } |