diff options
| author |  mtklein <mtklein@chromium.org> | 2016-07-25 13:24:09 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-25 13:24:09 -0700 |
| commit | 1ab9e59da057e02ece707d736032c756fb3ce9cf (patch) | |
| tree | f295af0268ce865ddbff97581953d5fbaa478b24 /src | |
| parent | 8fe485b793f6b3c286700988138e1395b0d33487 (diff) | |
Google3 <functional> has a global "using std::plus"...
... so we can't use the name plus(). -_-
TBR=tomhudson@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2183453003
Review-Url: https://codereview.chromium.org/2183453003
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkXfermode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index 64db9dfb56..3e7b8bc7c2 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -1461,7 +1461,7 @@ KERNEL(dstatop) { return srcatop(d,da,s,sa); } KERNEL(modulate) { return s*d; } KERNEL(multiply) { return s*inv(da) + d*inv(sa) + s*d; } -KERNEL(plus) { return s + d; } +KERNEL(plus_) { return s + d; } KERNEL(screen) { return s + d - s*d; } KERNEL(xor_) { return s*inv(da) + d*inv(sa); } @@ -1531,7 +1531,7 @@ bool SkProcCoeffXfermode::onAppendStages(SkRasterPipeline* p) const { case kClear_Mode: p->append(rgba<clear>); return true; case kModulate_Mode: p->append(rgba<modulate>); return true; case kMultiply_Mode: p->append(rgba<multiply>); return true; - case kPlus_Mode: p->append(rgba<plus>); return true; + case kPlus_Mode: p->append(rgba<plus_>); return true; case kScreen_Mode: p->append(rgba<screen>); return true; case kXor_Mode: p->append(rgba<xor_>); return true; |