diff options
Diffstat (limited to 'src/gpu/GrPathUtils.cpp')
| -rw-r--r-- | src/gpu/GrPathUtils.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/gpu/GrPathUtils.cpp b/src/gpu/GrPathUtils.cpp index 91a48f7b6b..918493982a 100644 --- a/src/gpu/GrPathUtils.cpp +++ b/src/gpu/GrPathUtils.cpp @@ -11,7 +11,6 @@ #include "SkGeometry.h" #include "SkMathPriv.h" -static const int MAX_POINTS_PER_CURVE = 1 << 10; static const SkScalar gMinCurveTol = 0.0001f; SkScalar GrPathUtils::scaleToleranceToSrc(SkScalar devTol, @@ -45,7 +44,7 @@ uint32_t GrPathUtils::quadraticPointCount(const SkPoint points[], SkScalar tol) SkScalar d = points[1].distanceToLineSegmentBetween(points[0], points[2]); if (!SkScalarIsFinite(d)) { - return MAX_POINTS_PER_CURVE; + return kMaxPointsPerCurve; } else if (d <= tol) { return 1; } else { @@ -55,7 +54,7 @@ uint32_t GrPathUtils::quadraticPointCount(const SkPoint points[], SkScalar tol) // 2^(log4(x)) = sqrt(x); SkScalar divSqrt = SkScalarSqrt(d / tol); if (((SkScalar)SK_MaxS32) <= divSqrt) { - return MAX_POINTS_PER_CURVE; + return kMaxPointsPerCurve; } else { int temp = SkScalarCeilToInt(divSqrt); int pow2 = GrNextPow2(temp); @@ -65,7 +64,7 @@ uint32_t GrPathUtils::quadraticPointCount(const SkPoint points[], SkScalar tol) if (pow2 < 1) { pow2 = 1; } - return SkTMin(pow2, MAX_POINTS_PER_CURVE); + return SkTMin(pow2, kMaxPointsPerCurve); } } } @@ -105,13 +104,13 @@ uint32_t GrPathUtils::cubicPointCount(const SkPoint points[], points[2].distanceToLineSegmentBetweenSqd(points[0], points[3])); d = SkScalarSqrt(d); if (!SkScalarIsFinite(d)) { - return MAX_POINTS_PER_CURVE; + return kMaxPointsPerCurve; } else if (d <= tol) { return 1; } else { SkScalar divSqrt = SkScalarSqrt(d / tol); if (((SkScalar)SK_MaxS32) <= divSqrt) { - return MAX_POINTS_PER_CURVE; + return kMaxPointsPerCurve; } else { int temp = SkScalarCeilToInt(SkScalarSqrt(d / tol)); int pow2 = GrNextPow2(temp); @@ -121,7 +120,7 @@ uint32_t GrPathUtils::cubicPointCount(const SkPoint points[], if (pow2 < 1) { pow2 = 1; } - return SkTMin(pow2, MAX_POINTS_PER_CURVE); + return SkTMin(pow2, kMaxPointsPerCurve); } } } |