diff options
| author | Chris Craik <ccraik@google.com> | 2015-08-19 15:19:18 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2015-08-19 15:53:01 -0700 |
| commit | 9db58c031f8ffa102a6d585cb585bed3bdb911a9 (patch) | |
| tree | 1bef6092b3a672ff56c1a242ba8d71d6195b2ff9 /libs/hwui/Interpolator.cpp | |
| parent | e264f9a51ef2158df345c3c4b19dd6098e959141 (diff) | |
Remove MathUtils::min/max
bug:22202895
Change-Id: Ia115d86871314e3819f684ea7307356aed13a28e
Diffstat (limited to 'libs/hwui/Interpolator.cpp')
| -rw-r--r-- | libs/hwui/Interpolator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/hwui/Interpolator.cpp b/libs/hwui/Interpolator.cpp index e1b0fc3937c5..cc47f0052b73 100644 --- a/libs/hwui/Interpolator.cpp +++ b/libs/hwui/Interpolator.cpp @@ -16,11 +16,11 @@ #include "Interpolator.h" -#include <cmath> -#include <cutils/log.h> - #include "utils/MathUtils.h" +#include <algorithm> +#include <cutils/log.h> + namespace android { namespace uirenderer { @@ -106,7 +106,7 @@ float LUTInterpolator::interpolate(float input) { weight = modff(lutpos, &ipart); int i1 = (int) ipart; - int i2 = MathUtils::min(i1 + 1, (int) mSize - 1); + int i2 = std::min(i1 + 1, (int) mSize - 1); LOG_ALWAYS_FATAL_IF(i1 < 0 || i2 < 0, "negatives in interpolation!" " i1=%d, i2=%d, input=%f, lutpos=%f, size=%zu, values=%p, ipart=%f, weight=%f", |