diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-22 03:20:47 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-22 03:20:47 +0000 |
commit | ecd856c36dd9705f22fc63677e04224acce19230 (patch) | |
tree | 6fae2ce1e8059728f0fbd9d82e2cd29d79ff7187 /src | |
parent | 3339ac54a5ed75f2872ab16e9052a8b9ff3564bf (diff) |
Revert of Fix compilation error when building with clang on Linux. (https://codereview.chromium.org/287193006/)
Reason for revert:
need to revert this along with reverting the big unitmapper cl
Original issue's description:
> Fix compilation error when building with clang on Linux.
>
> ../../src/effects/gradients/SkGradientShader.cpp:487:22: error: unused
> function 'bitsTo16' [-Werror,-Wunused-function]
> static inline U16CPU bitsTo16(unsigned x, const unsigned bits) {
>
> R=bsalomon@google.com
> TEST=make tests
>
> Committed: http://code.google.com/p/skia/source/detail?r=14835
R=bsalomon@google.com, reed@google.com, tfarina@chromium.org
TBR=bsalomon@google.com, reed@google.com, tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/297803010
git-svn-id: http://skia.googlecode.com/svn/trunk@14839 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/effects/gradients/SkGradientShader.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index e43a0264de..d376b22236 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -485,6 +485,18 @@ static inline int SkFixedToFFFF(SkFixed x) { return x - (x >> 16); } +static inline U16CPU bitsTo16(unsigned x, const unsigned bits) { + SkASSERT(x < (1U << bits)); + if (6 == bits) { + return (x << 10) | (x << 4) | (x >> 2); + } + if (8 == bits) { + return (x << 8) | x; + } + sk_throw(); + return 0; +} + const uint16_t* SkGradientShaderBase::GradientShaderCache::getCache16() { SkOnce(&fCache16Inited, &fCache16Mutex, SkGradientShaderBase::GradientShaderCache::initCache16, this); |