diff options
author | 2013-02-05 07:02:01 +0000 | |
---|---|---|
committer | 2013-02-05 07:02:01 +0000 | |
commit | 0c38ed3b1d704a0ed6147299046f51fd52e841a2 (patch) | |
tree | 66ce12a7da51dd2c132dfef0aaa78dc8b98f6f17 /experimental/Intersection | |
parent | 1c295e422b9e29fe9d975d499126dc91ead0e13a (diff) |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7567 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'experimental/Intersection')
-rw-r--r-- | experimental/Intersection/CubicIntersection.cpp | 6 | ||||
-rw-r--r-- | experimental/Intersection/CubicIntersection_Test.cpp | 2 | ||||
-rw-r--r-- | experimental/Intersection/DataTypes.h | 2 | ||||
-rw-r--r-- | experimental/Intersection/Intersection_Tests.cpp | 2 | ||||
-rw-r--r-- | experimental/Intersection/Intersections.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/experimental/Intersection/CubicIntersection.cpp b/experimental/Intersection/CubicIntersection.cpp index ae165f9b09..b82b301a77 100644 --- a/experimental/Intersection/CubicIntersection.cpp +++ b/experimental/Intersection/CubicIntersection.cpp @@ -312,7 +312,7 @@ static void doIntersect(const Cubic& cubic1, double t1s, double t1m, double t1e, } Intersections xlocals; intersectWithOrder(s1a, o1a, s2a, o2a, xlocals); - } + } #endif intersectWithOrder(s1a, o1a, s2a, o2a, locals); for (int tIdx = 0; tIdx < locals.used(); ++tIdx) { @@ -325,7 +325,7 @@ static void doIntersect(const Cubic& cubic1, double t1s, double t1m, double t1e, #if 0 && SK_DEBUG SkDebugf("to1=%1.9g p1=(%1.9g,%1.9g) to2=%1.9g p2=(%1.9g,%1.9g) d=%1.9g\n", to1, p1.x, p1.y, to2, p2.x, p2.y, p1.distance(p2)); - + #endif if (p1.approximatelyEqual(p2)) { i.insert(i.swapped() ? to2 : to1, i.swapped() ? to1 : to2); @@ -373,7 +373,7 @@ static bool intersect2(const Cubic& cubic1, double t1s, double t1e, const Cubic& int o2 = quadPart(cubic2, t2Start, t2, s2); Intersections locals; intersectWithOrder(s1, o1, s2, o2, locals); - + for (int tIdx = 0; tIdx < locals.used(); ++tIdx) { double to1 = t1Start + (t1 - t1Start) * locals.fT[0][tIdx]; double to2 = t2Start + (t2 - t2Start) * locals.fT[1][tIdx]; diff --git a/experimental/Intersection/CubicIntersection_Test.cpp b/experimental/Intersection/CubicIntersection_Test.cpp index 66c4d17dd7..7cfb118816 100644 --- a/experimental/Intersection/CubicIntersection_Test.cpp +++ b/experimental/Intersection/CubicIntersection_Test.cpp @@ -458,6 +458,6 @@ void CubicIntersection_IntersectionFinder() { void CubicIntersection_CoincidentTest() { Cubic cubic1 = {{0, 1}, {0, 2}, {1, 0}, {1, 0}}; Cubic cubic2 = {{0, 1}, {0, 2}, {1, 0}, {6, 1}}; - + } #endif diff --git a/experimental/Intersection/DataTypes.h b/experimental/Intersection/DataTypes.h index ecf3d3676d..56348903d0 100644 --- a/experimental/Intersection/DataTypes.h +++ b/experimental/Intersection/DataTypes.h @@ -199,7 +199,7 @@ struct _Point { return AlmostEqualUlps((float) x, (float) a.x) && AlmostEqualUlps((float) y, (float) a.y); } - + bool approximatelyZero() const { return approximately_zero(x) && approximately_zero(y); } diff --git a/experimental/Intersection/Intersection_Tests.cpp b/experimental/Intersection/Intersection_Tests.cpp index cbbf4cb79a..a8b4416ef7 100644 --- a/experimental/Intersection/Intersection_Tests.cpp +++ b/experimental/Intersection/Intersection_Tests.cpp @@ -13,7 +13,7 @@ void cubecode_test(int test); void Intersection_Tests() { int testsRun = 0; - + CubicIntersection_IntersectionFinder(); CubicIntersection_OneOffTest(); SimplifyNew_Test(); diff --git a/experimental/Intersection/Intersections.h b/experimental/Intersection/Intersections.h index 6dd2777136..aed47bd61b 100644 --- a/experimental/Intersection/Intersections.h +++ b/experimental/Intersection/Intersections.h @@ -58,7 +58,7 @@ public: int coincidentUsed() const { return fCoincidentUsed; } - + #if SK_DEBUG int depth() const { return fDepth; |