From a4aced47281e085201a356ce888b92138846e9f6 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Tue, 9 Jul 2013 07:00:56 +0000 Subject: [PATCH] Sanitizing source files in Housekeeper-Nightly git-svn-id: http://skia.googlecode.com/svn/trunk@9919 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/pathops/SkDCubicLineIntersection.cpp | 2 +- src/pathops/SkDQuadLineIntersection.cpp | 2 +- src/pathops/SkOpEdgeBuilder.cpp | 2 +- src/pathops/SkOpSegment.cpp | 2 +- src/pathops/SkPathOpsDebug.cpp | 1 - tests/PathOpsCubicLineIntersectionTest.cpp | 4 ++-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/pathops/SkDCubicLineIntersection.cpp b/src/pathops/SkDCubicLineIntersection.cpp index 418e107e41..f86a21ccc1 100644 --- a/src/pathops/SkDCubicLineIntersection.cpp +++ b/src/pathops/SkDCubicLineIntersection.cpp @@ -182,7 +182,7 @@ void addEndPoints() { if (foundEnd) { continue; } - // See if the cubic end touches the line. + // See if the cubic end touches the line. double dist = line.isLeft(cubic[cIndex]); // this distance isn't cartesian SkDVector lineLen = line[1] - line[0]; // the x/y magnitudes of the line // compute the ULPS of the larger of the x/y deltas diff --git a/src/pathops/SkDQuadLineIntersection.cpp b/src/pathops/SkDQuadLineIntersection.cpp index 216e31f285..98e38621e0 100644 --- a/src/pathops/SkDQuadLineIntersection.cpp +++ b/src/pathops/SkDQuadLineIntersection.cpp @@ -210,7 +210,7 @@ protected: if (foundEnd) { continue; } - // See if the quad end touches the line. + // See if the quad end touches the line. double dist = line.isLeft(quad[qIndex]); // this distance isn't cartesian SkDVector lineLen = line[1] - line[0]; // the x/y magnitudes of the line // compute the ULPS of the larger of the x/y deltas diff --git a/src/pathops/SkOpEdgeBuilder.cpp b/src/pathops/SkOpEdgeBuilder.cpp index 5187b5f1e6..a5a6584868 100644 --- a/src/pathops/SkOpEdgeBuilder.cpp +++ b/src/pathops/SkOpEdgeBuilder.cpp @@ -45,7 +45,7 @@ void SkOpEdgeBuilder::closeContour(const SkPoint& curveEnd, const SkPoint& curve if ((!AlmostEqualUlps(curveEnd.fX, curveStart.fX) || !AlmostEqualUlps(curveEnd.fY, curveStart.fY))) { fPathVerbs.push_back(SkPath::kLine_Verb); - fPathPts.push_back_n(1, &curveStart); + fPathPts.push_back_n(1, &curveStart); } else { if (curveEnd.fX != curveStart.fX || curveEnd.fY != curveStart.fY) { fPathPts[fPathPts.count() - 1] = curveStart; diff --git a/src/pathops/SkOpSegment.cpp b/src/pathops/SkOpSegment.cpp index 54e44904f4..8bd4cc275a 100644 --- a/src/pathops/SkOpSegment.cpp +++ b/src/pathops/SkOpSegment.cpp @@ -2567,7 +2567,7 @@ int SkOpSegment::windingAtT(double tHit, int tIndex, bool crossOpp, SkScalar* dx #endif return SK_MinS32; } - if (windVal < 0) { // reverse sign if opp contour traveled in reverse + if (windVal < 0) { // reverse sign if opp contour traveled in reverse *dx = -*dx; } if (winding * *dx > 0) { // if same signs, result is negative diff --git a/src/pathops/SkPathOpsDebug.cpp b/src/pathops/SkPathOpsDebug.cpp index 1071b52050..1436c8eae4 100644 --- a/src/pathops/SkPathOpsDebug.cpp +++ b/src/pathops/SkPathOpsDebug.cpp @@ -86,4 +86,3 @@ void DebugBumpTestName(char* test) { SK_SNPRINTF(num, DEBUG_FILENAME_STRING_LENGTH - (num - test), "%d", dec); } #endif - diff --git a/tests/PathOpsCubicLineIntersectionTest.cpp b/tests/PathOpsCubicLineIntersectionTest.cpp index c5f05f6f6d..29c04ae7b8 100644 --- a/tests/PathOpsCubicLineIntersectionTest.cpp +++ b/tests/PathOpsCubicLineIntersectionTest.cpp @@ -87,8 +87,8 @@ static void PathOpsCubicLineIntersectionTestOne(skiatest::Reporter* reporter) { SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", prevL.fX, prevL.fY, i.pt(0).fX, i.pt(0).fY); SkDPoint nextL = line.xyAtT(i[1][0] + 0.0000007); SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", i.pt(0).fX, i.pt(0).fY, nextL.fX, nextL.fY); - SkDebugf("prevD=%1.9g dist=%1.9g nextD=%1.9g\n", prev.distance(nextL), - sect.distance(i.pt(0)), cubic[3].distance(prevL)); + SkDebugf("prevD=%1.9g dist=%1.9g nextD=%1.9g\n", prev.distance(nextL), + sect.distance(i.pt(0)), cubic[3].distance(prevL)); #endif }