diff options
author | 2012-09-19 02:01:47 +0000 | |
---|---|---|
committer | 2012-09-19 02:01:47 +0000 | |
commit | c1ad0226087e10b1f300b5a45e3d6fdb23b8d1b8 (patch) | |
tree | 0bc3fe5a67b93c55f3e59161d170ca106c00ea47 /experimental | |
parent | 79723f9826241896ae4ac0d462c96ffcbc47789a (diff) |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@5594 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'experimental')
-rw-r--r-- | experimental/Intersection/QuadraticImplicit.cpp | 2 | ||||
-rw-r--r-- | experimental/Intersection/QuarticRoot.cpp | 2 | ||||
-rw-r--r-- | experimental/Intersection/Simplify.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/experimental/Intersection/QuadraticImplicit.cpp b/experimental/Intersection/QuadraticImplicit.cpp index be54ed688e..835b3bf71f 100644 --- a/experimental/Intersection/QuadraticImplicit.cpp +++ b/experimental/Intersection/QuadraticImplicit.cpp @@ -92,7 +92,7 @@ bool intersect2(const Quadratic& q1, const Quadratic& q2, Intersections& i) { int rootCount = findRoots(i2, q1, roots1); // OPTIMIZATION: could short circuit here if all roots are < 0 or > 1 #ifndef NDEBUG - int rootCount2 = + int rootCount2 = #endif findRoots(i1, q2, roots2); assert(rootCount == rootCount2); diff --git a/experimental/Intersection/QuarticRoot.cpp b/experimental/Intersection/QuarticRoot.cpp index 8e3664bef5..839c3b973b 100644 --- a/experimental/Intersection/QuarticRoot.cpp +++ b/experimental/Intersection/QuarticRoot.cpp @@ -150,7 +150,7 @@ static int cubicRootsX(double A, double B, double C, double D, double s[3]) { if (approximately_zero(R)) {/* one triple solution */ *roots++ = -adiv3; } else { /* one single and one double solution */ - + double u = cube_root(-R); *roots++ = 2 * u - adiv3; *roots++ = -u - adiv3; diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp index 827c6178ff..2a65ad1219 100644 --- a/experimental/Intersection/Simplify.cpp +++ b/experimental/Intersection/Simplify.cpp @@ -564,7 +564,7 @@ public: #else SkASSERT(fVerb == SkPath::kQuad_Verb); // worry about cubics later SkASSERT(rh.fVerb == SkPath::kQuad_Verb); - // FIXME: until I can think of something better, project a ray from the + // FIXME: until I can think of something better, project a ray from the // end of the shorter tangent to midway between the end points // through both curves and use the resulting angle to sort // FIXME: some of this setup can be moved to set() if it works, or cached if it's expensive |