aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/images/SkImageDecoder_libbmp.cpp
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2015-08-27 07:41:13 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-27 07:41:16 -0700
commit96fcdcc219d2a0d3579719b84b28bede76efba64 (patch)
tree0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/images/SkImageDecoder_libbmp.cpp
parent435af2f736c85c3274a0c6760a3523810750d237 (diff)
Style Change: NULL->nullptr
Diffstat (limited to 'src/images/SkImageDecoder_libbmp.cpp')
-rw-r--r--src/images/SkImageDecoder_libbmp.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/images/SkImageDecoder_libbmp.cpp b/src/images/SkImageDecoder_libbmp.cpp
index 38845086c7..179162356a 100644
--- a/src/images/SkImageDecoder_libbmp.cpp
+++ b/src/images/SkImageDecoder_libbmp.cpp
@@ -48,7 +48,7 @@ static SkImageDecoder* sk_libbmp_dfactory(SkStreamRewindable* stream) {
if (is_bmp(stream)) {
return new SkBMPImageDecoder;
}
- return NULL;
+ return nullptr;
}
static SkImageDecoder_DecodeReg gReg(sk_libbmp_dfactory);
@@ -74,7 +74,7 @@ public:
fWidth = width;
fHeight = height;
if (fJustBounds) {
- return NULL;
+ return nullptr;
}
fRGB.setCount(width * height * 3); // 3 == r, g, b
@@ -139,7 +139,7 @@ SkImageDecoder::Result SkBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* b
return kSuccess;
}
- if (!this->allocPixelRef(bm, NULL)) {
+ if (!this->allocPixelRef(bm, nullptr)) {
return kFailure;
}