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/QuadraticBezierClip.cpp b/experimental/Intersection/QuadraticBezierClip.cpp
index 6100914..0e948a0 100644
--- a/experimental/Intersection/QuadraticBezierClip.cpp
+++ b/experimental/Intersection/QuadraticBezierClip.cpp
@@ -7,7 +7,6 @@
#include "CurveIntersection.h"
#include "CurveUtilities.h"
#include "LineParameters.h"
-#include <algorithm> // used for std::swap
#define DEBUG_BEZIER_CLIP 1
@@ -24,7 +23,7 @@
endLine.quadEndPoints(q1);
if (!endLine.normalize()) {
printf("line cannot be normalized: need more code here\n");
- assert(0);
+ SkASSERT(0);
return false;
}
@@ -34,7 +33,7 @@
double top = 0;
double bottom = distance / 2; // http://students.cs.byu.edu/~tom/557/text/cic.pdf (7.6)
if (top > bottom) {
- std::swap(top, bottom);
+ SkTSwap(top, bottom);
}
// compute intersecting candidate distance