Index: src/codec/SkBmpStandardCodec.cpp |
diff --git a/src/codec/SkBmpStandardCodec.cpp b/src/codec/SkBmpStandardCodec.cpp |
index 8404aa616b0aae8e5f849f1e55f5a3b65352e47f..210498eb00f7439b8da7719e008d9fe5347371de 100644 |
--- a/src/codec/SkBmpStandardCodec.cpp |
+++ b/src/codec/SkBmpStandardCodec.cpp |
@@ -20,12 +20,12 @@ SkBmpStandardCodec::SkBmpStandardCodec(const SkImageInfo& info, SkStream* stream |
uint32_t bytesPerColor, uint32_t offset, |
SkBmpCodec::RowOrder rowOrder, bool inIco) |
: INHERITED(info, stream, bitsPerPixel, rowOrder) |
- , fColorTable(NULL) |
+ , fColorTable(nullptr) |
, fNumColors(this->computeNumColors(numColors)) |
, fBytesPerColor(bytesPerColor) |
, fOffset(offset) |
- , fSwizzler(NULL) |
- , fSrcBuffer(NULL) |
+ , fSwizzler(nullptr) |
+ , fSrcBuffer(nullptr) |
, fInIco(inIco) |
{} |
@@ -54,7 +54,7 @@ SkCodec::Result SkBmpStandardCodec::onGetPixels(const SkImageInfo& dstInfo, |
} |
// Create the color table if necessary and prepare the stream for decode |
- // Note that if it is non-NULL, inputColorCount will be modified |
+ // Note that if it is non-nullptr, inputColorCount will be modified |
if (!this->createColorTable(dstInfo.alphaType(), inputColorCount)) { |
SkCodecPrintf("Error: could not create color table.\n"); |
return kInvalidInput; |
@@ -82,7 +82,7 @@ SkCodec::Result SkBmpStandardCodec::onGetPixels(const SkImageInfo& dstInfo, |
if (this->bitsPerPixel() <= 8) { |
// Inform the caller of the number of colors |
uint32_t maxColors = 1 << this->bitsPerPixel(); |
- if (NULL != numColors) { |
+ if (nullptr != numColors) { |
// We set the number of colors to maxColors in order to ensure |
// safe memory accesses. Otherwise, an invalid pixel could |
// access memory outside of our color table array. |
@@ -112,7 +112,7 @@ SkCodec::Result SkBmpStandardCodec::onGetPixels(const SkImageInfo& dstInfo, |
// should fail if the alpha type is not one of the above |
// values. |
SkASSERT(false); |
- packARGB = NULL; |
+ packARGB = nullptr; |
break; |
} |
@@ -210,7 +210,7 @@ bool SkBmpStandardCodec::initializeSwizzler(const SkImageInfo& dstInfo, |
fSwizzler.reset(SkSwizzler::CreateSwizzler(config, |
colorPtr, dstInfo, opts.fZeroInitialized, this->getInfo())); |
- if (NULL == fSwizzler.get()) { |
+ if (nullptr == fSwizzler.get()) { |
return false; |
} |
return true; |