| Index: src/images/SkImageEncoder_argb.cpp
|
| diff --git a/src/images/SkImageEncoder_argb.cpp b/src/images/SkImageEncoder_argb.cpp
|
| index 9da15cfb16ef618d31ca2aae969afa275d61b20e..3cd0388412617faaff2a0a3579daeb310dee31fd 100644
|
| --- a/src/images/SkImageEncoder_argb.cpp
|
| +++ b/src/images/SkImageEncoder_argb.cpp
|
| @@ -82,23 +82,23 @@ static ScanlineImporter ChooseImporter(SkColorType ct) {
|
| case kIndex_8_SkColorType:
|
| return Index8_To_ARGB;
|
| default:
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
|
|
| bool SkARGBImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bitmap, int) {
|
| const ScanlineImporter scanline_import = ChooseImporter(bitmap.colorType());
|
| - if (NULL == scanline_import) {
|
| + if (nullptr == scanline_import) {
|
| return false;
|
| }
|
|
|
| SkAutoLockPixels alp(bitmap);
|
| const uint8_t* src = (uint8_t*)bitmap.getPixels();
|
| - if (NULL == bitmap.getPixels()) {
|
| + if (nullptr == bitmap.getPixels()) {
|
| return false;
|
| }
|
|
|
| - const SkPMColor* colors = bitmap.getColorTable() ? bitmap.getColorTable()->readColors() : NULL;
|
| + const SkPMColor* colors = bitmap.getColorTable() ? bitmap.getColorTable()->readColors() : nullptr;
|
|
|
| const int argbStride = bitmap.width() * 4;
|
| SkAutoTDeleteArray<uint8_t> ada(new uint8_t[argbStride]);
|
|
|