Style Change: NULL->nullptr

src/utils/SkInterpolator.cpp

 
 /*
  * Copyright 2008 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 "SkInterpolator.h"
 #include "SkMath.h"
 #include "SkTSearch.h"
 
 SkInterpolatorBase::SkInterpolatorBase() {
-    fStorage    = NULL;
-    fTimes      = NULL;
-    SkDEBUGCODE(fTimesArray = NULL;)
+    fStorage    = nullptr;
+    fTimes      = nullptr;
+    SkDEBUGCODE(fTimesArray = nullptr;)
 }
 
 SkInterpolatorBase::~SkInterpolatorBase() {
     if (fStorage) {
         sk_free(fStorage);
     }
 }
 
 void SkInterpolatorBase::reset(int elemCount, int frameCount) {
     fFlags = 0;
     fElemCount = SkToU8(elemCount);
     fFrameCount = SkToS16(frameCount);
     fRepeat = SK_Scalar1;
     if (fStorage) {
         sk_free(fStorage);
-        fStorage = NULL;
-        fTimes = NULL;
-        SkDEBUGCODE(fTimesArray = NULL);
+        fStorage = nullptr;
+        fTimes = nullptr;
+        SkDEBUGCODE(fTimesArray = nullptr);
     }
 }
 
 /*  Each value[] run is formated as:
         <time (in msec)>
         <blend>
         <data[fElemCount]>
 
     Totaling fElemCount+2 entries per keyframe
 */
@@ skipping 76 matching lines @@
         *T = ComputeRelativeT(time, prevT, nextT, nextTime[-1].fBlend);
     }
     *indexPtr = index;
     *exactPtr = exact;
     return result;
 }
 
 
 SkInterpolator::SkInterpolator() {
     INHERITED::reset(0, 0);
-    fValues = NULL;
-    SkDEBUGCODE(fScalarsArray = NULL;)
+    fValues = nullptr;
+    SkDEBUGCODE(fScalarsArray = nullptr;)
 }
 
 SkInterpolator::SkInterpolator(int elemCount, int frameCount) {
     SkASSERT(elemCount > 0);
     this->reset(elemCount, frameCount);
 }
 
 void SkInterpolator::reset(int elemCount, int frameCount) {
     INHERITED::reset(elemCount, frameCount);
     fStorage = sk_malloc_throw((sizeof(SkScalar) * elemCount +
                                 sizeof(SkTimeCode)) * frameCount);
     fTimes = (SkTimeCode*) fStorage;
     fValues = (SkScalar*) ((char*) fStorage + sizeof(SkTimeCode) * frameCount);
 #ifdef SK_DEBUG
     fTimesArray = (SkTimeCode(*)[10]) fTimes;
     fScalarsArray = (SkScalar(*)[10]) fValues;
 #endif
 }
 
 #define SK_Fixed1Third      (SK_Fixed1/3)
 #define SK_Fixed2Third      (SK_Fixed1*2/3)
 
 static const SkScalar gIdentityBlend[4] = {
     0.33333333f, 0.33333333f, 0.66666667f, 0.66666667f
 };
 
 bool SkInterpolator::setKeyFrame(int index, SkMSec time,
                             const SkScalar values[], const SkScalar blend[4]) {
-    SkASSERT(values != NULL);
+    SkASSERT(values != nullptr);
 
-    if (blend == NULL) {
+    if (blend == nullptr) {
         blend = gIdentityBlend;
     }
 
     bool success = ~index == SkTSearch<SkMSec>(&fTimes->fTime, index, time,
                                                sizeof(SkTimeCode));
     SkASSERT(success);
     if (success) {
         SkTimeCode* timeCode = &fTimes[index];
         timeCode->fTime = time;
         memcpy(timeCode->fBlend, blend, sizeof(timeCode->fBlend));
@@ skipping 86 matching lines @@
     }
 
     // Now we have t, so compute the coeff for Y and evaluate
     b = pin_and_convert(by);
     c = pin_and_convert(cy);
     A = 3*b;
     B = 3*(c - 2*b);
     C = 3*(b - c) + Dot14_ONE;
     return SkFixedToScalar(eval_cubic(t, A, B, C) << 2);
 }