diff options
author | 2015-08-27 07:41:13 -0700 | |
---|---|---|
committer | 2015-08-27 07:41:16 -0700 | |
commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/codec/SkCodec_wbmp.cpp | |
parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'src/codec/SkCodec_wbmp.cpp')
-rw-r--r-- | src/codec/SkCodec_wbmp.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/codec/SkCodec_wbmp.cpp b/src/codec/SkCodec_wbmp.cpp index 16cdbeaa72..22f2bacce0 100644 --- a/src/codec/SkCodec_wbmp.cpp +++ b/src/codec/SkCodec_wbmp.cpp @@ -68,7 +68,7 @@ static bool read_header(SkStream* stream, SkISize* size) { } bool SkWbmpCodec::onRewind() { - return read_header(this->stream(), NULL); + return read_header(this->stream(), nullptr); } SkSwizzler* SkWbmpCodec::initializeSwizzler(const SkImageInfo& info, @@ -82,7 +82,7 @@ SkSwizzler* SkWbmpCodec::initializeSwizzler(const SkImageInfo& info, return SkSwizzler::CreateSwizzler(SkSwizzler::kBit, ctable, info, opts.fZeroInitialized, this->getInfo()); default: - return NULL; + return nullptr; } } @@ -129,7 +129,7 @@ SkCodec::Result SkWbmpCodec::onGetPixels(const SkImageInfo& info, // Initialize the swizzler SkAutoTDelete<SkSwizzler> swizzler(this->initializeSwizzler(info, ctable, options)); - if (NULL == swizzler.get()) { + if (nullptr == swizzler.get()) { return kInvalidConversion; } @@ -149,14 +149,14 @@ SkCodec::Result SkWbmpCodec::onGetPixels(const SkImageInfo& info, } bool SkWbmpCodec::IsWbmp(SkStream* stream) { - return read_header(stream, NULL); + return read_header(stream, nullptr); } SkCodec* SkWbmpCodec::NewFromStream(SkStream* stream) { SkAutoTDelete<SkStream> streamDeleter(stream); SkISize size; if (!read_header(stream, &size)) { - return NULL; + return nullptr; } SkImageInfo info = SkImageInfo::Make(size.width(), size.height(), kGray_8_SkColorType, kOpaque_SkAlphaType); @@ -171,8 +171,8 @@ public: SkWbmpScanlineDecoder(SkWbmpCodec* codec) : INHERITED(codec->getInfo()) , fCodec(codec) - , fColorTable(NULL) - , fSwizzler(NULL) + , fColorTable(nullptr) + , fSwizzler(nullptr) , fSrcBuffer(codec->fSrcRowBytes) {} @@ -220,7 +220,7 @@ public: // Initialize the swizzler fSwizzler.reset(fCodec->initializeSwizzler(dstInfo, get_color_ptr(fColorTable.get()), options)); - if (NULL == fSwizzler.get()) { + if (nullptr == fSwizzler.get()) { return SkCodec::kInvalidConversion; } @@ -244,7 +244,7 @@ SkScanlineDecoder* SkWbmpCodec::NewSDFromStream(SkStream* stream) { SkAutoTDelete<SkWbmpCodec> codec(static_cast<SkWbmpCodec*>( SkWbmpCodec::NewFromStream(stream))); if (!codec) { - return NULL; + return nullptr; } // Return the new scanline decoder |