AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Skia_Periodic_House_Keeping

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@6425 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2012-11-15 02:01:17 +00:00
parent 9b21c25e74
commit b3b6a60d35
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
experimental/Intersection/Simplify.cpp
View File

@ -1465,7 +1465,7 @@ public:
other.addCancelOutsides(tStart, oStart, *this, endT); other.addCancelOutsides(tStart, oStart, *this, endT);
} }
} }
int bumpCoincidentThis(const Span* oTest, const bool transfer, const bool decrementThis, int bumpCoincidentThis(const Span* oTest, const bool transfer, const bool decrementThis,
const bool thisXor, const bool opp, int index, SkTDArray<double>& outsideTs, const bool thisXor, const bool opp, int index, SkTDArray<double>& outsideTs,
SkTDArray<double>& xOutsideTs) SkTDArray<double>& xOutsideTs)
@ -1584,10 +1584,10 @@ public:
if (decrementThis) { if (decrementThis) {
oIndex = other.bumpCoincidentOther(test, transfer, decrementThis, otherXor, opp, oIndex = other.bumpCoincidentOther(test, transfer, decrementThis, otherXor, opp,
tRatio, oEndT, oIndex, oOutsideTs); tRatio, oEndT, oIndex, oOutsideTs);
index = bumpCoincidentThis(oTest, transfer, decrementThis, thisXor, opp, index = bumpCoincidentThis(oTest, transfer, decrementThis, thisXor, opp,
index, outsideTs, xOutsideTs); index, outsideTs, xOutsideTs);
} else { } else {
index = bumpCoincidentThis(oTest, transfer, decrementThis, thisXor, opp, index = bumpCoincidentThis(oTest, transfer, decrementThis, thisXor, opp,
index, outsideTs, xOutsideTs); index, outsideTs, xOutsideTs);
oIndex = other.bumpCoincidentOther(test, transfer, decrementThis, otherXor, opp, oIndex = other.bumpCoincidentOther(test, transfer, decrementThis, otherXor, opp,
tRatio, oEndT, oIndex, oOutsideTs); tRatio, oEndT, oIndex, oOutsideTs);
@ -3048,7 +3048,7 @@ public:
SkASSERT(angle->segment() == this); SkASSERT(angle->segment() == this);
return oppSign(angle->start(), angle->end()); return oppSign(angle->start(), angle->end());
} }
int oppSign(int startIndex, int endIndex) const { int oppSign(int startIndex, int endIndex) const {
int result = startIndex < endIndex ? -fTs[startIndex].fOppValue int result = startIndex < endIndex ? -fTs[startIndex].fOppValue
: fTs[endIndex].fOppValue; : fTs[endIndex].fOppValue;
@ -3473,7 +3473,7 @@ public:
wind = windSum; wind = windSum;
} }
if (!oppoSign) { if (!oppoSign) {
SkDebugf(" %d->%d (max=%d)", last, wind, SkDebugf(" %d->%d (max=%d)", last, wind,
useInnerWinding(last, wind) ? wind : last); useInnerWinding(last, wind) ? wind : last);
} else { } else {
SkDebugf(" %d->%d (%d->%d)", last, wind, opp ? lastSum : oppLastSum, SkDebugf(" %d->%d (%d->%d)", last, wind, opp ? lastSum : oppLastSum,