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

Unified Diff: src/images/SkImageDecoder.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/SkDecodingImageGenerator.cpp ('k') | src/images/SkImageDecoder_FactoryDefault.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/images/SkImageDecoder.cpp
diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
index 0be295cbba6561360e63f79d3ec1f1df184c7668..daeee9f0b9388de98e28af9247c2405e55fd8477 100644
--- a/src/images/SkImageDecoder.cpp
+++ b/src/images/SkImageDecoder.cpp
@@ -15,8 +15,8 @@
#include "SkCanvas.h"
SkImageDecoder::SkImageDecoder()
- : fPeeker(NULL)
- , fAllocator(NULL)
+ : fPeeker(nullptr)
+ , fAllocator(nullptr)
, fSampleSize(1)
, fDefaultPref(kUnknown_SkColorType)
, fPreserveSrcDepth(false)
@@ -32,7 +32,7 @@ SkImageDecoder::~SkImageDecoder() {
}
void SkImageDecoder::copyFieldsToOther(SkImageDecoder* other) {
- if (NULL == other) {
+ if (nullptr == other) {
return;
}
other->setPeeker(fPeeker);
@@ -188,7 +188,7 @@ bool SkImageDecoder::cropBitmap(SkBitmap *dst, SkBitmap *src, int sampleSize,
if (dst->isNull()) {
dst->setInfo(src->info().makeWH(w, h));
- if (!this->allocPixelRef(dst, NULL)) {
+ if (!this->allocPixelRef(dst, nullptr)) {
SkDEBUGF(("failed to allocate pixels needed to crop the bitmap"));
return false;
}
« no previous file with comments | « src/images/SkDecodingImageGenerator.cpp ('k') | src/images/SkImageDecoder_FactoryDefault.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698