diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /tests/ImageGeneratorTest.cpp | |
| parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) | |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'tests/ImageGeneratorTest.cpp')
| -rw-r--r-- | tests/ImageGeneratorTest.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/ImageGeneratorTest.cpp b/tests/ImageGeneratorTest.cpp index 1846f5762e..d6f546acb1 100644 --- a/tests/ImageGeneratorTest.cpp +++ b/tests/ImageGeneratorTest.cpp @@ -14,7 +14,7 @@ static bool gMyFactoryWasCalled; static SkImageGenerator* my_factory(SkData*) { gMyFactoryWasCalled = true; - return NULL; + return nullptr; } static void test_imagegenerator_factory(skiatest::Reporter* reporter) { @@ -27,14 +27,14 @@ static void test_imagegenerator_factory(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, !gMyFactoryWasCalled); gen = SkImageGenerator::NewFromEncoded(data); - REPORTER_ASSERT(reporter, NULL == gen); + REPORTER_ASSERT(reporter, nullptr == gen); REPORTER_ASSERT(reporter, !gMyFactoryWasCalled); // Test is racy, in that it hopes no other thread is changing this global... SkGraphics::ImageGeneratorFromEncodedFactory prev = SkGraphics::SetImageGeneratorFromEncodedFactory(my_factory); gen = SkImageGenerator::NewFromEncoded(data); - REPORTER_ASSERT(reporter, NULL == gen); + REPORTER_ASSERT(reporter, nullptr == gen); REPORTER_ASSERT(reporter, gMyFactoryWasCalled); SkGraphics::SetImageGeneratorFromEncodedFactory(prev); } @@ -50,16 +50,16 @@ DEF_TEST(ImageGenerator, reporter) { sizes[0] = SkISize::Make(200, 200); sizes[1] = SkISize::Make(100, 100); sizes[2] = SkISize::Make( 50, 50); - void* planes[3] = { NULL }; + void* planes[3] = { nullptr }; size_t rowBytes[3] = { 0 }; SkYUVColorSpace colorSpace; // Check that the YUV decoding API does not cause any crashes - ig.getYUV8Planes(sizes, NULL, NULL, &colorSpace); - ig.getYUV8Planes(sizes, NULL, NULL, NULL); - ig.getYUV8Planes(sizes, planes, NULL, NULL); - ig.getYUV8Planes(sizes, NULL, rowBytes, NULL); - ig.getYUV8Planes(sizes, planes, rowBytes, NULL); + ig.getYUV8Planes(sizes, nullptr, nullptr, &colorSpace); + ig.getYUV8Planes(sizes, nullptr, nullptr, nullptr); + ig.getYUV8Planes(sizes, planes, nullptr, nullptr); + ig.getYUV8Planes(sizes, nullptr, rowBytes, nullptr); + ig.getYUV8Planes(sizes, planes, rowBytes, nullptr); ig.getYUV8Planes(sizes, planes, rowBytes, &colorSpace); int dummy; |