diff options
author | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-17 17:36:59 +0000 |
---|---|---|
committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-17 17:36:59 +0000 |
commit | 2047f00e4698f83499ab91911999a65c21a951c9 (patch) | |
tree | 404b1c30d3f764fa05e3770c09fc1e43449a4d65 /gpu/src/GrPathUtils.cpp | |
parent | d31cbc465088a253b5574b0305e09f9301b2bf81 (diff) |
get tests closer to passing for SKIA_SCALAR=fixed
http://codereview.appspot.com/4532064/
git-svn-id: http://skia.googlecode.com/svn/trunk@1351 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu/src/GrPathUtils.cpp')
-rw-r--r-- | gpu/src/GrPathUtils.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gpu/src/GrPathUtils.cpp b/gpu/src/GrPathUtils.cpp index 69dd0e6aef..1fb043c83f 100644 --- a/gpu/src/GrPathUtils.cpp +++ b/gpu/src/GrPathUtils.cpp @@ -31,8 +31,8 @@ uint32_t GrPathUtils::quadraticPointCount(const GrPoint points[], // subdivide x = log4(d/tol) times. x subdivisions creates 2^(x) // points. // 2^(log4(x)) = sqrt(x); - d = ceilf(sqrtf(d/tol)); - return GrMin(GrNextPow2((uint32_t)d), MAX_POINTS_PER_CURVE); + int temp = SkScalarCeil(SkScalarSqrt(SkScalarDiv(d, tol))); + return GrMin(GrNextPow2(temp), MAX_POINTS_PER_CURVE); } } @@ -65,12 +65,12 @@ uint32_t GrPathUtils::cubicPointCount(const GrPoint points[], GrScalar tol) { GrScalar d = GrMax(points[1].distanceToLineSegmentBetweenSqd(points[0], points[3]), points[2].distanceToLineSegmentBetweenSqd(points[0], points[3])); - d = sqrtf(d); + d = SkScalarSqrt(d); if (d < tol) { return 1; } else { - d = ceilf(sqrtf(d/tol)); - return GrMin(GrNextPow2((uint32_t)d), MAX_POINTS_PER_CURVE); + int temp = SkScalarCeil(SkScalarSqrt(SkScalarDiv(d, tol))); + return GrMin(GrNextPow2(temp), MAX_POINTS_PER_CURVE); } } |