diff options
author | halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/images/SkImageEncoder.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/images/SkImageEncoder.cpp')
-rw-r--r-- | src/images/SkImageEncoder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/images/SkImageEncoder.cpp b/src/images/SkImageEncoder.cpp index a6f109a207..cc1b73baa5 100644 --- a/src/images/SkImageEncoder.cpp +++ b/src/images/SkImageEncoder.cpp @@ -31,7 +31,7 @@ SkData* SkImageEncoder::encodeData(const SkBitmap& bm, int quality) { if (this->onEncode(&stream, bm, quality)) { return stream.copyToData(); } - return NULL; + return nullptr; } bool SkImageEncoder::EncodeFile(const char file[], const SkBitmap& bm, Type t, @@ -48,15 +48,15 @@ bool SkImageEncoder::EncodeStream(SkWStream* stream, const SkBitmap& bm, Type t, SkData* SkImageEncoder::EncodeData(const SkBitmap& bm, Type t, int quality) { SkAutoTDelete<SkImageEncoder> enc(SkImageEncoder::Create(t)); - return enc.get() ? enc.get()->encodeData(bm, quality) : NULL; + return enc.get() ? enc.get()->encodeData(bm, quality) : nullptr; } SkData* SkImageEncoder::EncodeData(const SkImageInfo& info, const void* pixels, size_t rowBytes, Type t, int quality) { SkBitmap bm; if (!bm.installPixels(info, const_cast<void*>(pixels), rowBytes)) { - return NULL; + return nullptr; } SkAutoTDelete<SkImageEncoder> enc(SkImageEncoder::Create(t)); - return enc.get() ? enc.get()->encodeData(bm, quality) : NULL; + return enc.get() ? enc.get()->encodeData(bm, quality) : nullptr; } |