aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkXfermode.cpp
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2014-09-05 13:34:00 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-09-05 13:34:00 -0700
commit49f085dddff10473b6ebf832a974288300224e60 (patch)
tree308a3cac5e1fb053c9e27e7d07213d72eaa05409 /src/core/SkXfermode.cpp
parent7260d7292bde966f038b8e166f3fe41ddd8f2099 (diff)
"NULL !=" = NULL
R=reed@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/544233002
Diffstat (limited to 'src/core/SkXfermode.cpp')
-rw-r--r--src/core/SkXfermode.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index b10b5e1328..91aa84706b 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -840,7 +840,7 @@ public:
} else {
dstColor = fsBuilder->dstColor();
}
- SkASSERT(NULL != dstColor);
+ SkASSERT(dstColor);
// We don't try to optimize for this case at all
if (NULL == inputColor) {
@@ -1298,7 +1298,7 @@ void SkProcCoeffXfermode::xfer32(SkPMColor* SK_RESTRICT dst,
SkXfermodeProc proc = fProc;
- if (NULL != proc) {
+ if (proc) {
if (NULL == aa) {
for (int i = count - 1; i >= 0; --i) {
dst[i] = proc(src[i], dst[i]);
@@ -1326,7 +1326,7 @@ void SkProcCoeffXfermode::xfer16(uint16_t* SK_RESTRICT dst,
SkXfermodeProc proc = fProc;
- if (NULL != proc) {
+ if (proc) {
if (NULL == aa) {
for (int i = count - 1; i >= 0; --i) {
SkPMColor dstC = SkPixel16ToPixel32(dst[i]);
@@ -1355,7 +1355,7 @@ void SkProcCoeffXfermode::xferA8(SkAlpha* SK_RESTRICT dst,
SkXfermodeProc proc = fProc;
- if (NULL != proc) {
+ if (proc) {
if (NULL == aa) {
for (int i = count - 1; i >= 0; --i) {
SkPMColor res = proc(src[i], dst[i] << SK_A32_SHIFT);
@@ -1381,9 +1381,9 @@ void SkProcCoeffXfermode::xferA8(SkAlpha* SK_RESTRICT dst,
#if SK_SUPPORT_GPU
bool SkProcCoeffXfermode::asNewEffect(GrEffect** effect, GrTexture* background) const {
if (XferEffect::IsSupportedMode(fMode)) {
- if (NULL != effect) {
+ if (effect) {
*effect = XferEffect::Create(fMode, background);
- SkASSERT(NULL != *effect);
+ SkASSERT(*effect);
}
return true;
}
@@ -1594,7 +1594,7 @@ void SkDstInXfermode::xfer32(SkPMColor* SK_RESTRICT dst,
if (count <= 0) {
return;
}
- if (NULL != aa) {
+ if (aa) {
return this->INHERITED::xfer32(dst, src, count, aa);
}
@@ -1641,7 +1641,7 @@ void SkDstOutXfermode::xfer32(SkPMColor* SK_RESTRICT dst,
if (count <= 0) {
return;
}
- if (NULL != aa) {
+ if (aa) {
return this->INHERITED::xfer32(dst, src, count, aa);
}