diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-10 12:50:53 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-10 12:50:53 +0000 |
| commit | 9f3e9a5a17a7546e1c5bfde1eb7e6e9c11870333 (patch) | |
| tree | ae5da5d81ac9a66b747b358d30816751239b4d1a /experimental/Intersection/LineIntersection.cpp | |
| parent | f8b1ebc35b6872c2805a22481b7c23b85486fb46 (diff) | |
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
Diffstat (limited to 'experimental/Intersection/LineIntersection.cpp')
| -rw-r--r-- | experimental/Intersection/LineIntersection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/experimental/Intersection/LineIntersection.cpp b/experimental/Intersection/LineIntersection.cpp index 11f42ba2d5..c425cd1ff5 100644 --- a/experimental/Intersection/LineIntersection.cpp +++ b/experimental/Intersection/LineIntersection.cpp @@ -95,11 +95,11 @@ int intersect(const _Line& a, const _Line& b, double aRange[2], double bRange[2] double ab0y = a[0].y - b[0].y; double ab0x = a[0].x - b[0].x; double numerA = ab0y * bxLen - byLen * ab0x; - if (numerA < 0 && denom > numerA || numerA > 0 && denom < numerA) { + if ((numerA < 0 && denom > numerA) || (numerA > 0 && denom < numerA)) { return 0; } double numerB = ab0y * axLen - ayLen * ab0x; - if (numerB < 0 && denom > numerB || numerB > 0 && denom < numerB) { + if ((numerB < 0 && denom > numerB) || (numerB > 0 && denom < numerB)) { return 0; } /* Is the intersection along the the segments */ |