| Index: src/pdf/SkPDFBitmap.cpp
|
| diff --git a/src/pdf/SkPDFBitmap.cpp b/src/pdf/SkPDFBitmap.cpp
|
| index 35052334dbb1338bfb09a16401176a09df4cc81e..de43221630e5ed85e9db28bdf8738c3957c54ada 100644
|
| --- a/src/pdf/SkPDFBitmap.cpp
|
| +++ b/src/pdf/SkPDFBitmap.cpp
|
| @@ -439,12 +439,12 @@ SkPDFBitmap* SkPDFBitmap::Create(SkPDFCanon* canon, const SkBitmap& bitmap) {
|
| SkASSERT(canon);
|
| if (!SkColorTypeIsValid(bitmap.colorType()) ||
|
| kUnknown_SkColorType == bitmap.colorType()) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| SkBitmap copy;
|
| const SkBitmap& bm = immutable_bitmap(bitmap, ©);
|
| if (bm.drawsNothing()) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| if (SkPDFBitmap* canonBitmap = canon->findBitmap(bm)) {
|
| return SkRef(canonBitmap);
|
| @@ -463,7 +463,7 @@ SkPDFBitmap* SkPDFBitmap::Create(SkPDFCanon* canon, const SkBitmap& bitmap) {
|
| }
|
| }
|
|
|
| - SkPDFObject* smask = NULL;
|
| + SkPDFObject* smask = nullptr;
|
| if (!bm.isOpaque() && !SkBitmap::ComputeIsOpaque(bm)) {
|
| smask = new PDFAlphaBitmap(bm);
|
| }
|
|
|