Style Change: NULL->nullptr

src/utils/SkParseColor.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkParse.h"
@@ skipping 405 matching lines @@
             }
             ++sixMatchPtr;
         }
         int sixMask = *sixMatchPtr & ~0x80000000;
         int midMask = gColorNames[mid] & ~0x80000000;
         if (sixMask > midMask) {
             lo = mid + 2;   // skip color
             while ((int) gColorNames[lo] >= 0)
                 ++lo;
         } else if (hi == mid)
-            return NULL;
+            return nullptr;
         else
             hi = mid;
     }
-    return NULL;
+    return nullptr;
 }
 
 // !!! move to char utilities
 //static int count_separators(const char* str, const char* sep) {
 //  char c;
 //  int separators = 0;
 //  while ((c = *str++) != '\0') {
-//      if (strchr(sep, c) == NULL)
+//      if (strchr(sep, c) == nullptr)
 //          continue;
 //      do {
 //          if ((c = *str++) == '\0')
 //              goto goHome;
-//      } while (strchr(sep, c) != NULL);
+//      } while (strchr(sep, c) != nullptr);
 //      separators++;
 //  }
 //goHome:
 //  return separators;
 //}
 
 static inline unsigned nib2byte(unsigned n)
 {
     SkASSERT((n & ~0xF) == 0);
     return (n << 4) | n;
 }
 
 const char* SkParse::FindColor(const char* value, SkColor* colorPtr) {
     unsigned int oldAlpha = SkColorGetA(*colorPtr);
     if (value[0] == '#') {
         uint32_t    hex;
         const char* end = SkParse::FindHex(value + 1, &hex);
 //      SkASSERT(end);
-        if (end == NULL)
+        if (end == nullptr)
             return end;
         size_t len = end - value - 1;
         if (len == 3 || len == 4) {
             unsigned a = len == 4 ? nib2byte(hex >> 12) : oldAlpha;
             unsigned r = nib2byte((hex >> 8) & 0xF);
             unsigned g = nib2byte((hex >> 4) & 0xF);
             unsigned b = nib2byte(hex & 0xF);
             *colorPtr = SkColorSetARGB(a, r, g, b);
             return end;
         } else if (len == 6 || len == 8) {
             if (len == 6)
                 hex |= oldAlpha << 24;
             *colorPtr = hex;
             return end;
         } else {
 //          SkASSERT(0);
-            return NULL;
+            return nullptr;
         }
 //  } else if (strchr(value, ',')) {
 //      SkScalar array[4];
 //      int count = count_separators(value, ",") + 1; // !!! count commas, add 1
 //      SkASSERT(count == 3 || count == 4);
 //      array[0] = SK_Scalar1 * 255;
 //      const char* end = SkParse::FindScalars(value, &array[4 - count], count);
-//      if (end == NULL)
-//          return NULL;
+//      if (end == nullptr)
+//          return nullptr;
         // !!! range check for errors?
 //      *colorPtr = SkColorSetARGB(SkScalarRoundToInt(array[0]), SkScalarRoundToInt(array[1]),
 //          SkScalarRoundToInt(array[2]), SkScalarRoundToInt(array[3]));
 //      return end;
     } else
         return FindNamedColor(value, strlen(value), colorPtr);
 }
 
 #ifdef SK_SUPPORT_UNITTEST
 void SkParse::TestColor() {
     if (false)
         CreateTable();  // regenerates data table in the output window
     SkColor result;
     int index;
     for (index = 0; index < colorNamesSize; index++) {
         result = SK_ColorBLACK;
         SkNameRGB nameRGB = colorNames[index];
-        SkASSERT(FindColor(nameRGB.name, &result) != NULL);
+        SkASSERT(FindColor(nameRGB.name, &result) != nullptr);
         SkASSERT(result == (SkColor) (nameRGB.rgb | 0xFF000000));
     }
     for (index = 0; index < colorNamesSize; index++) {
         result = SK_ColorBLACK;
         SkNameRGB nameRGB = colorNames[index];
         char bad[24];
         size_t len = strlen(nameRGB.name);
         memcpy(bad, nameRGB.name, len);
         bad[len - 1] -= 1;
-        SkASSERT(FindColor(bad, &result) == NULL);
+        SkASSERT(FindColor(bad, &result) == nullptr);
         bad[len - 1] += 2;
-        SkASSERT(FindColor(bad, &result) == NULL);
+        SkASSERT(FindColor(bad, &result) == nullptr);
     }
     result = SK_ColorBLACK;
     SkASSERT(FindColor("lightGrey", &result));
     SkASSERT(result == 0xffd3d3d3);
 //  SkASSERT(FindColor("12,34,56,78", &result));
 //  SkASSERT(result == ((12 << 24) | (34 << 16) | (56 << 8) | (78 << 0)));
     result = SK_ColorBLACK;
     SkASSERT(FindColor("#ABCdef", &result));
     SkASSERT(result == 0XFFABCdef);
     SkASSERT(FindColor("#12ABCdef", &result));
     SkASSERT(result == 0X12ABCdef);
     result = SK_ColorBLACK;
     SkASSERT(FindColor("#123", &result));
     SkASSERT(result == 0Xff112233);
     SkASSERT(FindColor("#abcd", &result));
     SkASSERT(result == 0Xaabbccdd);
     result = SK_ColorBLACK;
 //  SkASSERT(FindColor("71,162,253", &result));
 //  SkASSERT(result == ((0xFF << 24) | (71 << 16) | (162 << 8) | (253 << 0)));
 }
 #endif