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/ActiveEdge_Test.cpp

diff --git a/experimental/Intersection/ActiveEdge_Test.cpp b/experimental/Intersection/ActiveEdge_Test.cpp
index 8ded8ff..1ac340e4 100755
--- a/experimental/Intersection/ActiveEdge_Test.cpp
+++ b/experimental/Intersection/ActiveEdge_Test.cpp
@@ -48,10 +48,10 @@
 // older code that worked mostly
 static bool operator_less_than(const UnitTest::ActiveEdge& lh,
         const UnitTest::ActiveEdge& rh) {
-    if (rh.fAbove.fY - lh.fAbove.fY > lh.fBelow.fY - rh.fAbove.fY
-            && lh.fBelow.fY < rh.fBelow.fY
-            || lh.fAbove.fY - rh.fAbove.fY < rh.fBelow.fY - lh.fAbove.fY
-            && rh.fBelow.fY < lh.fBelow.fY) {
+    if ((rh.fAbove.fY - lh.fAbove.fY > lh.fBelow.fY - rh.fAbove.fY
+            && lh.fBelow.fY < rh.fBelow.fY)
+            || (lh.fAbove.fY - rh.fAbove.fY < rh.fBelow.fY - lh.fAbove.fY
+            && rh.fBelow.fY < lh.fBelow.fY)) {
         const SkPoint& check = rh.fBelow.fY <= lh.fBelow.fY
                 && lh.fBelow != rh.fBelow ? rh.fBelow :
                 rh.fAbove;