Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp
index 2296b8f..57e7957 100644
--- a/tests/MatrixTest.cpp
+++ b/tests/MatrixTest.cpp
@@ -142,7 +142,7 @@
// add 100 in case we have a bug, I don't want to kill my stack in the test
static const size_t kBufferSize = SkMatrix::kMaxFlattenSize + 100;
char buffer[kBufferSize];
- size_t size1 = m.writeToMemory(NULL);
+ size_t size1 = m.writeToMemory(nullptr);
size_t size2 = m.writeToMemory(buffer);
REPORTER_ASSERT(reporter, size1 == size2);
REPORTER_ASSERT(reporter, size1 <= SkMatrix::kMaxFlattenSize);
@@ -497,7 +497,7 @@
REPORTER_ASSERT(reporter, SkDecomposeUpper2x2(mat, &rotation1, &scale, &rotation2));
REPORTER_ASSERT(reporter, check_matrix_recomposition(mat, rotation1, scale, rotation2));
// make sure it doesn't crash if we pass in NULLs
- REPORTER_ASSERT(reporter, SkDecomposeUpper2x2(mat, NULL, NULL, NULL));
+ REPORTER_ASSERT(reporter, SkDecomposeUpper2x2(mat, nullptr, nullptr, nullptr));
// rotation only
mat.setRotate(kRotation0);
@@ -711,7 +711,7 @@
// doesn't crash with null dst, src, count == 0
{
- mats[0].mapHomogeneousPoints(NULL, NULL, 0);
+ mats[0].mapHomogeneousPoints(nullptr, nullptr, 0);
}
// uniform scale of point
@@ -822,7 +822,7 @@
mat.setScale(SkIntToScalar(3), SkIntToScalar(5), SkIntToScalar(20), 0);
mat.postRotate(SkIntToScalar(25));
- REPORTER_ASSERT(reporter, mat.invert(NULL));
+ REPORTER_ASSERT(reporter, mat.invert(nullptr));
REPORTER_ASSERT(reporter, mat.invert(&inverse));
iden1.setConcat(mat, inverse);
REPORTER_ASSERT(reporter, is_identity(iden1));
@@ -832,17 +832,17 @@
test_flatten(reporter, iden2);
mat.setScale(0, SK_Scalar1);
- REPORTER_ASSERT(reporter, !mat.invert(NULL));
+ REPORTER_ASSERT(reporter, !mat.invert(nullptr));
REPORTER_ASSERT(reporter, !mat.invert(&inverse));
mat.setScale(SK_Scalar1, 0);
- REPORTER_ASSERT(reporter, !mat.invert(NULL));
+ REPORTER_ASSERT(reporter, !mat.invert(nullptr));
REPORTER_ASSERT(reporter, !mat.invert(&inverse));
// Inverting this matrix results in a non-finite matrix
mat.setAll(0.0f, 1.0f, 2.0f,
0.0f, 1.0f, -3.40277175e+38f,
1.00003040f, 1.0f, 0.0f);
- REPORTER_ASSERT(reporter, !mat.invert(NULL));
+ REPORTER_ASSERT(reporter, !mat.invert(nullptr));
REPORTER_ASSERT(reporter, !mat.invert(&inverse));
// rectStaysRect test