Index: src/pathops/SkDConicLineIntersection.cpp |
diff --git a/src/pathops/SkDConicLineIntersection.cpp b/src/pathops/SkDConicLineIntersection.cpp |
index 620e99c8ae4490883435c04be004a7671e29cc4f..a70307a53e9bddbd307e2601e3f7b6c63a34e8bc 100644 |
--- a/src/pathops/SkDConicLineIntersection.cpp |
+++ b/src/pathops/SkDConicLineIntersection.cpp |
@@ -80,7 +80,7 @@ public: |
double conicT = roots[index]; |
SkDPoint pt = fConic.ptAtT(conicT); |
SkDEBUGCODE_(double conicVals[] = { fConic[0].fY, fConic[1].fY, fConic[2].fY }); |
- SkASSERT(close_to(pt.fY, axisIntercept, conicVals)); |
+ SkOPOBJASSERT(fIntersections, close_to(pt.fY, axisIntercept, conicVals)); |
double lineT = (pt.fX - left) / (right - left); |
if (this->pinTs(&conicT, &lineT, &pt, kPointInitialized) |
&& this->uniqueAnswer(conicT, pt)) { |
@@ -158,9 +158,7 @@ public: |
double conicT = roots[index]; |
SkDPoint pt = fConic.ptAtT(conicT); |
SkDEBUGCODE_(double conicVals[] = { fConic[0].fX, fConic[1].fX, fConic[2].fX }); |
- SkASSERT((fIntersections->debugGlobalState() && |
- fIntersections->debugGlobalState()->debugSkipAssert()) || |
- close_to(pt.fX, axisIntercept, conicVals)); |
+ SkOPOBJASSERT(fIntersections, close_to(pt.fX, axisIntercept, conicVals)); |
double lineT = (pt.fY - top) / (bottom - top); |
if (this->pinTs(&conicT, &lineT, &pt, kPointInitialized) |
&& this->uniqueAnswer(conicT, pt)) { |