summaryrefslogtreecommitdiff
path: root/libs/hwui/TessellationCache.cpp
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2015-07-08 02:09:32 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-08 02:09:32 +0000
commitfdb87b76733442c7cf36719748966a38a80671a7 (patch)
tree952af2b48ea9c5c35f956a6cc07b810826d7d678 /libs/hwui/TessellationCache.cpp
parentb517be4c8716725cf2e5e37e9497dad5423fa459 (diff)
parent127b478ac61eed99894998b38bca82b79b8e56b1 (diff)
am 127b478a: Merge "Remove all usage of fmin and fmax" into mnc-dev
* commit '127b478ac61eed99894998b38bca82b79b8e56b1': Remove all usage of fmin and fmax
Diffstat (limited to 'libs/hwui/TessellationCache.cpp')
-rw-r--r--libs/hwui/TessellationCache.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/TessellationCache.cpp b/libs/hwui/TessellationCache.cpp
index 9df1f0d1a719..17cb3a7fd6fd 100644
--- a/libs/hwui/TessellationCache.cpp
+++ b/libs/hwui/TessellationCache.cpp
@@ -244,8 +244,8 @@ static void tessellateShadows(
const Vertex& point2d = casterVertices2d[i];
casterPolygon[i] = (Vector3){point2d.x, point2d.y, 0};
mapPointFakeZ(casterPolygon[i], casterTransformXY, casterTransformZ);
- minZ = fmin(minZ, casterPolygon[i].z);
- maxZ = fmax(maxZ, casterPolygon[i].z);
+ minZ = std::min(minZ, casterPolygon[i].z);
+ maxZ = std::max(maxZ, casterPolygon[i].z);
}
// map the centroid of the caster into 3d