| Index: src/images/SkImageDecoder_ktx.cpp
|
| diff --git a/src/images/SkImageDecoder_ktx.cpp b/src/images/SkImageDecoder_ktx.cpp
|
| index a7e1a70e601217c7e70c5eab15965202f6653cb0..a95ab6f602d3610918b5874b10de50a76fd894de 100644
|
| --- a/src/images/SkImageDecoder_ktx.cpp
|
| +++ b/src/images/SkImageDecoder_ktx.cpp
|
| @@ -50,7 +50,7 @@ private:
|
| SkImageDecoder::Result SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
|
| // TODO: Implement SkStream::copyToData() that's cheap for memory and file streams
|
| SkAutoDataUnref data(SkCopyStreamToData(stream));
|
| - if (NULL == data) {
|
| + if (nullptr == data) {
|
| return kFailure;
|
| }
|
|
|
| @@ -118,7 +118,7 @@ SkImageDecoder::Result SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* b
|
| }
|
|
|
| // If we've made it this far, then we know how to grok the data.
|
| - if (!this->allocPixelRef(bm, NULL)) {
|
| + if (!this->allocPixelRef(bm, nullptr)) {
|
| return kFailure;
|
| }
|
|
|
| @@ -311,7 +311,7 @@ static SkImageDecoder* sk_libktx_dfactory(SkStreamRewindable* stream) {
|
| if (SkKTXFile::is_ktx(stream)) {
|
| return new SkKTXImageDecoder;
|
| }
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| static SkImageDecoder::Format get_format_ktx(SkStreamRewindable* stream) {
|
| @@ -322,7 +322,7 @@ static SkImageDecoder::Format get_format_ktx(SkStreamRewindable* stream) {
|
| }
|
|
|
| SkImageEncoder* sk_libktx_efactory(SkImageEncoder::Type t) {
|
| - return (SkImageEncoder::kKTX_Type == t) ? new SkKTXImageEncoder : NULL;
|
| + return (SkImageEncoder::kKTX_Type == t) ? new SkKTXImageEncoder : nullptr;
|
| }
|
|
|
| static SkImageDecoder_DecodeReg gReg(sk_libktx_dfactory);
|
|
|