| Index: src/pathops/SkDLineIntersection.cpp
|
| diff --git a/src/pathops/SkDLineIntersection.cpp b/src/pathops/SkDLineIntersection.cpp
|
| index bfbbc7e07ecfd4cdc68ce6a209ebd66a2020582a..6fbac978b6e82d99a0e579cf8650524760b76b6a 100644
|
| --- a/src/pathops/SkDLineIntersection.cpp
|
| +++ b/src/pathops/SkDLineIntersection.cpp
|
| @@ -235,12 +235,12 @@ int SkIntersections::horizontal(const SkDLine& line, double left, double right,
|
| }
|
| }
|
| if (fAllowNear || result == 2) {
|
| - if ((t = line.nearPoint(leftPt, NULL)) >= 0) {
|
| + if ((t = line.nearPoint(leftPt, nullptr)) >= 0) {
|
| insert(t, (double) flipped, leftPt);
|
| }
|
| if (left != right) {
|
| const SkDPoint rightPt = { right, y };
|
| - if ((t = line.nearPoint(rightPt, NULL)) >= 0) {
|
| + if ((t = line.nearPoint(rightPt, nullptr)) >= 0) {
|
| insert(t, (double) !flipped, rightPt);
|
| }
|
| for (int index = 0; index < 2; ++index) {
|
| @@ -311,12 +311,12 @@ int SkIntersections::vertical(const SkDLine& line, double top, double bottom,
|
| }
|
| }
|
| if (fAllowNear || result == 2) {
|
| - if ((t = line.nearPoint(topPt, NULL)) >= 0) {
|
| + if ((t = line.nearPoint(topPt, nullptr)) >= 0) {
|
| insert(t, (double) flipped, topPt);
|
| }
|
| if (top != bottom) {
|
| SkDPoint bottomPt = { x, bottom };
|
| - if ((t = line.nearPoint(bottomPt, NULL)) >= 0) {
|
| + if ((t = line.nearPoint(bottomPt, nullptr)) >= 0) {
|
| insert(t, (double) !flipped, bottomPt);
|
| }
|
| for (int index = 0; index < 2; ++index) {
|
|
|