diff options
| author | 2015-08-19 15:19:18 -0700 | |
|---|---|---|
| committer | 2015-08-19 15:53:01 -0700 | |
| commit | 9db58c031f8ffa102a6d585cb585bed3bdb911a9 (patch) | |
| tree | 1bef6092b3a672ff56c1a242ba8d71d6195b2ff9 /libs/hwui/FontRenderer.cpp | |
| parent | e264f9a51ef2158df345c3c4b19dd6098e959141 (diff) | |
Remove MathUtils::min/max
bug:22202895
Change-Id: Ia115d86871314e3819f684ea7307356aed13a28e
Diffstat (limited to 'libs/hwui/FontRenderer.cpp')
| -rw-r--r-- | libs/hwui/FontRenderer.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp index 057c231012a4..75c3ead68f7b 100644 --- a/libs/hwui/FontRenderer.cpp +++ b/libs/hwui/FontRenderer.cpp @@ -26,14 +26,12 @@ #include "Rect.h" #include "renderstate/RenderState.h" #include "utils/Blur.h" -#include "utils/MathUtils.h" #include "utils/Timing.h" +#include <algorithm> +#include <cutils/properties.h> #include <SkGlyph.h> #include <SkUtils.h> - -#include <cutils/properties.h> - #include <utils/Log.h> #ifdef ANDROID_ENABLE_RENDERSCRIPT @@ -118,10 +116,10 @@ FontRenderer::FontRenderer() uint32_t maxTextureSize = (uint32_t) Caches::getInstance().maxTextureSize; - mSmallCacheWidth = MathUtils::min(mSmallCacheWidth, maxTextureSize); - mSmallCacheHeight = MathUtils::min(mSmallCacheHeight, maxTextureSize); - mLargeCacheWidth = MathUtils::min(mLargeCacheWidth, maxTextureSize); - mLargeCacheHeight = MathUtils::min(mLargeCacheHeight, maxTextureSize); + mSmallCacheWidth = std::min(mSmallCacheWidth, maxTextureSize); + mSmallCacheHeight = std::min(mSmallCacheHeight, maxTextureSize); + mLargeCacheWidth = std::min(mLargeCacheWidth, maxTextureSize); + mLargeCacheHeight = std::min(mLargeCacheHeight, maxTextureSize); if (sLogFontRendererCreate) { INIT_LOGD(" Text cache sizes, in pixels: %i x %i, %i x %i, %i x %i, %i x %i", |