Index: src/codec/SkMaskSwizzler.cpp |
diff --git a/src/codec/SkMaskSwizzler.cpp b/src/codec/SkMaskSwizzler.cpp |
index 95f3627a1747d685be3943a521981d7b9fdfd95a..58be0c67af441660664b5e25466d6a205b04d92c 100644 |
--- a/src/codec/SkMaskSwizzler.cpp |
+++ b/src/codec/SkMaskSwizzler.cpp |
@@ -225,7 +225,7 @@ SkMaskSwizzler* SkMaskSwizzler::CreateMaskSwizzler( |
const SkImageInfo& info, SkMasks* masks, uint32_t bitsPerPixel) { |
// Choose the appropriate row procedure |
- RowProc proc = NULL; |
+ RowProc proc = nullptr; |
switch (bitsPerPixel) { |
case 16: |
switch (info.colorType()) { |
@@ -319,7 +319,7 @@ SkMaskSwizzler* SkMaskSwizzler::CreateMaskSwizzler( |
break; |
default: |
SkASSERT(false); |
- return NULL; |
+ return nullptr; |
} |
return new SkMaskSwizzler(info, masks, proc); |
} |
@@ -342,6 +342,6 @@ SkMaskSwizzler::SkMaskSwizzler(const SkImageInfo& dstInfo, SkMasks* masks, |
* |
*/ |
SkSwizzler::ResultAlpha SkMaskSwizzler::swizzle(void* dst, const uint8_t* SK_RESTRICT src) { |
- SkASSERT(NULL != dst && NULL != src); |
+ SkASSERT(nullptr != dst && nullptr != src); |
return fRowProc(dst, src, fDstInfo.width(), fMasks); |
} |