diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-20 14:24:21 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-20 14:24:21 +0000 |
| commit | 01c41a556e0ef0ae2338a1b5ae110a501e1ed0a8 (patch) | |
| tree | 161c3eeed7af2413719cd04c5cb9a627ffcc2537 /src/core/SkMath.cpp | |
| parent | 5f2fd5dd5d6dbf3057258d652aacfc9d664132a2 (diff) | |
Revert "Revert "begin to remove SkLONGLONG and wean Skia off of Sk64""
This reverts commit 15b986baf026a3da5e2cac8106a1b753df242c39.
BUG=
Review URL: https://codereview.chromium.org/119353003
git-svn-id: http://skia.googlecode.com/svn/trunk@12796 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkMath.cpp')
| -rw-r--r-- | src/core/SkMath.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkMath.cpp b/src/core/SkMath.cpp index e1133c7850..e7c4fdcc53 100644 --- a/src/core/SkMath.cpp +++ b/src/core/SkMath.cpp @@ -55,7 +55,7 @@ int32_t SkMulDiv(int32_t numer1, int32_t numer2, int32_t denom) { SkFixed SkFixedMul_portable(SkFixed a, SkFixed b) { #if defined(SkLONGLONG) - return static_cast<SkFixed>((SkLONGLONG)a * b >> 16); + return static_cast<SkFixed>((int64_t)a * b >> 16); #else int sa = SkExtractSign(a); int sb = SkExtractSign(b); |