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/SimplifyNew_Test.cpp b/experimental/Intersection/SimplifyNew_Test.cpp
index b989eba..7fbe4d0 100644
--- a/experimental/Intersection/SimplifyNew_Test.cpp
+++ b/experimental/Intersection/SimplifyNew_Test.cpp
@@ -18,12 +18,11 @@
static SkBitmap bitmap;
-static bool testSimplifyx(const SkPath& path, bool fill, SkPath& out,
- SkBitmap& bitmap) {
+static bool testSimplifyx(const SkPath& path, SkPath& out, SkBitmap& bitmap) {
if (false) {
showPath(path);
}
- simplifyx(path, fill, out);
+ simplifyx(path, out);
if (false) {
return true;
}
@@ -36,7 +35,7 @@
path.lineTo(1,1);
path.lineTo(0,0);
path.close();
- testSimplifyx(path, true, simple, bitmap);
+ testSimplifyx(path, simple, bitmap);
}
static void addInnerCWTriangle(SkPath& path) {
@@ -46,12 +45,14 @@
path.close();
}
+#if DEBUG_UNUSED
static void addInnerCCWTriangle(SkPath& path) {
path.moveTo(3,0);
path.lineTo(2,1);
path.lineTo(4,1);
path.close();
}
+#endif
static void addOuterCWTriangle(SkPath& path) {
path.moveTo(3,0);
@@ -60,18 +61,20 @@
path.close();
}
+#if DEBUG_UNUSED
static void addOuterCCWTriangle(SkPath& path) {
path.moveTo(3,0);
path.lineTo(0,2);
path.lineTo(6,2);
path.close();
}
+#endif
static void testLine2() {
SkPath path, simple;
addInnerCWTriangle(path);
addOuterCWTriangle(path);
- testSimplifyx(path, true, simple, bitmap);
+ testSimplifyx(path, simple, bitmap);
}