shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@7453 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/QuadraticImplicit.cpp b/experimental/Intersection/QuadraticImplicit.cpp
index a72a57d..660ffe5 100644
--- a/experimental/Intersection/QuadraticImplicit.cpp
+++ b/experimental/Intersection/QuadraticImplicit.cpp
@@ -110,7 +110,7 @@
}
}
}
- assert(i.fUsed < 3);
+ SkASSERT(i.fUsed < 3);
return true;
tryNextHalfPlane:
;
@@ -340,7 +340,7 @@
perp[1].y += dxdy.x;
Intersections hitData;
int hits = intersectRay(*qs[qIdx ^ 1], perp, hitData);
- assert(hits <= 1);
+ SkASSERT(hits <= 1);
if (hits) {
if (flip < 0) {
_Point dxdy2;
@@ -397,7 +397,7 @@
if ((t = axialIntersect(q2, q1[2], useVertical)) >= 0) {
i.addCoincident(1, t);
}
- assert(i.fCoincidentUsed <= 2);
+ SkASSERT(i.fCoincidentUsed <= 2);
return i.fCoincidentUsed > 0;
}
double roots1[4], roots2[4];