Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1046)

Unified Diff: src/utils/SkTextureCompressor_ASTC.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/utils/SkTextureCompressor.cpp ('k') | src/utils/SkTextureCompressor_Blitter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « src/utils/SkTextureCompressor.cpp ('k') | src/utils/SkTextureCompressor_Blitter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698