diff options
author | 2013-06-05 07:01:06 +0000 | |
---|---|---|
committer | 2013-06-05 07:01:06 +0000 | |
commit | 8f6ef4010f6835c5ce9ede180e50a6a58512a81e (patch) | |
tree | c66f46fb0b3242dfb7abbab5386c7d81ce57b375 /src/pathops | |
parent | 4a3ca94322510351f7304af2092d6513442ab9d7 (diff) |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@9440 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/pathops')
-rw-r--r-- | src/pathops/SkOpAngle.cpp | 8 | ||||
-rw-r--r-- | src/pathops/SkOpAngle.h | 2 | ||||
-rw-r--r-- | src/pathops/SkPathOpsCubic.cpp | 2 | ||||
-rw-r--r-- | src/pathops/SkPathOpsCubic.h | 2 | ||||
-rw-r--r-- | src/pathops/SkPathOpsQuad.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/pathops/SkOpAngle.cpp b/src/pathops/SkOpAngle.cpp index c295bfb9d8..0ac5a3da78 100644 --- a/src/pathops/SkOpAngle.cpp +++ b/src/pathops/SkOpAngle.cpp @@ -30,7 +30,7 @@ static const int bugChar = strlen(funcName) + 1; #define COMPARE_RESULT(append, compare) CompareResult(&bugOut, append, compare) #else - #define COMPARE_RESULT(append, compare) compare + #define COMPARE_RESULT(append, compare) compare #endif bool SkOpAngle::calcSlop(double x, double y, double rx, double ry, bool* result) const{ @@ -105,7 +105,7 @@ bool SkOpAngle::operator<(const SkOpAngle& rh) const { // this/lh: left-hand; r } // at this point, both y's are zero, so lines are coincident or one is degenerate SkASSERT(x * rx != 0); // and a degenerate line should haven't gotten this far - } + } // see if either curve can be lengthened before trying the tangent if (fSegment->other(fEnd) != rh.fSegment // tangents not absolutely identical && rh.fSegment->other(rh.fEnd) != fSegment) { // and not intersecting @@ -133,7 +133,7 @@ bool SkOpAngle::operator<(const SkOpAngle& rh) const { // this/lh: left-hand; r // if the vector was a result of subdividing a curve, see if it is stable bool sloppy1 = x_ry < rx_y; bool sloppy2 = !sloppy1; - if ((!fComputed || calcSlop(x, y, rx, ry, &sloppy1)) + if ((!fComputed || calcSlop(x, y, rx, ry, &sloppy1)) && (!rh.fComputed || rh.calcSlop(rx, ry, x, y, &sloppy2)) && sloppy1 != sloppy2) { return COMPARE_RESULT("8 CalcSlop(x, y ...", sloppy1); @@ -384,7 +384,7 @@ void SkOpAngle::setSpans() { fUnsortable = fSegment->isTiny(this); return; } - } + } } break; default: SkASSERT(0); diff --git a/src/pathops/SkOpAngle.h b/src/pathops/SkOpAngle.h index cca1a224dd..2800ff0568 100644 --- a/src/pathops/SkOpAngle.h +++ b/src/pathops/SkOpAngle.h @@ -81,7 +81,7 @@ private: // if subdividing a quad or cubic causes the tangent to go from the maximum angle to the // minimum, mark it unorderable. It still can be sorted, which is good enough for find-top // but can't be ordered, and therefore can't be used to compute winding - bool fUnorderable; + bool fUnorderable; mutable bool fUnsortable; // this alone is editable by the less than operator #if DEBUG_ANGLE int fID; diff --git a/src/pathops/SkPathOpsCubic.cpp b/src/pathops/SkPathOpsCubic.cpp index c644a67117..5d77e5ab89 100644 --- a/src/pathops/SkPathOpsCubic.cpp +++ b/src/pathops/SkPathOpsCubic.cpp @@ -407,7 +407,7 @@ SkDCubic SkDCubic::subDivide(double t1, double t2) const { return dst; } -void SkDCubic::align(int endIndex, int ctrlIndex, SkDPoint* dstPt) const { +void SkDCubic::align(int endIndex, int ctrlIndex, SkDPoint* dstPt) const { if (fPts[endIndex].fX == fPts[ctrlIndex].fX) { dstPt->fX = fPts[endIndex].fX; } diff --git a/src/pathops/SkPathOpsCubic.h b/src/pathops/SkPathOpsCubic.h index c884ea9714..7be614290d 100644 --- a/src/pathops/SkPathOpsCubic.h +++ b/src/pathops/SkPathOpsCubic.h @@ -33,7 +33,7 @@ struct SkDCubic { const SkDPoint& operator[](int n) const { SkASSERT(n >= 0 && n < 4); return fPts[n]; } SkDPoint& operator[](int n) { SkASSERT(n >= 0 && n < 4); return fPts[n]; } - void align(int endIndex, int ctrlIndex, SkDPoint* dstPt) const; + void align(int endIndex, int ctrlIndex, SkDPoint* dstPt) const; double calcPrecision() const; SkDCubicPair chopAt(double t) const; bool clockwise() const; diff --git a/src/pathops/SkPathOpsQuad.cpp b/src/pathops/SkPathOpsQuad.cpp index ce89469062..3cbc28abf4 100644 --- a/src/pathops/SkPathOpsQuad.cpp +++ b/src/pathops/SkPathOpsQuad.cpp @@ -221,7 +221,7 @@ SkDQuad SkDQuad::subDivide(double t1, double t2) const { return dst; } -void SkDQuad::align(int endIndex, SkDPoint* dstPt) const { +void SkDQuad::align(int endIndex, SkDPoint* dstPt) const { if (fPts[endIndex].fX == fPts[1].fX) { dstPt->fX = fPts[endIndex].fX; } |