diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-19 22:28:48 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-19 22:28:48 +0000 |
| commit | b1560445c66a751fc2ea7b85b94430a985940f3e (patch) | |
| tree | 0b32c5228339f562a7f1c983638ff81b3568afae /src/core/SkMath.cpp | |
| parent | 8d7ed847be265d3e5058079029a3f6430d93130e (diff) | |
Revert "begin to remove SkLONGLONG and wean Skia off of Sk64"
This reverts commit 784890196fdab96289f9389db43aca01f35db0f9.
Revert "use LL suffix for 64bit literal"
This reverts commit 9634295aff9bffd7a3875a0ca4a9b1a27d0793fc.
BUG=
Review URL: https://codereview.chromium.org/116543009
git-svn-id: http://skia.googlecode.com/svn/trunk@12790 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 72df5dab5b..1d356c7951 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>((int64_t)a * b >> 16); + return static_cast<SkFixed>((SkLONGLONG)a * b >> 16); #else int sa = SkExtractSign(a); int sb = SkExtractSign(b); |