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

src/pathops/SkDCubicIntersection.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 "SkPathOpsCubic.h"
 #include "SkPathOpsLine.h"
@@ skipping 123 matching lines @@
                             i.insert(to2, to1, p1);
                         } else {
                             i.insert(to1, to2, p1);
                         }
                     }
                 } else {
                     double offset = precisionScale / 16;  // FIME: const is arbitrary: test, refine
 #if 1
                     double c1Bottom = tIdx == 0 ? 0 :
                             (t1Start + (t1 - t1Start) * locals[0][tIdx - 1] + to1) / 2;
-                    double c1Min = SkTMax<double>(c1Bottom, to1 - offset);
+                    double c1Min = SkTMax(c1Bottom, to1 - offset);
                     double c1Top = tIdx == tCount - 1 ? 1 :
                             (t1Start + (t1 - t1Start) * locals[0][tIdx + 1] + to1) / 2;
-                    double c1Max = SkTMin<double>(c1Top, to1 + offset);
-                    double c2Min = SkTMax<double>(0., to2 - offset);
-                    double c2Max = SkTMin<double>(1., to2 + offset);
+                    double c1Max = SkTMin(c1Top, to1 + offset);
+                    double c2Min = SkTMax(0., to2 - offset);
+                    double c2Max = SkTMin(1., to2 + offset);
                 #if ONE_OFF_DEBUG
                     SkDebugf("%.*s %s 1 contains1=%d/%d contains2=%d/%d\n", i.depth()*2, tab,
                             __FUNCTION__,
                             c1Min <= tLimits1[0][1] && tLimits1[0][0] <= c1Max
                          && c2Min <= tLimits1[1][1] && tLimits1[1][0] <= c2Max,
                             to1 - offset <= tLimits1[0][1] && tLimits1[0][0] <= to1 + offset
                          && to2 - offset <= tLimits1[1][1] && tLimits1[1][0] <= to2 + offset,
                             c1Min <= tLimits2[0][1] && tLimits2[0][0] <= c1Max
                          && c2Min <= tLimits2[1][1] && tLimits2[1][0] <= c2Max,
                             to1 - offset <= tLimits2[0][1] && tLimits2[0][0] <= to1 + offset
                          && to2 - offset <= tLimits2[1][1] && tLimits2[1][0] <= to2 + offset);
                     SkDebugf("%.*s %s 1 c1Bottom=%1.9g c1Top=%1.9g c2Bottom=%1.9g c2Top=%1.9g"
                             " 1-o=%1.9g 1+o=%1.9g 2-o=%1.9g 2+o=%1.9g offset=%1.9g\n",
                             i.depth()*2, tab, __FUNCTION__, c1Bottom, c1Top, 0., 1.,
                             to1 - offset, to1 + offset, to2 - offset, to2 + offset, offset);
                     SkDebugf("%.*s %s 1 to1=%1.9g to2=%1.9g c1Min=%1.9g c1Max=%1.9g c2Min=%1.9g"
                             " c2Max=%1.9g\n", i.depth()*2, tab, __FUNCTION__, to1, to2, c1Min,
                             c1Max, c2Min, c2Max);
                 #endif
                     intersect(cubic1, c1Min, c1Max, cubic2, c2Min, c2Max, offset, i);
                 #if ONE_OFF_DEBUG
                     SkDebugf("%.*s %s 1 i.used=%d t=%1.9g\n", i.depth()*2, tab, __FUNCTION__,
                             i.used(), i.used() > 0 ? i[0][i.used() - 1] : -1);
                 #endif
                     if (tCount > 1) {
-                        c1Min = SkTMax<double>(0., to1 - offset);
-                        c1Max = SkTMin<double>(1., to1 + offset);
+                        c1Min = SkTMax(0., to1 - offset);
+                        c1Max = SkTMin(1., to1 + offset);
                         double c2Bottom = tIdx == 0 ? to2 :
                                 (t2Start + (t2 - t2Start) * locals[1][tIdx - 1] + to2) / 2;
                         double c2Top = tIdx == tCount - 1 ? to2 :
                                 (t2Start + (t2 - t2Start) * locals[1][tIdx + 1] + to2) / 2;
                         if (c2Bottom > c2Top) {
                             SkTSwap(c2Bottom, c2Top);
                         }
                         if (c2Bottom == to2) {
                             c2Bottom = 0;
                         }
                         if (c2Top == to2) {
                             c2Top = 1;
                         }
-                        c2Min = SkTMax<double>(c2Bottom, to2 - offset);
-                        c2Max = SkTMin<double>(c2Top, to2 + offset);
+                        c2Min = SkTMax(c2Bottom, to2 - offset);
+                        c2Max = SkTMin(c2Top, to2 + offset);
                     #if ONE_OFF_DEBUG
                         SkDebugf("%.*s %s 2 contains1=%d/%d contains2=%d/%d\n", i.depth()*2, tab,
                             __FUNCTION__,
                             c1Min <= tLimits1[0][1] && tLimits1[0][0] <= c1Max
                          && c2Min <= tLimits1[1][1] && tLimits1[1][0] <= c2Max,
                             to1 - offset <= tLimits1[0][1] && tLimits1[0][0] <= to1 + offset
                          && to2 - offset <= tLimits1[1][1] && tLimits1[1][0] <= to2 + offset,
                             c1Min <= tLimits2[0][1] && tLimits2[0][0] <= c1Max
                          && c2Min <= tLimits2[1][1] && tLimits2[1][0] <= c2Max,
                             to1 - offset <= tLimits2[0][1] && tLimits2[0][0] <= to1 + offset
                          && to2 - offset <= tLimits2[1][1] && tLimits2[1][0] <= to2 + offset);
                         SkDebugf("%.*s %s 2 c1Bottom=%1.9g c1Top=%1.9g c2Bottom=%1.9g c2Top=%1.9g"
                                 " 1-o=%1.9g 1+o=%1.9g 2-o=%1.9g 2+o=%1.9g offset=%1.9g\n",
                                 i.depth()*2, tab, __FUNCTION__, 0., 1., c2Bottom, c2Top,
                                 to1 - offset, to1 + offset, to2 - offset, to2 + offset, offset);
                         SkDebugf("%.*s %s 2 to1=%1.9g to2=%1.9g c1Min=%1.9g c1Max=%1.9g c2Min=%1.9g"
                                 " c2Max=%1.9g\n", i.depth()*2, tab, __FUNCTION__, to1, to2, c1Min,
                                 c1Max, c2Min, c2Max);
                     #endif
                         intersect(cubic1, c1Min, c1Max, cubic2, c2Min, c2Max, offset, i);
                 #if ONE_OFF_DEBUG
                     SkDebugf("%.*s %s 2 i.used=%d t=%1.9g\n", i.depth()*2, tab, __FUNCTION__,
                             i.used(), i.used() > 0 ? i[0][i.used() - 1] : -1);
                 #endif
-                        c1Min = SkTMax<double>(c1Bottom, to1 - offset);
-                        c1Max = SkTMin<double>(c1Top, to1 + offset);
+                        c1Min = SkTMax(c1Bottom, to1 - offset);
+                        c1Max = SkTMin(c1Top, to1 + offset);
                     #if ONE_OFF_DEBUG
                         SkDebugf("%.*s %s 3 contains1=%d/%d contains2=%d/%d\n", i.depth()*2, tab,
                         __FUNCTION__,
                             c1Min <= tLimits1[0][1] && tLimits1[0][0] <= c1Max
                          && c2Min <= tLimits1[1][1] && tLimits1[1][0] <= c2Max,
                             to1 - offset <= tLimits1[0][1] && tLimits1[0][0] <= to1 + offset
                          && to2 - offset <= tLimits1[1][1] && tLimits1[1][0] <= to2 + offset,
                             c1Min <= tLimits2[0][1] && tLimits2[0][0] <= c1Max
                          && c2Min <= tLimits2[1][1] && tLimits2[1][0] <= c2Max,
                             to1 - offset <= tLimits2[0][1] && tLimits2[0][0] <= to1 + offset
                          && to2 - offset <= tLimits2[1][1] && tLimits2[1][0] <= to2 + offset);
                         SkDebugf("%.*s %s 3 c1Bottom=%1.9g c1Top=%1.9g c2Bottom=%1.9g c2Top=%1.9g"
                                 " 1-o=%1.9g 1+o=%1.9g 2-o=%1.9g 2+o=%1.9g offset=%1.9g\n",
                                 i.depth()*2, tab, __FUNCTION__, 0., 1., c2Bottom, c2Top,
                                 to1 - offset, to1 + offset, to2 - offset, to2 + offset, offset);
                         SkDebugf("%.*s %s 3 to1=%1.9g to2=%1.9g c1Min=%1.9g c1Max=%1.9g c2Min=%1.9g"
                                 " c2Max=%1.9g\n", i.depth()*2, tab, __FUNCTION__, to1, to2, c1Min,
                                 c1Max, c2Min, c2Max);
                     #endif
                         intersect(cubic1, c1Min, c1Max, cubic2, c2Min, c2Max, offset, i);
                 #if ONE_OFF_DEBUG
                     SkDebugf("%.*s %s 3 i.used=%d t=%1.9g\n", i.depth()*2, tab, __FUNCTION__,
                             i.used(), i.used() > 0 ? i[0][i.used() - 1] : -1);
                 #endif
                     }
 #else
                     double c1Bottom = tIdx == 0 ? 0 :
                             (t1Start + (t1 - t1Start) * locals.fT[0][tIdx - 1] + to1) / 2;
-                    double c1Min = SkTMax<double>(c1Bottom, to1 - offset);
+                    double c1Min = SkTMax(c1Bottom, to1 - offset);
                     double c1Top = tIdx == tCount - 1 ? 1 :
                             (t1Start + (t1 - t1Start) * locals.fT[0][tIdx + 1] + to1) / 2;
-                    double c1Max = SkTMin<double>(c1Top, to1 + offset);
+                    double c1Max = SkTMin(c1Top, to1 + offset);
                     double c2Bottom = tIdx == 0 ? to2 :
                             (t2Start + (t2 - t2Start) * locals.fT[1][tIdx - 1] + to2) / 2;
                     double c2Top = tIdx == tCount - 1 ? to2 :
                             (t2Start + (t2 - t2Start) * locals.fT[1][tIdx + 1] + to2) / 2;
                     if (c2Bottom > c2Top) {
                         SkTSwap(c2Bottom, c2Top);
                     }
                     if (c2Bottom == to2) {
                         c2Bottom = 0;
                     }
                     if (c2Top == to2) {
                         c2Top = 1;
                     }
-                    double c2Min = SkTMax<double>(c2Bottom, to2 - offset);
-                    double c2Max = SkTMin<double>(c2Top, to2 + offset);
+                    double c2Min = SkTMax(c2Bottom, to2 - offset);
+                    double c2Max = SkTMin(c2Top, to2 + offset);
                 #if ONE_OFF_DEBUG
                     SkDebugf("%s contains1=%d/%d contains2=%d/%d\n", __FUNCTION__,
                             c1Min <= 0.210357794 && 0.210357794 <= c1Max
                          && c2Min <= 0.223476406 && 0.223476406 <= c2Max,
                             to1 - offset <= 0.210357794 && 0.210357794 <= to1 + offset
                          && to2 - offset <= 0.223476406 && 0.223476406 <= to2 + offset,
                             c1Min <= 0.211324707 && 0.211324707 <= c1Max
                          && c2Min <= 0.211327209 && 0.211327209 <= c2Max,
                             to1 - offset <= 0.211324707 && 0.211324707 <= to1 + offset
                          && to2 - offset <= 0.211327209 && 0.211327209 <= to2 + offset);
@@ skipping 69 matching lines @@
     }
     QSort<double>(tVals.begin(), tVals.end() - 1);
     double tMin1 = start ? 0 : 1 - LINE_FRACTION;
     double tMax1 = start ? LINE_FRACTION : 1;
     int tIdx = 0;
     do {
         int tLast = tIdx;
         while (tLast + 1 < tVals.count() && roughly_equal(tVals[tLast + 1], tVals[tIdx])) {
             ++tLast;
         }
-        double tMin2 = SkTMax<double>(tVals[tIdx] - LINE_FRACTION, 0.0);
-        double tMax2 = SkTMin<double>(tVals[tLast] + LINE_FRACTION, 1.0);
+        double tMin2 = SkTMax(tVals[tIdx] - LINE_FRACTION, 0.0);
+        double tMax2 = SkTMin(tVals[tLast] + LINE_FRACTION, 1.0);
         int lastUsed = i.used();
         intersect(cubic1, tMin1, tMax1, cubic2, tMin2, tMax2, 1, i);
         if (lastUsed == i.used()) {
-            tMin2 = SkTMax<double>(tVals[tIdx] - (1.0 / SkDCubic::gPrecisionUnit), 0.0);
-            tMax2 = SkTMin<double>(tVals[tLast] + (1.0 / SkDCubic::gPrecisionUnit), 1.0);
+            tMin2 = SkTMax(tVals[tIdx] - (1.0 / SkDCubic::gPrecisionUnit), 0.0);
+            tMax2 = SkTMin(tVals[tLast] + (1.0 / SkDCubic::gPrecisionUnit), 1.0);
             intersect(cubic1, tMin1, tMax1, cubic2, tMin2, tMax2, 1, i);
         }
         tIdx = tLast + 1;
     } while (tIdx < tVals.count());
     return;
 }
 
 const double CLOSE_ENOUGH = 0.001;
 
 static bool closeStart(const SkDCubic& cubic, int cubicIndex, SkIntersections& i, SkDPoint& pt) {
@@ skipping 69 matching lines @@
     }
     (void) intersect(c, c);
     if (used() > 0) {
         SkASSERT(used() == 1);
         if (fT[0][0] > fT[1][0]) {
             swapPts();
         }
     }
     return used();
 }