commit e6a15ee3d0c78eb3f2551d73a7d238c3d8d2f075
author Chris Craik <ccraik@google.com> Tue Jul 07 18:42:17 2015 -0700
committer Chris Craik <ccraik@google.com> Tue Jul 07 18:42:42 2015 -0700
tree fb4aa5c04487f1f2c13221937933288e2a3fff44
parent 61d7acae0cafc265e94a35ad3ba1677f60346de9

Remove all usage of fmin and fmax

bug:22208220

Removes needless call, and upconversion to doubles in multiple places.

Change-Id: I1b949fa5f206446ac34de800154c0147d6bd8034

libs/hwui/font/CacheTexture.cpp

diff --git a/libs/hwui/font/CacheTexture.cpp b/libs/hwui/font/CacheTexture.cpp
index 845cf30..d2685da 100644
--- a/libs/hwui/font/CacheTexture.cpp
+++ b/libs/hwui/font/CacheTexture.cpp
@@ -314,7 +314,7 @@
 #endif
             }
 
-            if (cacheBlock->mHeight < fmin(glyphH, glyphW)) {
+            if (cacheBlock->mHeight < std::min(glyphH, glyphW)) {
                 // If remaining space in this block is too small to be useful, remove it
                 mCacheBlocks = CacheBlock::removeBlock(mCacheBlocks, cacheBlock);
             }