Index: experimental/SkSetPoly3To3_A.cpp |
diff --git a/experimental/SkSetPoly3To3_A.cpp b/experimental/SkSetPoly3To3_A.cpp |
index 9eb6b33c0dffeb5e259e5e0d903bc4f3fc9873f2..18777a77b5bce989e33f812b4d9ca850a1aed986 100644 |
--- a/experimental/SkSetPoly3To3_A.cpp |
+++ b/experimental/SkSetPoly3To3_A.cpp |
@@ -10,29 +10,14 @@ |
// 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; |
- |
- 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; |
+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); |