remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats

src/core/SkCubicClipper.cpp

 
 /*
  * Copyright 2009 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkCubicClipper.h"
@@ skipping 13 matching lines @@
     SkScalar ycrv[4];
     ycrv[0] = pts[0].fY - y;
     ycrv[1] = pts[1].fY - y;
     ycrv[2] = pts[2].fY - y;
     ycrv[3] = pts[3].fY - y;
 
 #ifdef NEWTON_RAPHSON    // Quadratic convergence, typically <= 3 iterations.
     // Initial guess.
     // TODO(turk): Check for zero denominator? Shouldn't happen unless the curve
     // is not only monotonic but degenerate.
-#ifdef SK_SCALAR_IS_FLOAT
     SkScalar t1 = ycrv[0] / (ycrv[0] - ycrv[3]);
-#else  // !SK_SCALAR_IS_FLOAT
-    SkScalar t1 = SkDivBits(ycrv[0], ycrv[0] - ycrv[3], 16);
-#endif  // !SK_SCALAR_IS_FLOAT
 
     // Newton's iterations.
     const SkScalar tol = SK_Scalar1 / 16384;  // This leaves 2 fixed noise bits.
     SkScalar t0;
     const int maxiters = 5;
     int iters = 0;
     bool converged;
     do {
         t0 = t1;
         SkScalar y01   = SkScalarInterp(ycrv[0], ycrv[1], t0);
         SkScalar y12   = SkScalarInterp(ycrv[1], ycrv[2], t0);
         SkScalar y23   = SkScalarInterp(ycrv[2], ycrv[3], t0);
         SkScalar y012  = SkScalarInterp(y01,  y12,  t0);
         SkScalar y123  = SkScalarInterp(y12,  y23,  t0);
         SkScalar y0123 = SkScalarInterp(y012, y123, t0);
         SkScalar yder  = (y123 - y012) * 3;
         // TODO(turk): check for yder==0: horizontal.
-#ifdef SK_SCALAR_IS_FLOAT
         t1 -= y0123 / yder;
-#else  // !SK_SCALAR_IS_FLOAT
-        t1 -= SkDivBits(y0123, yder, 16);
-#endif  // !SK_SCALAR_IS_FLOAT
         converged = SkScalarAbs(t1 - t0) <= tol;  // NaN-safe
         ++iters;
     } while (!converged && (iters < maxiters));
     *t = t1;                  // Return the result.
 
     // The result might be valid, even if outside of the range [0, 1], but
     // we never evaluate a Bezier outside this interval, so we return false.
     if (t1 < 0 || t1 > SK_Scalar1)
         return false;         // This shouldn't happen, but check anyway.
     return converged;
@@ skipping 82 matching lines @@
         dst[2] = tmp[2];
         dst[3] = tmp[3];
     }
 
     if (reverse) {
         SkTSwap<SkPoint>(dst[0], dst[3]);
         SkTSwap<SkPoint>(dst[1], dst[2]);
     }
     return true;
 }