Index: src/images/SkImageDecoder_libico.cpp |
diff --git a/src/images/SkImageDecoder_libico.cpp b/src/images/SkImageDecoder_libico.cpp |
index 78f41d9c0edd396f041463c3417d06d38d26553c..e8b4bc5c316cbe1b7fd587b85e5abdd672bb4f8f 100644 |
--- a/src/images/SkImageDecoder_libico.cpp |
+++ b/src/images/SkImageDecoder_libico.cpp |
@@ -127,7 +127,7 @@ SkImageDecoder::Result SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* b |
{ |
SkMemoryStream subStream(buf + offset, size, false); |
SkAutoTDelete<SkImageDecoder> otherDecoder(SkImageDecoder::Factory(&subStream)); |
- if (otherDecoder.get() != NULL) { |
+ if (otherDecoder.get() != nullptr) { |
// Disallow nesting ICO files within one another |
// FIXME: Can ICO files contain other formats besides PNG? |
if (otherDecoder->getFormat() == SkImageDecoder::kICO_Format) { |
@@ -167,7 +167,7 @@ SkImageDecoder::Result SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* b |
void (*placePixel)(const int pixelNo, const unsigned char* buf, |
const int xorOffset, int& x, int y, const int w, |
- SkBitmap* bm, int alphaByte, int m, int shift, SkPMColor* colors) = NULL; |
+ SkBitmap* bm, int alphaByte, int m, int shift, SkPMColor* colors) = nullptr; |
switch (bitCount) |
{ |
case 1: |
@@ -212,7 +212,7 @@ SkImageDecoder::Result SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* b |
//this array represents the colortable |
//if i allow other types of bitmaps, it may actually be used as a part of the bitmap |
- SkPMColor* colors = NULL; |
+ SkPMColor* colors = nullptr; |
int blue, green, red; |
if (colorCount) |
{ |
@@ -252,7 +252,7 @@ SkImageDecoder::Result SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* b |
return kSuccess; |
} |
- if (!this->allocPixelRef(bm, NULL)) |
+ if (!this->allocPixelRef(bm, nullptr)) |
{ |
delete[] colors; |
return kFailure; |
@@ -437,7 +437,7 @@ static SkImageDecoder* sk_libico_dfactory(SkStreamRewindable* stream) { |
if (is_ico(stream)) { |
return new SkICOImageDecoder; |
} |
- return NULL; |
+ return nullptr; |
} |
static SkImageDecoder_DecodeReg gReg(sk_libico_dfactory); |