commit 9f3e9a5a17a7546e1c5bfde1eb7e6e9c11870333
author caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Dec 10 12:50:53 2012 +0000
committer caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Dec 10 12:50:53 2012 +0000
tree ae5da5d81ac9a66b747b358d30816751239b4d1a
parent f8b1ebc35b6872c2805a22481b7c23b85486fb46

shape ops work in progress

rewrite binary edge inclusion lookup
fix warnings

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

experimental/Intersection/EdgeWalker.cpp

diff --git a/experimental/Intersection/EdgeWalker.cpp b/experimental/Intersection/EdgeWalker.cpp
index 47bd037..12fe30d 100644
--- a/experimental/Intersection/EdgeWalker.cpp
+++ b/experimental/Intersection/EdgeWalker.cpp
@@ -741,7 +741,7 @@
 
     bool isEmpty() {
         return fLeft > fRight || fTop > fBottom
-                || fLeft == fRight && fTop == fBottom
+                || (fLeft == fRight && fTop == fBottom)
                 || isnan(fLeft) || isnan(fRight)
                 || isnan(fTop) || isnan(fBottom);
     }
@@ -2206,7 +2206,7 @@
 
 static void skipCoincidence(int lastWinding, int winding, int windingMask,
             ActiveEdge* activePtr, ActiveEdge* firstCoincident) {
-    if (((lastWinding & windingMask) == 0) ^ (winding & windingMask) != 0) {
+    if (((lastWinding & windingMask) == 0) ^ ((winding & windingMask) != 0)) {
         return;
     }
     // FIXME: ? shouldn't this be if (lastWinding & windingMask) ?