Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Unified Diff: src/images/SkImageEncoder_argb.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/images/SkImageEncoder_Factory.cpp ('k') | src/images/SkJpegUtility.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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]);
« no previous file with comments | « src/images/SkImageEncoder_Factory.cpp ('k') | src/images/SkJpegUtility.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698