| Index: src/utils/SkTextureCompressor_ASTC.cpp
|
| diff --git a/src/utils/SkTextureCompressor_ASTC.cpp b/src/utils/SkTextureCompressor_ASTC.cpp
|
| index 7969359e98495f51c3878970af103dc2216beb0c..a6e91d66b8e8c078ea51c2c21f0ebe7f71beae97 100644
|
| --- a/src/utils/SkTextureCompressor_ASTC.cpp
|
| +++ b/src/utils/SkTextureCompressor_ASTC.cpp
|
| @@ -1175,7 +1175,7 @@ struct ASTCDecompressionData {
|
| // in the maximum encoding that will fit the number of color values that
|
| // we need. Returns false on error. (See section C.2.22 of the spec)
|
| bool getColorValueEncoding(int *nBits, int *nTrits, int *nQuints) const {
|
| - if (NULL == nBits || NULL == nTrits || NULL == nQuints) {
|
| + if (nullptr == nBits || nullptr == nTrits || nullptr == nQuints) {
|
| return false;
|
| }
|
|
|
| @@ -2057,7 +2057,7 @@ bool CompressA8To12x12ASTC(uint8_t* dst, const uint8_t* src,
|
| SkBlitter* CreateASTCBlitter(int width, int height, void* outputBuffer,
|
| SkTBlitterAllocator* allocator) {
|
| if ((width % 12) != 0 || (height % 12) != 0) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| // Memset the output buffer to an encoding that decodes to zero. We must do this
|
|
|