shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@7788 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/ConvexHull.cpp b/experimental/Intersection/ConvexHull.cpp
index e9a08c2..86cb2dc 100644
--- a/experimental/Intersection/ConvexHull.cpp
+++ b/experimental/Intersection/ConvexHull.cpp
@@ -113,10 +113,10 @@
int lower0Index = 1;
int upper0Index = 1;
for (index = 2; index < 4; ++index) {
- if (approximately_greater(projectedY[lower0Index], projectedY[index])) {
+ if (approximately_greater_or_equal(projectedY[lower0Index], projectedY[index])) {
lower0Index = index;
}
- if (approximately_lesser(projectedY[upper0Index], projectedY[index])) {
+ if (approximately_lesser_or_equal(projectedY[upper0Index], projectedY[index])) {
upper0Index = index;
}
}
@@ -129,10 +129,10 @@
int lower3Index = 2;
int upper3Index = 2;
for (index = 1; index > -1; --index) {
- if (approximately_greater(projectedY[lower3Index], projectedY[index])) {
+ if (approximately_greater_or_equal(projectedY[lower3Index], projectedY[index])) {
lower3Index = index;
}
- if (approximately_lesser(projectedY[upper3Index], projectedY[index])) {
+ if (approximately_lesser_or_equal(projectedY[upper3Index], projectedY[index])) {
upper3Index = index;
}
}