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

Unified Diff: src/utils/SkTextureCompressor.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.h ('k') | src/utils/SkTextureCompressor_ASTC.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/SkTextureCompressor.cpp
diff --git a/src/utils/SkTextureCompressor.cpp b/src/utils/SkTextureCompressor.cpp
index c256a61a970fd636439ba45e69f299aea85c89f1..e308f6e480caa48027c338ccd575ded9b7169e41 100644
--- a/src/utils/SkTextureCompressor.cpp
+++ b/src/utils/SkTextureCompressor.cpp
@@ -35,7 +35,7 @@ static bool compress_etc1_565(uint8_t* dst, const uint8_t* src,
namespace SkTextureCompressor {
void GetBlockDimensions(Format format, int* dimX, int* dimY, bool matchSpec) {
- if (NULL == dimX || NULL == dimY) {
+ if (nullptr == dimX || nullptr == dimY) {
return;
}
@@ -147,7 +147,7 @@ bool CompressBufferToFormat(uint8_t* dst, const uint8_t* src, SkColorType srcCol
SkData* CompressBitmapToFormat(const SkPixmap& pixmap, Format format) {
int compressedDataSize = GetCompressedDataSize(format, pixmap.width(), pixmap.height());
if (compressedDataSize < 0) {
- return NULL;
+ return nullptr;
}
const uint8_t* src = reinterpret_cast<const uint8_t*>(pixmap.addr());
@@ -156,7 +156,7 @@ SkData* CompressBitmapToFormat(const SkPixmap& pixmap, Format format) {
if (!CompressBufferToFormat((uint8_t*)dst->writable_data(), src, pixmap.colorType(),
pixmap.width(), pixmap.height(), pixmap.rowBytes(), format)) {
dst->unref();
- dst = NULL;
+ dst = nullptr;
}
return dst;
}
@@ -174,10 +174,10 @@ SkBlitter* CreateBlitterForFormat(int width, int height, void* compressedBuffer,
return CreateASTCBlitter(width, height, compressedBuffer, allocator);
default:
- return NULL;
+ return nullptr;
}
- return NULL;
+ return nullptr;
}
bool DecompressBufferFromFormat(uint8_t* dst, int dstRowBytes, const uint8_t* src,
« no previous file with comments | « src/utils/SkTextureCompressor.h ('k') | src/utils/SkTextureCompressor_ASTC.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698