Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@9919 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
parent
d8d976e7d2
commit
a4aced4728
@ -182,7 +182,7 @@ void addEndPoints() {
|
|||||||
if (foundEnd) {
|
if (foundEnd) {
|
||||||
continue;
|
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
|
double dist = line.isLeft(cubic[cIndex]); // this distance isn't cartesian
|
||||||
SkDVector lineLen = line[1] - line[0]; // the x/y magnitudes of the line
|
SkDVector lineLen = line[1] - line[0]; // the x/y magnitudes of the line
|
||||||
// compute the ULPS of the larger of the x/y deltas
|
// compute the ULPS of the larger of the x/y deltas
|
||||||
|
@ -210,7 +210,7 @@ protected:
|
|||||||
if (foundEnd) {
|
if (foundEnd) {
|
||||||
continue;
|
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
|
double dist = line.isLeft(quad[qIndex]); // this distance isn't cartesian
|
||||||
SkDVector lineLen = line[1] - line[0]; // the x/y magnitudes of the line
|
SkDVector lineLen = line[1] - line[0]; // the x/y magnitudes of the line
|
||||||
// compute the ULPS of the larger of the x/y deltas
|
// compute the ULPS of the larger of the x/y deltas
|
||||||
|
@ -45,7 +45,7 @@ void SkOpEdgeBuilder::closeContour(const SkPoint& curveEnd, const SkPoint& curve
|
|||||||
if ((!AlmostEqualUlps(curveEnd.fX, curveStart.fX)
|
if ((!AlmostEqualUlps(curveEnd.fX, curveStart.fX)
|
||||||
|| !AlmostEqualUlps(curveEnd.fY, curveStart.fY))) {
|
|| !AlmostEqualUlps(curveEnd.fY, curveStart.fY))) {
|
||||||
fPathVerbs.push_back(SkPath::kLine_Verb);
|
fPathVerbs.push_back(SkPath::kLine_Verb);
|
||||||
fPathPts.push_back_n(1, &curveStart);
|
fPathPts.push_back_n(1, &curveStart);
|
||||||
} else {
|
} else {
|
||||||
if (curveEnd.fX != curveStart.fX || curveEnd.fY != curveStart.fY) {
|
if (curveEnd.fX != curveStart.fX || curveEnd.fY != curveStart.fY) {
|
||||||
fPathPts[fPathPts.count() - 1] = curveStart;
|
fPathPts[fPathPts.count() - 1] = curveStart;
|
||||||
|
@ -2567,7 +2567,7 @@ int SkOpSegment::windingAtT(double tHit, int tIndex, bool crossOpp, SkScalar* dx
|
|||||||
#endif
|
#endif
|
||||||
return SK_MinS32;
|
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;
|
*dx = -*dx;
|
||||||
}
|
}
|
||||||
if (winding * *dx > 0) { // if same signs, result is negative
|
if (winding * *dx > 0) { // if same signs, result is negative
|
||||||
|
@ -86,4 +86,3 @@ void DebugBumpTestName(char* test) {
|
|||||||
SK_SNPRINTF(num, DEBUG_FILENAME_STRING_LENGTH - (num - test), "%d", dec);
|
SK_SNPRINTF(num, DEBUG_FILENAME_STRING_LENGTH - (num - test), "%d", dec);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -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);
|
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);
|
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("{{%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),
|
SkDebugf("prevD=%1.9g dist=%1.9g nextD=%1.9g\n", prev.distance(nextL),
|
||||||
sect.distance(i.pt(0)), cubic[3].distance(prevL));
|
sect.distance(i.pt(0)), cubic[3].distance(prevL));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user