remove SkFP.h and replace SkFP with SkScalar stop respecting SK_SOFTWARE_FLOAT, assume its always f…

src/core/SkRect.cpp

 
 /*
  * Copyright 2006 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 "SkRect.h"
@@ skipping 60 matching lines @@
 #endif
 
 bool SkRect::setBoundsCheck(const SkPoint pts[], int count) {
     SkASSERT((pts && count > 0) || count == 0);
 
     bool isFinite = true;
 
     if (count <= 0) {
         sk_bzero(this, sizeof(SkRect));
     } else {
-#ifdef SK_SCALAR_SLOW_COMPARES
-        int32_t    l, t, r, b;
-
-        l = r = SkScalarAs2sCompliment(pts[0].fX);
-        t = b = SkScalarAs2sCompliment(pts[0].fY);
-
-        for (int i = 1; i < count; i++) {
-            int32_t x = SkScalarAs2sCompliment(pts[i].fX);
-            int32_t y = SkScalarAs2sCompliment(pts[i].fY);
-
-            if (x < l) l = x; else if (x > r) r = x;
-            if (y < t) t = y; else if (y > b) b = y;
-        }
-        this->set(Sk2sComplimentAsScalar(l),
-                  Sk2sComplimentAsScalar(t),
-                  Sk2sComplimentAsScalar(r),
-                  Sk2sComplimentAsScalar(b));
-#else
         SkScalar    l, t, r, b;
 
         l = r = pts[0].fX;
         t = b = pts[0].fY;
 
         // If all of the points are finite, accum should stay 0. If we encounter
         // a NaN or infinity, then accum should become NaN.
         SkFLOATCODE(float accum = 0;)
         SkFLOATCODE(accum *= l; accum *= t;)
 
         for (int i = 1; i < count; i++) {
             SkScalar x = pts[i].fX;
             SkScalar y = pts[i].fY;
 
             SkFLOATCODE(accum *= x; accum *= y;)
 
             if (x < l) l = x; MINMAX_ELSE if (x > r) r = x;
             if (y < t) t = y; MINMAX_ELSE if (y > b) b = y;
         }
 
-#ifdef SK_SCALAR_IS_FLOAT
         SkASSERT(!accum || !SkScalarIsFinite(accum));
         if (accum) {
             l = t = r = b = 0;
             isFinite = false;
         }
-#endif
         this->set(l, t, r, b);
-#endif
     }
 
     return isFinite;
 }
 
 bool SkRect::intersect(SkScalar left, SkScalar top, SkScalar right,
                        SkScalar bottom) {
     if (left < right && top < bottom && !this->isEmpty() && // check for empties
         fLeft < right && left < fRight && fTop < bottom && top < fBottom)
     {
@@ skipping 36 matching lines @@
     // if we are empty, just assign
     if (fLeft >= fRight || fTop >= fBottom) {
         this->set(left, top, right, bottom);
     } else {
         if (left < fLeft) fLeft = left;
         if (top < fTop) fTop = top;
         if (right > fRight) fRight = right;
         if (bottom > fBottom) fBottom = bottom;
     }
 }