| Index: src/opts/SkBitmapProcState_opts_SSE2.cpp
|
| diff --git a/src/opts/SkBitmapProcState_opts_SSE2.cpp b/src/opts/SkBitmapProcState_opts_SSE2.cpp
|
| index f55a09938c37ba86eab8480dc50b92a08e8cd1df..68d920d8d81f12b0756e1fe077e64aea3b074b38 100644
|
| --- a/src/opts/SkBitmapProcState_opts_SSE2.cpp
|
| +++ b/src/opts/SkBitmapProcState_opts_SSE2.cpp
|
| @@ -14,7 +14,7 @@
|
| void S32_opaque_D32_filter_DX_SSE2(const SkBitmapProcState& s,
|
| const uint32_t* xy,
|
| int count, uint32_t* colors) {
|
| - SkASSERT(count > 0 && colors != NULL);
|
| + SkASSERT(count > 0 && colors != nullptr);
|
| SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
|
| SkASSERT(kN32_SkColorType == s.fPixmap.colorType());
|
| SkASSERT(s.fAlphaScale == 256);
|
| @@ -120,7 +120,7 @@ void S32_opaque_D32_filter_DX_SSE2(const SkBitmapProcState& s,
|
| void S32_alpha_D32_filter_DX_SSE2(const SkBitmapProcState& s,
|
| const uint32_t* xy,
|
| int count, uint32_t* colors) {
|
| - SkASSERT(count > 0 && colors != NULL);
|
| + SkASSERT(count > 0 && colors != nullptr);
|
| SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
|
| SkASSERT(kN32_SkColorType == s.fPixmap.colorType());
|
| SkASSERT(s.fAlphaScale < 256);
|
| @@ -640,7 +640,7 @@ void ClampX_ClampY_nofilter_affine_SSE2(const SkBitmapProcState& s,
|
| void S32_D16_filter_DX_SSE2(const SkBitmapProcState& s,
|
| const uint32_t* xy,
|
| int count, uint16_t* colors) {
|
| - SkASSERT(count > 0 && colors != NULL);
|
| + SkASSERT(count > 0 && colors != nullptr);
|
| SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
|
| SkASSERT(kN32_SkColorType == s.fPixmap.colorType());
|
| SkASSERT(s.fPixmap.isOpaque());
|
|
|