Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6632 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp
index a221e6b..c52ff5f 100644
--- a/experimental/Intersection/Simplify.cpp
+++ b/experimental/Intersection/Simplify.cpp
@@ -1092,10 +1092,10 @@
return activeOp(xorMiMask, xorSuMask, index, endIndex, op, sumMiWinding, sumSuWinding,
maxWinding, sumWinding, oppMaxWinding, oppSumWinding);
}
-
+
bool activeOp(int xorMiMask, int xorSuMask,
int index, int endIndex, ShapeOp op,
- int& sumMiWinding, int& sumSuWinding,
+ int& sumMiWinding, int& sumSuWinding,
int& maxWinding, int& sumWinding, int& oppMaxWinding, int& oppSumWinding) {
setUpWindings(index, endIndex, sumMiWinding, sumSuWinding,
maxWinding, sumWinding, oppMaxWinding, oppSumWinding);
@@ -1963,11 +1963,11 @@
The Opp variable name part designates that the value is for the Opposite operator.
Opposite values result from combining coincident spans.
*/
-
+
Segment* findNextOp(SkTDArray<Span*>& chase, int& nextStart, int& nextEnd,
bool& unsortable, ShapeOp op, const int xorMiMask, const int xorSuMask) {
const int startIndex = nextStart;
- const int endIndex = nextEnd;
+ const int endIndex = nextEnd;
SkASSERT(startIndex != endIndex);
const int count = fTs.count();
SkASSERT(startIndex < endIndex ? startIndex < count - 1 : startIndex > 0);
@@ -2803,7 +2803,7 @@
markDoneBinary(SkMin32(index, endIndex), winding, oppWinding);
return last;
}
-
+
Span* markAndChaseDoneBinary(int index, int endIndex) {
int step = SkSign32(endIndex - index);
Span* last = innerChaseDoneBinary(index, step);
@@ -2820,7 +2820,7 @@
markWinding(min, winding);
return last;
}
-
+
Span* markAndChaseWinding(int index, int endIndex, int winding, int oppWinding) {
int min = SkMin32(index, endIndex);
int step = SkSign32(endIndex - index);
@@ -3262,7 +3262,7 @@
}
return oppWinding;
}
-
+
int updateOppWinding(const Angle* angle) const {
int startIndex = angle->start();
int endIndex = angle->end();