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/CubicIntersection.cpp b/experimental/Intersection/CubicIntersection.cpp
index 9316f34..bedbfa1 100644
--- a/experimental/Intersection/CubicIntersection.cpp
+++ b/experimental/Intersection/CubicIntersection.cpp
@@ -287,7 +287,7 @@
}
#if SK_DEBUG
++debugDepth;
- assert(debugDepth < 10);
+ SkASSERT(debugDepth < 10);
#endif
i.swap();
intersect2(cubic2, SkTMax(to2 - dt2, 0.), SkTMin(to2 + dt2, 1.),
@@ -340,12 +340,12 @@
double tMin, tMax;
tMin = tMax = local1.fT[0][0];
for (int index = 1; index < local1.fUsed; ++index) {
- tMin = std::min(tMin, local1.fT[0][index]);
- tMax = std::max(tMax, local1.fT[0][index]);
+ tMin = SkTMin(tMin, local1.fT[0][index]);
+ tMax = SkTMax(tMax, local1.fT[0][index]);
}
for (int index = 1; index < local2.fUsed; ++index) {
- tMin = std::min(tMin, local2.fT[0][index]);
- tMax = std::max(tMax, local2.fT[0][index]);
+ tMin = SkTMin(tMin, local2.fT[0][index]);
+ tMax = SkTMax(tMax, local2.fT[0][index]);
}
#if SK_DEBUG
debugDepth = 0;