| Index: src/pathops/SkDQuadLineIntersection.cpp
|
| diff --git a/src/pathops/SkDQuadLineIntersection.cpp b/src/pathops/SkDQuadLineIntersection.cpp
|
| index 5e3596ec208e6b436ae13514cbf4e4acf5f021c0..64eb86848e8270f24ece2815fab87a47c43fd3fc 100644
|
| --- a/src/pathops/SkDQuadLineIntersection.cpp
|
| +++ b/src/pathops/SkDQuadLineIntersection.cpp
|
| @@ -103,8 +103,8 @@ public:
|
|
|
| LineQuadraticIntersections(const SkDQuad& q)
|
| : fQuad(q)
|
| - SkDEBUGPARAMS(fLine(NULL))
|
| - SkDEBUGPARAMS(fIntersections(NULL))
|
| + SkDEBUGPARAMS(fLine(nullptr))
|
| + SkDEBUGPARAMS(fIntersections(nullptr))
|
| SkDEBUGPARAMS(fAllowNear(false)) {
|
| }
|
|
|
| @@ -117,7 +117,7 @@ public:
|
| for (int index = 0; index < last; ) {
|
| double quadMidT = ((*fIntersections)[0][index] + (*fIntersections)[0][index + 1]) / 2;
|
| SkDPoint quadMidPt = fQuad.ptAtT(quadMidT);
|
| - double t = fLine->nearPoint(quadMidPt, NULL);
|
| + double t = fLine->nearPoint(quadMidPt, nullptr);
|
| if (t < 0) {
|
| ++index;
|
| continue;
|
| @@ -291,7 +291,7 @@ protected:
|
| if (fIntersections->hasT(quadT)) {
|
| continue;
|
| }
|
| - double lineT = fLine->nearPoint(fQuad[qIndex], NULL);
|
| + double lineT = fLine->nearPoint(fQuad[qIndex], nullptr);
|
| if (lineT < 0) {
|
| continue;
|
| }
|
|
|