remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats

experimental/SkSetPoly3To3_A.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkMatrix.h"
 
 // FIXME: needs to be in a header
 bool SkSetPoly3To3_A(SkMatrix* matrix, const SkPoint src[3], const SkPoint dst[3]);
 
-#ifdef SK_SCALAR_IS_FIXED
-    typedef int64_t SkDScalar;
+typedef double SkDScalar;
 
-    static SkScalar SkDScalar_toScalar(SkDScalar value) {
-        SkDScalar result = (value + (1 << 15)) >> 16;
-        int top = result >> 31;
-        SkASSERT(top == 0 || top == -1);
-        return (SkScalar)result;
-    }
-    static SkScalar divide(SkDScalar numer, SkDScalar denom) {
-        denom >>= 16;
-        return numer / denom;
-    }
-#else
-    typedef double SkDScalar;
-
-    static SkScalar SkDScalar_toScalar(SkDScalar value) {
-        return static_cast<float>(value);
-    }
-    static SkScalar divide(SkDScalar numer, SkDScalar denom) {
-        return static_cast<float>(numer / denom);
-    }
-#endif
+static SkScalar SkDScalar_toScalar(SkDScalar value) {
+    return static_cast<float>(value);
+}
+static SkScalar divide(SkDScalar numer, SkDScalar denom) {
+    return static_cast<float>(numer / denom);
+}
 
 static SkDScalar SkDScalar_setMul(SkScalar a, SkScalar b) {
     return (SkDScalar) ((SkDScalar) a * b);
 }
 
 static void computeOuterProduct(SkScalar op[4],
                                 const SkPoint pts0[3], const SkPoint& ave0,
                                 const SkPoint pts1[3], const SkPoint& ave1) {
     sk_bzero(op, 4 * sizeof(op[0]));
     for (int i = 0; i < 3; i++) {
@@ skipping 44 matching lines @@
     matrix->setScaleX(divide(M[0], det));
     matrix->setSkewX( divide(M[1], det));
     matrix->setSkewY (divide(M[2], det));
     matrix->setScaleY(divide(M[3], det));
     matrix->setTranslateX(dstAve.fX - dot(srcAve.fX, srcAve.fY,
                                     matrix->getScaleX(), matrix->getSkewX()));
     matrix->setTranslateY(dstAve.fY - dot(srcAve.fX, srcAve.fY,
                                     matrix->getSkewY(), matrix->getScaleY()));
     return true;
 }