diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/pathops/SkDConicLineIntersection.cpp | |
| parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) | |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'src/pathops/SkDConicLineIntersection.cpp')
| -rw-r--r-- | src/pathops/SkDConicLineIntersection.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pathops/SkDConicLineIntersection.cpp b/src/pathops/SkDConicLineIntersection.cpp index c9d825d56c..e6d775f76e 100644 --- a/src/pathops/SkDConicLineIntersection.cpp +++ b/src/pathops/SkDConicLineIntersection.cpp @@ -25,8 +25,8 @@ public: LineConicIntersections(const SkDConic& c) : fConic(c) - SkDEBUGPARAMS(fLine(NULL)) - SkDEBUGPARAMS(fIntersections(NULL)) + SkDEBUGPARAMS(fLine(nullptr)) + SkDEBUGPARAMS(fIntersections(nullptr)) SkDEBUGPARAMS(fAllowNear(false)) { } @@ -39,7 +39,7 @@ public: for (int index = 0; index < last; ) { double conicMidT = ((*fIntersections)[0][index] + (*fIntersections)[0][index + 1]) / 2; SkDPoint conicMidPt = fConic.ptAtT(conicMidT); - double t = fLine->nearPoint(conicMidPt, NULL); + double t = fLine->nearPoint(conicMidPt, nullptr); if (t < 0) { ++index; continue; @@ -186,7 +186,7 @@ protected: if (fIntersections->hasT(conicT)) { continue; } - double lineT = fLine->nearPoint(fConic[cIndex], NULL); + double lineT = fLine->nearPoint(fConic[cIndex], nullptr); if (lineT < 0) { continue; } |