| Index: src/core/SkBlitter_A8.cpp
|
| diff --git a/src/core/SkBlitter_A8.cpp b/src/core/SkBlitter_A8.cpp
|
| index ce7d6e7ad2ffc4eede2a8cc572c326ecaab90534..51748b00e957594767c82c8d1219a8abd0026dc3 100644
|
| --- a/src/core/SkBlitter_A8.cpp
|
| +++ b/src/core/SkBlitter_A8.cpp
|
| @@ -21,7 +21,7 @@ const SkPixmap* SkA8_Blitter::justAnOpaqueColor(uint32_t* value) {
|
| *value = 255;
|
| return &fDevice;
|
| }
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| void SkA8_Blitter::blitH(int x, int y, int width) {
|
| @@ -231,7 +231,7 @@ SkA8_Shader_Blitter::SkA8_Shader_Blitter(const SkPixmap& device, const SkPaint&
|
| SkShader::Context* shaderContext)
|
| : INHERITED(device, paint, shaderContext)
|
| {
|
| - if ((fXfermode = paint.getXfermode()) != NULL) {
|
| + if ((fXfermode = paint.getXfermode()) != nullptr) {
|
| fXfermode->ref();
|
| SkASSERT(fShaderContext);
|
| }
|
| @@ -260,7 +260,7 @@ void SkA8_Shader_Blitter::blitH(int x, int y, int width) {
|
|
|
| shaderContext->shadeSpan(x, y, span, width);
|
| if (fXfermode) {
|
| - fXfermode->xferA8(device, span, width, NULL);
|
| + fXfermode->xferA8(device, span, width, nullptr);
|
| } else {
|
| for (int i = width - 1; i >= 0; --i) {
|
| unsigned srcA = SkGetPackedA32(span[i]);
|
| @@ -298,7 +298,7 @@ void SkA8_Shader_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
|
| }
|
| int aa = *antialias;
|
| if (aa) {
|
| - if (opaque && aa == 255 && mode == NULL) {
|
| + if (opaque && aa == 255 && mode == nullptr) {
|
| memset(device, 0xFF, count);
|
| } else {
|
| shaderContext->shadeSpan(x, y, span, count);
|
| @@ -355,9 +355,9 @@ void SkA8_Shader_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) {
|
|
|
| SkA8_Coverage_Blitter::SkA8_Coverage_Blitter(const SkPixmap& device,
|
| const SkPaint& paint) : SkRasterBlitter(device) {
|
| - SkASSERT(NULL == paint.getShader());
|
| - SkASSERT(NULL == paint.getXfermode());
|
| - SkASSERT(NULL == paint.getColorFilter());
|
| + SkASSERT(nullptr == paint.getShader());
|
| + SkASSERT(nullptr == paint.getXfermode());
|
| + SkASSERT(nullptr == paint.getColorFilter());
|
| }
|
|
|
| void SkA8_Coverage_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
|
| @@ -430,5 +430,5 @@ void SkA8_Coverage_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) {
|
| }
|
|
|
| const SkPixmap* SkA8_Coverage_Blitter::justAnOpaqueColor(uint32_t*) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|