shape ops work in progress (get rid of some warnings)
git-svn-id: http://skia.googlecode.com/svn/trunk@4037 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/SimplifyFindTop_Test.cpp b/experimental/Intersection/SimplifyFindTop_Test.cpp
index 3932f5a..9c9548e 100644
--- a/experimental/Intersection/SimplifyFindTop_Test.cpp
+++ b/experimental/Intersection/SimplifyFindTop_Test.cpp
@@ -17,15 +17,14 @@
static const SimplifyFindTopTest::Segment* testCommon(
SkTArray<SimplifyFindTopTest::Contour>& contours,
- SimplifyFindTopTest::EdgeBuilder& builder, const SkPath& path,
int& index, int& end) {
SkTDArray<SimplifyFindTopTest::Contour*> contourList;
makeContourList(contours, contourList);
- addIntersectTs(contourList[0], contourList[0], -1);
+ addIntersectTs(contourList[0], contourList[0]);
if (contours.count() > 1) {
SkASSERT(contours.count() == 2);
- addIntersectTs(contourList[0], contourList[1], -1);
- addIntersectTs(contourList[1], contourList[1], -1);
+ addIntersectTs(contourList[0], contourList[1]);
+ addIntersectTs(contourList[1], contourList[1]);
}
fixOtherTIndex(contourList);
SimplifyFindTopTest::Segment* topStart = findTopContour(contourList,
@@ -39,7 +38,7 @@
SkTArray<SimplifyFindTopTest::Contour> contours;
SimplifyFindTopTest::EdgeBuilder builder(path, contours);
int index, end;
- testCommon(contours, builder, path, index, end);
+ testCommon(contours, index, end);
SkASSERT(index + 1 == end);
}
@@ -49,7 +48,7 @@
SimplifyFindTopTest::EdgeBuilder builder(path, contours);
int index, end;
const SimplifyFindTopTest::Segment* topSegment =
- testCommon(contours, builder, path, index, end);
+ testCommon(contours, index, end);
SkPoint pts[2];
double firstT = topSegment->t(index);
topSegment->xyAtT(firstT, &pts[0]);