diff options
| author |  bungeman <bungeman@google.com> | 2015-03-17 07:23:39 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-17 07:23:39 -0700 |
| commit | d709ea8d142eba727dda568d0641a4a2c9d09851 (patch) | |
| tree | 9f5ef0e889a44b59ac5641aeb8c8503eddc6dc1d /src/core/SkMath.cpp | |
| parent | cdeca446197329de91d87d12ad689d03d7e4d261 (diff) | |
Remove SkLONGLONG.
All users now define SkLONGLONG.
This fixes a long outstanding TODO now that int64_t is required.
BUG=skia:179
Review URL: https://codereview.chromium.org/1000933003
Diffstat (limited to 'src/core/SkMath.cpp')
| -rw-r--r-- | src/core/SkMath.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/core/SkMath.cpp b/src/core/SkMath.cpp index e33fe55e01..af93d7ecb2 100644 --- a/src/core/SkMath.cpp +++ b/src/core/SkMath.cpp @@ -43,27 +43,6 @@ int SkCLZ_portable(uint32_t x) { return zeros; } -SkFixed SkFixedMul_portable(SkFixed a, SkFixed b) { -#if defined(SkLONGLONG) - return static_cast<SkFixed>((int64_t)a * b >> 16); -#else - int sa = SkExtractSign(a); - int sb = SkExtractSign(b); - // now make them positive - a = SkApplySign(a, sa); - b = SkApplySign(b, sb); - - uint32_t ah = a >> 16; - uint32_t al = a & 0xFFFF; - uint32_t bh = b >> 16; - uint32_t bl = b & 0xFFFF; - - uint32_t R = ah * b + al * bh + (al * bl >> 16); - - return SkApplySign(R, sa ^ sb); -#endif -} - /////////////////////////////////////////////////////////////////////////////// #define DIVBITS_ITER(n) \ |