commit 4eeda37a7456876cb8d509a4ea43c7f4c684477a
author caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Dec 06 21:47:48 2012 +0000
committer caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Dec 06 21:47:48 2012 +0000
tree 293e0167a7dbf33b9fc2a7b0b273911476c8e6c3
parent 4c2443e36fdc6c095b17e90baa4a2f26a6f00b08

shape ops work in progress

overhaul coincident handling

git-svn-id: http://skia.googlecode.com/svn/trunk@6695 2bbb7eff-a529-9590-31e7-b0007b416f81

experimental/Intersection/ShapeOps.cpp

diff --git a/experimental/Intersection/ShapeOps.cpp b/experimental/Intersection/ShapeOps.cpp
index cecfbff..1231ea3 100644
--- a/experimental/Intersection/ShapeOps.cpp
+++ b/experimental/Intersection/ShapeOps.cpp
@@ -232,7 +232,8 @@
     builder.finish();
     const int xorOpMask = builder.xorMask();
     SkTDArray<Op::Contour*> contourList;
-    makeContourList(contours, contourList);
+    makeContourList(contours, contourList, xorMask == kEvenOdd_Mask,
+            xorOpMask == kEvenOdd_Mask);
     Op::Contour** currentPtr = contourList.begin();
     if (!currentPtr) {
         return;
@@ -257,8 +258,7 @@
 #if DEBUG_SHOW_WINDING
     Op::Contour::debugShowWindingValues(contourList);
 #endif
-    coincidenceCheck(contourList, (xorMask == kEvenOdd_Mask)
-            ^ (xorOpMask == kEvenOdd_Mask), total);
+    coincidenceCheck(contourList, total);
 #if DEBUG_SHOW_WINDING
     Op::Contour::debugShowWindingValues(contourList);
 #endif