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
diff --git a/experimental/Intersection/QuadraticReduceOrder.cpp b/experimental/Intersection/QuadraticReduceOrder.cpp
index 3904817..b68a68b 100644
--- a/experimental/Intersection/QuadraticReduceOrder.cpp
+++ b/experimental/Intersection/QuadraticReduceOrder.cpp
@@ -100,13 +100,13 @@
return 2;
}
replace = (extrema.x < quad[0].x | extrema.x < quad[2].x)
- ^ quad[0].x < quad[2].x;
+ ^ (quad[0].x < quad[2].x);
} else {
if (extrema.y < quad[0].y ^ extrema.y < quad[2].y) {
return 2;
}
replace = (extrema.y < quad[0].y | extrema.y < quad[2].y)
- ^ quad[0].y < quad[2].y;
+ ^ (quad[0].y < quad[2].y);
}
reduction[replace] = extrema;
}