AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Google3 <functional> has a global "using std::plus"...

Browse Source 
... 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
This commit is contained in:
mtklein 2016-07-25 13:24:09 -07:00 committed by Commit bot
parent 8fe485b793
commit 1ab9e59da0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/SkXfermode.cpp
View File

@ -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;