aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/PathCoverageTest.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-04-16 15:50:18 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-04-16 15:50:18 +0000
commit6853e808a464ca75ff1328338d1eb55ff27c4337 (patch)
treeb87b0d4374b5fd4171fd8eefe4de1c85da65c53a /tests/PathCoverageTest.cpp
parent4f8975ea0fdd2127cc2c0611966204b36f1e75ce (diff)
Addressed more Windows compiler complaint issues
Diffstat (limited to 'tests/PathCoverageTest.cpp')
-rw-r--r--tests/PathCoverageTest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/PathCoverageTest.cpp b/tests/PathCoverageTest.cpp
index 91de17802e..4f2f1bee62 100644
--- a/tests/PathCoverageTest.cpp
+++ b/tests/PathCoverageTest.cpp
@@ -60,8 +60,8 @@ static inline uint32_t compute_pointCount(SkScalar d, SkScalar tol) {
if (d < tol) {
return 1;
} else {
- int temp = SkScalarCeil(SkScalarSqrt(SkScalarDiv(d, tol)));
- uint32_t count = SkMinScalar(SkNextPow2(temp), MAX_POINTS_PER_CURVE);
+ int temp = SkScalarCeilToInt(SkScalarSqrt(SkScalarDiv(d, tol)));
+ uint32_t count = SkMin32(SkNextPow2(temp), MAX_POINTS_PER_CURVE);
return count;
}
}