diff options
| -rw-r--r-- | src/core/SkBitmapProcShader.cpp | 1 | ||||
| -rw-r--r-- | src/pathops/SkOpSegment.cpp | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp index e0d281b026..e4309b67f4 100644 --- a/src/core/SkBitmapProcShader.cpp +++ b/src/core/SkBitmapProcShader.cpp @@ -205,7 +205,6 @@ size_t SkBitmapProcLegacyShader::ContextSize(const ContextRec& rec, const SkImag size_t size1 = sizeof(LinearPipelineContext) + sizeof(SkBitmapProcInfo); size_t s = SkTMax(size0, size1); return s; - return SkTMax(size0, size1); } SkShader::Context* SkBitmapProcLegacyShader::MakeContext(const SkShader& shader, diff --git a/src/pathops/SkOpSegment.cpp b/src/pathops/SkOpSegment.cpp index 439392fc4f..f3f874710e 100644 --- a/src/pathops/SkOpSegment.cpp +++ b/src/pathops/SkOpSegment.cpp @@ -1058,9 +1058,6 @@ SkOpSegment* SkOpSegment::nextChase(SkOpSpanBase** startPtr, int* stepPtr, SkOpS return set_last(last, endSpan); } SkASSERT(*startPtr); - if (!otherEnd) { - return nullptr; - } // SkASSERT(otherEnd >= 0); SkOpSpan* origMin = step < 0 ? origStart->prev() : origStart->upCast(); SkOpSpan* foundMin = foundSpan->starter(otherEnd); |