diff options
Diffstat (limited to 'chromium/third_party/skia/src/core/SkFloat.cpp')
| -rw-r--r-- | chromium/third_party/skia/src/core/SkFloat.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/chromium/third_party/skia/src/core/SkFloat.cpp b/chromium/third_party/skia/src/core/SkFloat.cpp index b5cc4f18e7d..9ec0a7a081b 100644 --- a/chromium/third_party/skia/src/core/SkFloat.cpp +++ b/chromium/third_party/skia/src/core/SkFloat.cpp @@ -156,15 +156,9 @@ int32_t SkFloat::Add(int32_t packed_a, int32_t packed_b) return SkFloat::SetShift(value_a + value_b, exp - EXP_BIAS); } -#include "Sk64.h" - -static inline int32_t mul24(int32_t a, int32_t b) -{ - Sk64 tmp; - - tmp.setMul(a, b); - tmp.roundRight(24); - return tmp.get32(); +static inline int32_t mul24(int32_t a, int32_t b) { + int64_t tmp = (sk_64_mul(a, b) + (1 << 23)) >> 24; + return sk_64_asS32(tmp); } int32_t SkFloat::Mul(int32_t packed_a, int32_t packed_b) @@ -272,7 +266,7 @@ int SkFloat::Cmp(int32_t packed_a, int32_t packed_b) void SkFloat::UnitTest() { -#ifdef SK_SUPPORT_UNITTEST +#if 0 // def SK_SUPPORT_UNITTEST SkFloat a, b, c, d; int n; |