path ops -- use standard max, min, double-is-nan

src/pathops/SkDLineIntersection.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkIntersections.h"
 #include "SkPathOpsLine.h"
 
 /* Determine the intersection point of two lines. This assumes the lines are not parallel,
@@ skipping 91 matching lines @@
         if (!between(b0, a0, b1)) {
             return fUsed = 0;
         }
         fT[0][0] = fT[0][1] = 0;
     } else {
         double at0 = (a0 - b0) / aDenom;
         double at1 = (a0 - b1) / aDenom;
         if ((at0 < 0 && at1 < 0) || (at0 > 1 && at1 > 1)) {
             return fUsed = 0;
         }
-        fT[0][0] = SkTMax<double>(SkTMin<double>(at0, 1.0), 0.0);
-        fT[0][1] = SkTMax<double>(SkTMin<double>(at1, 1.0), 0.0);
+        fT[0][0] = SkTMax(SkTMin(at0, 1.0), 0.0);
+        fT[0][1] = SkTMax(SkTMin(at1, 1.0), 0.0);
     }
     double bDenom = b0 - b1;
     if (approximately_zero(bDenom)) {
         fT[1][0] = fT[1][1] = 0;
     } else {
         int bIn = aDenom * bDenom < 0;
-        fT[1][bIn] = SkTMax<double>(SkTMin<double>((b0 - a0) / bDenom, 1.0), 0.0);
-        fT[1][!bIn] = SkTMax<double>(SkTMin<double>((b0 - a1) / bDenom, 1.0), 0.0);
+        fT[1][bIn] = SkTMax(SkTMin((b0 - a0) / bDenom, 1.0), 0.0);
+        fT[1][!bIn] = SkTMax(SkTMin((b0 - a1) / bDenom, 1.0), 0.0);
     }
     bool second = fabs(fT[0][0] - fT[0][1]) > FLT_EPSILON;
     SkASSERT((fabs(fT[1][0] - fT[1][1]) <= FLT_EPSILON) ^ second);
     return computePoints(a, 1 + second);
 }
 
 int SkIntersections::horizontal(const SkDLine& line, double y) {
     double min = line[0].fY;
     double max = line[1].fY;
     if (min > max) {
@@ skipping 50 matching lines @@
             double a0 = line[0].fX;
             double a1 = line[1].fX;
             double b0 = flipped ? right : left;
             double b1 = flipped ? left : right;
             // FIXME: share common code below
             double at0 = (a0 - b0) / (a0 - a1);
             double at1 = (a0 - b1) / (a0 - a1);
             if ((at0 < 0 && at1 < 0) || (at0 > 1 && at1 > 1)) {
                 return fUsed = 0;
             }
-            fT[0][0] = SkTMax<double>(SkTMin<double>(at0, 1.0), 0.0);
-            fT[0][1] = SkTMax<double>(SkTMin<double>(at1, 1.0), 0.0);
+            fT[0][0] = SkTMax(SkTMin(at0, 1.0), 0.0);
+            fT[0][1] = SkTMax(SkTMin(at1, 1.0), 0.0);
             int bIn = (a0 - a1) * (b0 - b1) < 0;
-            fT[1][bIn] = SkTMax<double>(SkTMin<double>((b0 - a0) / (b0 - b1), 1.0), 0.0);
-            fT[1][!bIn] = SkTMax<double>(SkTMin<double>((b0 - a1) / (b0 - b1), 1.0), 0.0);
+            fT[1][bIn] = SkTMax(SkTMin((b0 - a0) / (b0 - b1), 1.0), 0.0);
+            fT[1][!bIn] = SkTMax(SkTMin((b0 - a1) / (b0 - b1), 1.0), 0.0);
             bool second = fabs(fT[0][0] - fT[0][1]) > FLT_EPSILON;
             SkASSERT((fabs(fT[1][0] - fT[1][1]) <= FLT_EPSILON) ^ second);
             return computePoints(line, 1 + second);
     }
     if (flipped) {
         // OPTIMIZATION: instead of swapping, pass original line, use [1].fX - [0].fX
         for (int index = 0; index < result; ++index) {
             fT[1][index] = 1 - fT[1][index];
         }
     }
@@ skipping 36 matching lines @@
             double a0 = line[0].fY;
             double a1 = line[1].fY;
             double b0 = flipped ? bottom : top;
             double b1 = flipped ? top : bottom;
             // FIXME: share common code above
             double at0 = (a0 - b0) / (a0 - a1);
             double at1 = (a0 - b1) / (a0 - a1);
             if ((at0 < 0 && at1 < 0) || (at0 > 1 && at1 > 1)) {
                 return fUsed = 0;
             }
-            fT[0][0] = SkTMax<double>(SkTMin<double>(at0, 1.0), 0.0);
-            fT[0][1] = SkTMax<double>(SkTMin<double>(at1, 1.0), 0.0);
+            fT[0][0] = SkTMax(SkTMin(at0, 1.0), 0.0);
+            fT[0][1] = SkTMax(SkTMin(at1, 1.0), 0.0);
             int bIn = (a0 - a1) * (b0 - b1) < 0;
-            fT[1][bIn] = SkTMax<double>(SkTMin<double>((b0 - a0) / (b0 - b1), 1.0), 0.0);
-            fT[1][!bIn] = SkTMax<double>(SkTMin<double>((b0 - a1) / (b0 - b1), 1.0), 0.0);
+            fT[1][bIn] = SkTMax(SkTMin((b0 - a0) / (b0 - b1), 1.0), 0.0);
+            fT[1][!bIn] = SkTMax(SkTMin((b0 - a1) / (b0 - b1), 1.0), 0.0);
             bool second = fabs(fT[0][0] - fT[0][1]) > FLT_EPSILON;
             SkASSERT((fabs(fT[1][0] - fT[1][1]) <= FLT_EPSILON) ^ second);
             return computePoints(line, 1 + second);
             break;
     }
     if (flipped) {
         // OPTIMIZATION: instead of swapping, pass original line, use [1].fY - [0].fY
         for (int index = 0; index < result; ++index) {
             fT[1][index] = 1 - fT[1][index];
         }
     }
     return computePoints(line, result);
 }
 
 // from http://www.bryceboe.com/wordpress/wp-content/uploads/2006/10/intersect.py
 // 4 subs, 2 muls, 1 cmp
 static bool ccw(const SkDPoint& A, const SkDPoint& B, const SkDPoint& C) {
     return (C.fY - A.fY) * (B.fX - A.fX) > (B.fY - A.fY) * (C.fX - A.fX);
 }
 
 // 16 subs, 8 muls, 6 cmps
 bool SkIntersections::Test(const SkDLine& a, const SkDLine& b) {
     return ccw(a[0], b[0], b[1]) != ccw(a[1], b[0], b[1])
             && ccw(a[0], a[1], b[0]) != ccw(a[0], a[1], b[1]);
 }