commit 2ef7d84c0f97965a2e76ffe8f172eea38a8cb140
author caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 25 13:39:12 2013 +0000
committer caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 25 13:39:12 2013 +0000
tree 7c4fc490da241a089bd967f1a62838bb56e0e025
parent 217e4912b5d4a39a9542b467706a2058c295f379

fix pathops quad line intersection

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

pathops/SkDQuadLineIntersection.cpp

diff --git a/pathops/SkDQuadLineIntersection.cpp b/pathops/SkDQuadLineIntersection.cpp
index 8fce7a0..bae003c 100644
--- a/pathops/SkDQuadLineIntersection.cpp
+++ b/pathops/SkDQuadLineIntersection.cpp
@@ -304,15 +304,10 @@
         SkDPoint xy = fQuad.ptAtT(t);
         double dx = fLine[1].fX - fLine[0].fX;
         double dy = fLine[1].fY - fLine[0].fY;
-        double dxT = (xy.fX - fLine[0].fX) / dx;
-        double dyT = (xy.fY - fLine[0].fY) / dy;
-        if (!between(FLT_EPSILON, dxT, 1 - FLT_EPSILON) && between(0, dyT, 1)) {
-            return dyT;
+        if (fabs(dx) > fabs(dy)) {
+            return (xy.fX - fLine[0].fX) / dx;
         }
-        if (!between(FLT_EPSILON, dyT, 1 - FLT_EPSILON) && between(0, dxT, 1)) {
-            return dxT;
-        }
-        return fabs(dx) > fabs(dy) ? dxT : dyT;
+        return (xy.fY - fLine[0].fY) / dy;
     }
 
     bool pinTs(double* quadT, double* lineT, SkDPoint* pt, PinTPoint ptSet) {