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/Patch.cpp | |
parent | e264f9a51ef2158df345c3c4b19dd6098e959141 (diff) |
Remove MathUtils::min/max
bug:22202895
Change-Id: Ia115d86871314e3819f684ea7307356aed13a28e
Diffstat (limited to 'libs/hwui/Patch.cpp')
-rw-r--r-- | libs/hwui/Patch.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/hwui/Patch.cpp b/libs/hwui/Patch.cpp index 500f9e95381c..b471e7850a99 100644 --- a/libs/hwui/Patch.cpp +++ b/libs/hwui/Patch.cpp @@ -14,16 +14,16 @@ * limitations under the License. */ -#include <cmath> - -#include <utils/Log.h> +#include "Patch.h" #include "Caches.h" -#include "Patch.h" #include "Properties.h" #include "UvMapper.h" #include "utils/MathUtils.h" +#include <algorithm> +#include <utils/Log.h> + namespace android { namespace uirenderer { @@ -189,10 +189,10 @@ void Patch::generateQuad(TextureVertex*& vertex, float x1, float y1, float x2, f const uint32_t oldQuadCount = quadCount; quadCount++; - x1 = MathUtils::max(x1, 0.0f); - x2 = MathUtils::max(x2, 0.0f); - y1 = MathUtils::max(y1, 0.0f); - y2 = MathUtils::max(y2, 0.0f); + x1 = std::max(x1, 0.0f); + x2 = std::max(x2, 0.0f); + y1 = std::max(y1, 0.0f); + y2 = std::max(y2, 0.0f); // Skip degenerate and transparent (empty) quads if ((mColors[oldQuadCount] == 0) || x1 >= x2 || y1 >= y2) { |