commit a461ff0866526bc51dbd4c4f9f066a727ec21510
author caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 11 12:54:23 2012 +0000
committer caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 11 12:54:23 2012 +0000
tree 7ff33c63c41b801c67ee1c13f36bd9c74fb0f1d6
parent fc84359aa920567e72742877a1249f52d076ad35

shape ops work in progress

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

experimental/Intersection/QuarticRoot.cpp

diff --git a/experimental/Intersection/QuarticRoot.cpp b/experimental/Intersection/QuarticRoot.cpp
index b2e73cb..f16c332 100644
--- a/experimental/Intersection/QuarticRoot.cpp
+++ b/experimental/Intersection/QuarticRoot.cpp
@@ -47,18 +47,17 @@
     const double p = B / (2 * A);
     const double q = C / A;
     const double D = p * p - q;
-    if (approximately_zero(D)) {
+    if (D < 0) {
+        return 0;
+    }
+    double sqrt_D = sqrt(D);
+    if (approximately_less_than_zero(sqrt_D)) {
         s[0] = -p;
         return 1;
-    } else if (D < 0) {
-        return 0;
-    } else {
-        assert(D > 0);
-        double sqrt_D = sqrt(D);
-        s[0] = sqrt_D - p;
-        s[1] = -sqrt_D - p;
-        return 2;
     }
+    s[0] = sqrt_D - p;
+    s[1] = -sqrt_D - p;
+    return 2;
 }
 
 #define USE_GEMS 0