aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/pathops/SkOpAngle.cpp
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-06-05 07:01:06 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-06-05 07:01:06 +0000
commit8f6ef4010f6835c5ce9ede180e50a6a58512a81e (patch)
treec66f46fb0b3242dfb7abbab5386c7d81ce57b375 /src/pathops/SkOpAngle.cpp
parent4a3ca94322510351f7304af2092d6513442ab9d7 (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/SkOpAngle.cpp')
-rw-r--r--src/pathops/SkOpAngle.cpp8
1 files changed, 4 insertions, 4 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);