diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-27 07:10:10 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-27 07:10:10 +0000 |
commit | 12eea2b10d6caaafe0a207d10b1e9322510983a2 (patch) | |
tree | 0c862c6a14aa41ee3c5d4e812fe936702d88095b /experimental/Intersection | |
parent | ee619a059a2cd7259226dc0c86a000e3bf5834de (diff) |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7875 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'experimental/Intersection')
-rw-r--r-- | experimental/Intersection/CubicIntersection.cpp | 2 | ||||
-rw-r--r-- | experimental/Intersection/CubicIntersection_Test.cpp | 2 | ||||
-rw-r--r-- | experimental/Intersection/CubicUtilities.cpp | 1 | ||||
-rw-r--r-- | experimental/Intersection/Simplify.cpp | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/experimental/Intersection/CubicIntersection.cpp b/experimental/Intersection/CubicIntersection.cpp index bf8ea468c3..0a82866d45 100644 --- a/experimental/Intersection/CubicIntersection.cpp +++ b/experimental/Intersection/CubicIntersection.cpp @@ -397,7 +397,7 @@ static bool intersect3(const Cubic& cubic1, double t1s, double t1e, const Cubic& return result; } -// intersect the end of the cubic with the other. Try lines from the end to control and opposite +// intersect the end of the cubic with the other. Try lines from the end to control and opposite // end to determine range of t on opposite cubic. static bool intersectEnd(const Cubic& cubic1, bool start, const Cubic& cubic2, const _Rect& bounds2, Intersections& i) { diff --git a/experimental/Intersection/CubicIntersection_Test.cpp b/experimental/Intersection/CubicIntersection_Test.cpp index e45d543173..358afcf605 100644 --- a/experimental/Intersection/CubicIntersection_Test.cpp +++ b/experimental/Intersection/CubicIntersection_Test.cpp @@ -134,7 +134,7 @@ static const Cubic testSet[] = { const size_t testSetCount = sizeof(testSet) / sizeof(testSet[0]); static const Cubic newTestSet[] = { -{{0,1}, {2,5}, {6,0}, {5,3}}, +{{0,1}, {2,5}, {6,0}, {5,3}}, {{0,6}, {3,5}, {1,0}, {5,2}}, {{0,1}, {3,6}, {1,0}, {5,2}}, diff --git a/experimental/Intersection/CubicUtilities.cpp b/experimental/Intersection/CubicUtilities.cpp index b27accf314..1de2ef75e9 100644 --- a/experimental/Intersection/CubicUtilities.cpp +++ b/experimental/Intersection/CubicUtilities.cpp @@ -324,4 +324,3 @@ _Point xy_at_t(const Cubic& cubic, double t) { a * cubic[0].y + b * cubic[1].y + c * cubic[2].y + d * cubic[3].y}; return result; } - diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp index ea4c9bf162..e269ffd782 100644 --- a/experimental/Intersection/Simplify.cpp +++ b/experimental/Intersection/Simplify.cpp @@ -3668,7 +3668,7 @@ the same winding is shared by both. void setOppXor(bool isOppXor) { fOppXor = isOppXor; } - + void setSpanT(int index, double t) { Span& span = fTs[index]; span.fT = t; |