commit 96fcdcc219d2a0d3579719b84b28bede76efba64
author halcanary <halcanary@google.com> Thu Aug 27 07:41:13 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 27 07:41:16 2015 -0700
tree 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd
parent 435af2f736c85c3274a0c6760a3523810750d237

Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002

Review URL: https://codereview.chromium.org/1316233002

tests/ImageDecodingTest.cpp

diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp
index 971c3e7..69ed7de 100644
--- a/tests/ImageDecodingTest.cpp
+++ b/tests/ImageDecodingTest.cpp
@@ -87,7 +87,7 @@
     }
 
     SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(&stream));
-    if (NULL == decoder.get()) {
+    if (nullptr == decoder.get()) {
         SkDebugf("couldn't decode %s\n", filename.c_str());
         return;
     }
@@ -176,7 +176,7 @@
     SkFILEStream stream(filename.c_str());
 
     SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(&stream));
-    if (NULL == decoder.get()) {
+    if (nullptr == decoder.get()) {
         return;
     }
 
@@ -281,7 +281,7 @@
         // This should never fail since we know the images we're decoding.
         SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(&stream));
         REPORTER_ASSERT(reporter, decoder.get());
-        if (NULL == decoder.get()) {
+        if (nullptr == decoder.get()) {
             continue;
         }
 
@@ -424,8 +424,8 @@
 static SkPixelRef* install_pixel_ref(SkBitmap* bitmap,
                                      SkStreamRewindable* stream,
                                      int sampleSize, bool ditherImage) {
-    SkASSERT(bitmap != NULL);
-    SkASSERT(stream != NULL);
+    SkASSERT(bitmap != nullptr);
+    SkASSERT(stream != nullptr);
     SkASSERT(stream->rewind());
     SkColorType colorType = bitmap->colorType();
     SkDecodingImageGenerator::Options opts(sampleSize, ditherImage, colorType);
@@ -433,7 +433,7 @@
                 SkDecodingImageGenerator::Create(stream, opts), bitmap)) {
         return bitmap->pixelRef();
     }
-    return NULL;
+    return nullptr;
 }
 /**
  *  A test for the SkDecodingImageGenerator::Create and
@@ -515,13 +515,13 @@
     SkBitmap bm;
     bool success = false;
     if (useData) {
-        if (NULL == encodedData) {
+        if (nullptr == encodedData) {
             return;
         }
         success = SkInstallDiscardablePixelRef(
             SkDecodingImageGenerator::Create(encodedData, opts), &bm);
     } else {
-        if (NULL == encodedStream) {
+        if (nullptr == encodedStream) {
             return;
         }
         success = SkInstallDiscardablePixelRef(
@@ -554,7 +554,7 @@
     //     && out_size <= SkNextPow2(((in_size - 1) / sample_size) + 1));
     #endif  // SK_BUILD_FOR_ANDROID || SK_BUILD_FOR_UNIX
     SkAutoLockPixels alp(bm);
-    if (bm.getPixels() == NULL) {
+    if (bm.getPixels() == nullptr) {
         ERRORF(reporter, "Pixel decode failed [sampleSize=%d dither=%s "
                "colorType=%s %s]", opts.fSampleSize, yn(opts.fDitherImage),
                options_colorType(opts), path.c_str());
@@ -635,10 +635,10 @@
         }
 
         SkAutoDataUnref encodedData(SkData::NewFromFileName(path.c_str()));
-        REPORTER_ASSERT(reporter, encodedData.get() != NULL);
+        REPORTER_ASSERT(reporter, encodedData.get() != nullptr);
         SkAutoTDelete<SkStreamRewindable> encodedStream(
             SkStream::NewFromFile(path.c_str()));
-        REPORTER_ASSERT(reporter, encodedStream.get() != NULL);
+        REPORTER_ASSERT(reporter, encodedStream.get() != nullptr);
 
         for (size_t i = 0; i < SK_ARRAY_COUNT(scaleList); ++i) {
             for (size_t j = 0; j < SK_ARRAY_COUNT(ditherList); ++j) {
@@ -702,13 +702,13 @@
         SkASSERT(bm);
         if (bm->info().getSafeSize(bm->rowBytes()) <= fSize) {
             bm->setPixels(fPixels, ct);
-            fPixels = NULL;
+            fPixels = nullptr;
             fSize = 0;
             return true;
         }
-        return bm->tryAllocPixels(NULL, ct);
+        return bm->tryAllocPixels(nullptr, ct);
     }
-    bool ready() { return fPixels != NULL; }
+    bool ready() { return fPixels != nullptr; }
 private:
     void* fPixels;
     size_t fSize;
@@ -727,7 +727,7 @@
         return;
     }
     SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(stream));
-    if (NULL == decoder.get()) {
+    if (nullptr == decoder.get()) {
         ERRORF(r, "\nSkImageDecoder::Factory failed.\n");
         return;
     }