Index: src/utils/SkMeshUtils.cpp |
diff --git a/src/utils/SkMeshUtils.cpp b/src/utils/SkMeshUtils.cpp |
index 3857dc954f41ed91f277a3f7916a2f54b6e456bc..cf4e5099b37b010427bb420d0f0a454473544f63 100644 |
--- a/src/utils/SkMeshUtils.cpp |
+++ b/src/utils/SkMeshUtils.cpp |
@@ -21,15 +21,15 @@ bool SkMeshIndices::init(SkPoint tex[], uint16_t indices[], |
int texW, int texH, int rows, int cols) { |
if (rows < 2 || cols < 2) { |
sk_free(fStorage); |
- fStorage = NULL; |
- fTex = NULL; |
- fIndices = NULL; |
+ fStorage = nullptr; |
+ fTex = nullptr; |
+ fIndices = nullptr; |
fTexCount = fIndexCount = 0; |
return false; |
} |
sk_free(fStorage); |
- fStorage = NULL; |
+ fStorage = nullptr; |
fTexCount = rows * cols; |
rows -= 1; |
@@ -96,7 +96,7 @@ void SkMeshUtils::Draw(SkCanvas* canvas, const SkBitmap& bitmap, |
SkShader::kClamp_TileMode, |
SkShader::kClamp_TileMode))->unref(); |
canvas->drawVertices(SkCanvas::kTriangles_VertexMode, |
- rows * cols, verts, idx.tex(), colors, NULL, |
+ rows * cols, verts, idx.tex(), colors, nullptr, |
idx.indices(), idx.indexCount(), p); |
} |
} |