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/VertexBuffer.h | |
| parent | e264f9a51ef2158df345c3c4b19dd6098e959141 (diff) | |
Remove MathUtils::min/max
bug:22202895
Change-Id: Ia115d86871314e3819f684ea7307356aed13a28e
Diffstat (limited to 'libs/hwui/VertexBuffer.h')
| -rw-r--r-- | libs/hwui/VertexBuffer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/VertexBuffer.h b/libs/hwui/VertexBuffer.h index 9be4d8487505..c0373aceebba 100644 --- a/libs/hwui/VertexBuffer.h +++ b/libs/hwui/VertexBuffer.h @@ -17,7 +17,7 @@ #ifndef ANDROID_HWUI_VERTEX_BUFFER_H #define ANDROID_HWUI_VERTEX_BUFFER_H -#include "utils/MathUtils.h" +#include <algorithm> namespace android { namespace uirenderer { @@ -129,10 +129,10 @@ public: unsigned int getSize() const { return mByteCount; } unsigned int getIndexCount() const { return mIndexCount; } void updateIndexCount(unsigned int newCount) { - mIndexCount = MathUtils::min(newCount, mAllocatedIndexCount); + mIndexCount = std::min(newCount, mAllocatedIndexCount); } void updateVertexCount(unsigned int newCount) { - mVertexCount = MathUtils::min(newCount, mAllocatedVertexCount); + mVertexCount = std::min(newCount, mAllocatedVertexCount); } MeshFeatureFlags getMeshFeatureFlags() const { return mMeshFeatureFlags; } void setMeshFeatureFlags(int flags) { |