summaryrefslogtreecommitdiff
path: root/libs/hwui/TextureCache.cpp
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2015-07-02 00:59:49 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-02 00:59:49 +0000
commitc3988e0aa337b74693feb0abb898eb87fbb61b58 (patch)
tree1ff13ecb765e88de340bb3b1531a028222b11487 /libs/hwui/TextureCache.cpp
parentc54e0ef628aba18365933dd8833e6929c646b7b7 (diff)
parentb4c02e8ffd0c37b645fa8bb9fc03918a8cfc9a81 (diff)
am b4c02e8f: am d3ecb3e6: Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev
* commit 'b4c02e8ffd0c37b645fa8bb9fc03918a8cfc9a81': Switch from fminf/fmaxf to std::min/max
Diffstat (limited to 'libs/hwui/TextureCache.cpp')
-rw-r--r--libs/hwui/TextureCache.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/TextureCache.cpp b/libs/hwui/TextureCache.cpp
index 5147e987253b..fe1b7fdbfbbf 100644
--- a/libs/hwui/TextureCache.cpp
+++ b/libs/hwui/TextureCache.cpp
@@ -93,7 +93,7 @@ void TextureCache::setMaxSize(uint32_t maxSize) {
}
void TextureCache::setFlushRate(float flushRate) {
- mFlushRate = fmaxf(0.0f, fminf(1.0f, flushRate));
+ mFlushRate = std::max(0.0f, std::min(1.0f, flushRate));
}
///////////////////////////////////////////////////////////////////////////////