Index: src/pathops/SkOpSpan.cpp |
diff --git a/src/pathops/SkOpSpan.cpp b/src/pathops/SkOpSpan.cpp |
index df3ef3c9b369aee9e4d02959e057100afde2b761..4d437f7f8835330c4673645dd2439ebe32516d8a 100755 |
--- a/src/pathops/SkOpSpan.cpp |
+++ b/src/pathops/SkOpSpan.cpp |
@@ -44,7 +44,7 @@ SkOpPtT* SkOpPtT::contains(const SkOpSegment* check) { |
return ptT; |
} |
} |
- return NULL; |
+ return nullptr; |
} |
SkOpContour* SkOpPtT::contour() const { |
@@ -65,7 +65,7 @@ SkOpPtT* SkOpPtT::doppelganger() { |
ptT = ptT->fNext; |
} while (stopPtT != ptT); |
SkASSERT(0); |
- return NULL; |
+ return nullptr; |
} |
SkOpPtT* SkOpPtT::find(SkOpSegment* segment) { |
@@ -78,7 +78,7 @@ SkOpPtT* SkOpPtT::find(SkOpSegment* segment) { |
ptT = ptT->fNext; |
} while (stopPtT != ptT); |
SkASSERT(0); |
- return NULL; |
+ return nullptr; |
} |
SkOpGlobalState* SkOpPtT::globalState() const { |
@@ -127,7 +127,7 @@ SkOpPtT* SkOpPtT::remove() { |
prev = next; |
} while (prev != this); |
SkASSERT(0); |
- return NULL; |
+ return nullptr; |
} |
void SkOpPtT::removeNext(SkOpPtT* kept) { |
@@ -252,7 +252,7 @@ SkOpPtT* SkOpSpanBase::contains(const SkOpSegment* segment) { |
return walk; |
} |
} |
- return NULL; |
+ return nullptr; |
} |
bool SkOpSpanBase::containsCoinEnd(const SkOpSegment* segment) const { |
@@ -278,7 +278,7 @@ void SkOpSpanBase::initBase(SkOpSegment* segment, SkOpSpan* prev, double t, cons |
fSegment = segment; |
fPtT.init(this, t, pt, false); |
fCoinEnd = this; |
- fFromAngle = NULL; |
+ fFromAngle = nullptr; |
fPrev = prev; |
fSpanAdds = 0; |
fAligned = true; |
@@ -354,7 +354,7 @@ void SkOpSpan::init(SkOpSegment* segment, SkOpSpan* prev, double t, const SkPoin |
SkASSERT(t != 1); |
initBase(segment, prev, t, pt); |
fCoincident = this; |
- fToAngle = NULL; |
+ fToAngle = nullptr; |
fWindSum = fOppSum = SK_MinS32; |
fWindValue = 1; |
fOppValue = 0; |