Index: src/images/SkImageDecoder_FactoryRegistrar.cpp |
diff --git a/src/images/SkImageDecoder_FactoryRegistrar.cpp b/src/images/SkImageDecoder_FactoryRegistrar.cpp |
index 68202a96d92a693a99346eedd285c0de85dd5a85..36034d20ad1ad7b00ef67c70fa2e2a478e692746 100644 |
--- a/src/images/SkImageDecoder_FactoryRegistrar.cpp |
+++ b/src/images/SkImageDecoder_FactoryRegistrar.cpp |
@@ -19,7 +19,7 @@ template SkImageDecoder_DecodeReg* SkImageDecoder_DecodeReg::gHead; |
SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*); |
SkImageDecoder* image_decoder_from_stream(SkStreamRewindable* stream) { |
- SkImageDecoder* codec = NULL; |
+ SkImageDecoder* codec = nullptr; |
const SkImageDecoder_DecodeReg* curr = SkImageDecoder_DecodeReg::Head(); |
while (curr) { |
codec = curr->factory()(stream); |
@@ -32,7 +32,7 @@ SkImageDecoder* image_decoder_from_stream(SkStreamRewindable* stream) { |
if (!rewindSuceeded) { |
SkDEBUGF(("Unable to rewind the image stream.")); |
delete codec; |
- return NULL; |
+ return nullptr; |
} |
if (codec) { |
@@ -40,14 +40,14 @@ SkImageDecoder* image_decoder_from_stream(SkStreamRewindable* stream) { |
} |
curr = curr->next(); |
} |
- return NULL; |
+ return nullptr; |
} |
template SkImageDecoder_FormatReg* SkImageDecoder_FormatReg::gHead; |
SkImageDecoder::Format SkImageDecoder::GetStreamFormat(SkStreamRewindable* stream) { |
const SkImageDecoder_FormatReg* curr = SkImageDecoder_FormatReg::Head(); |
- while (curr != NULL) { |
+ while (curr != nullptr) { |
Format format = curr->factory()(stream); |
if (!stream->rewind()) { |
SkErrorInternals::SetError(kInvalidOperation_SkError, |