aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/utils/SkInterpolator.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/utils/SkInterpolator.h')
-rw-r--r--include/utils/SkInterpolator.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/utils/SkInterpolator.h b/include/utils/SkInterpolator.h
index e062b38f65..61e652519a 100644
--- a/include/utils/SkInterpolator.h
+++ b/include/utils/SkInterpolator.h
@@ -67,8 +67,8 @@ protected:
kReset = 2,
kHasBlend = 4
};
- static SkScalar ComputeRelativeT(SkMSec time, SkMSec prevTime,
- SkMSec nextTime, const SkScalar blend[4] = NULL);
+ static SkScalar ComputeRelativeT(SkMSec time, SkMSec prevTime, SkMSec nextTime,
+ const SkScalar blend[4] = nullptr);
int16_t fFrameCount;
uint8_t fElemCount;
uint8_t fFlags;
@@ -102,7 +102,7 @@ public:
1 is a linear blend (default)
*/
bool setKeyFrame(int index, SkMSec time, const SkScalar values[],
- const SkScalar blend[4] = NULL);
+ const SkScalar blend[4] = nullptr);
/** Return the computed values given the specified time. Return whether
those values are the result of pinning to either the first
@@ -111,7 +111,7 @@ public:
@param time The time to sample (in milliseconds)
@param (may be null) where to write the computed values.
*/
- Result timeToValues(SkMSec time, SkScalar values[] = NULL) const;
+ Result timeToValues(SkMSec time, SkScalar values[] = nullptr) const;
private:
SkScalar* fValues; // pointer into fStorage