commit c83c70e911a38aea03db4af8dd9841d0d77bd129
author caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Feb 22 21:50:07 2013 +0000
committer caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Feb 22 21:50:07 2013 +0000
tree c957cfecc8e073f178dc13aae8a16d9bd3653e8c
parent f8d7d2731318cdf510ab68e6b3f5ec68ab22c8e2

shape ops work in progress

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

experimental/Intersection/ShapeOps.cpp

diff --git a/experimental/Intersection/ShapeOps.cpp b/experimental/Intersection/ShapeOps.cpp
index 57aedd6..bc390c7 100644
--- a/experimental/Intersection/ShapeOps.cpp
+++ b/experimental/Intersection/ShapeOps.cpp
@@ -215,6 +215,9 @@
 
 
 void operate(const SkPath& one, const SkPath& two, ShapeOp op, SkPath& result) {
+#if DEBUG_SORT
+    Op::gDebugSortCount = Op::gDebugSortCountDefault;
+#endif
     result.reset();
     result.setFillType(SkPath::kEvenOdd_FillType);
     // turn path into list of segments
@@ -237,6 +240,9 @@
     do {
         Op::Contour** nextPtr = currentPtr;
         Op::Contour* current = *currentPtr++;
+        if (current->containsCubics()) {
+            addSelfIntersectTs(current);
+        }
         Op::Contour* next;
         do {
             next = *nextPtr++;