src/images/SkScaledBitmapSampler.cpp - Issue 1316233002: Style Change: NULL->nullptr

Unified Diff: src/images/SkScaledBitmapSampler.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: src/images/SkScaledBitmapSampler.cpp

diff --git a/src/images/SkScaledBitmapSampler.cpp b/src/images/SkScaledBitmapSampler.cpp

index 1d8d98dafd4fdda60068c97fbce6cd1510535a79..5ffd64889396b57ac8b5bf893f7f106212be00f1 100644

--- a/src/images/SkScaledBitmapSampler.cpp

+++ b/src/images/SkScaledBitmapSampler.cpp

@@ -343,7 +343,7 @@ static SkScaledBitmapSampler::RowProc

get_RGBA_to_4444_proc(const SkScaledBitmapSampler::Options& opts) {

if (!opts.fPremultiplyAlpha) {

// Unpremultiplied is not supported for 4444

- return NULL;

+ return nullptr;

}

if (opts.fSkipZeros) {

if (opts.fDither) {

@@ -515,7 +515,7 @@ static SkScaledBitmapSampler::RowProc

get_index_to_4444_proc(const SkScaledBitmapSampler::Options& opts) {

// Unpremul not allowed

if (!opts.fPremultiplyAlpha) {

- return NULL;

+ return nullptr;

}

if (opts.fSkipZeros) {

if (opts.fDither) {

@@ -548,7 +548,7 @@ static SkScaledBitmapSampler::RowProc

get_index_to_index_proc(const SkScaledBitmapSampler::Options& opts) {

// Unpremul not allowed

if (!opts.fPremultiplyAlpha) {

- return NULL;

+ return nullptr;

}

// Ignore dither and skip zeroes

return Sample_Index_DI;

@@ -563,14 +563,14 @@ static bool Sample_Gray_DA8(void* SK_RESTRICT dstRow,

// except we assume that there is alpha for speed, since an A8

// bitmap with no alpha is not interesting.

(void) Sample_Index_DI(dstRow, src, width, deltaSrc, /* y unused */ 0,

- /* ctable unused */ NULL);

+ /* ctable unused */ nullptr);

return true;

}

static SkScaledBitmapSampler::RowProc

get_gray_to_A8_proc(const SkScaledBitmapSampler::Options& opts) {

if (!opts.fPremultiplyAlpha) {

- return NULL;

+ return nullptr;

}

// Ignore skip and dither.

return Sample_Gray_DA8;

@@ -583,9 +583,9 @@ typedef SkScaledBitmapSampler::RowProc (*RowProcChooser)(const SkScaledBitmapSam

SkScaledBitmapSampler::SkScaledBitmapSampler(int width, int height,

int sampleSize) {

- fCTable = NULL;

- fDstRow = NULL;

- fRowProc = NULL;

+ fCTable = nullptr;

+ fDstRow = nullptr;

+ fRowProc = nullptr;

if (width <= 0 || height <= 0) {

sk_throw();

@@ -631,7 +631,7 @@ bool SkScaledBitmapSampler::begin(SkBitmap* dst, SrcConfig sc,

get_RGBx_to_8888_proc,

get_RGBA_to_8888_proc,

get_index_to_8888_proc,

- NULL, // 565 to 8888

+ nullptr, // 565 to 8888

get_gray_to_565_proc,

get_RGBx_to_565_proc,

@@ -643,19 +643,19 @@ bool SkScaledBitmapSampler::begin(SkBitmap* dst, SrcConfig sc,

get_RGBx_to_4444_proc,

get_RGBA_to_4444_proc,

get_index_to_4444_proc,

- NULL, // 565 to 4444

+ nullptr, // 565 to 4444

- NULL, // gray to index

- NULL, // rgbx to index

- NULL, // rgba to index

+ nullptr, // gray to index

+ nullptr, // rgbx to index

+ nullptr, // rgba to index

get_index_to_index_proc,

- NULL, // 565 to index

+ nullptr, // 565 to index

get_gray_to_A8_proc,

- NULL, // rgbx to a8

- NULL, // rgba to a8

- NULL, // index to a8

- NULL, // 565 to a8

+ nullptr, // rgbx to a8

+ nullptr, // rgba to a8

+ nullptr, // index to a8

+ nullptr, // 565 to a8

};

// The jump between dst configs in the table

@@ -716,15 +716,15 @@ bool SkScaledBitmapSampler::begin(SkBitmap* dst, SrcConfig sc,

}

RowProcChooser chooser = gProcChoosers[index];

- if (NULL == chooser) {

- fRowProc = NULL;

+ if (nullptr == chooser) {

+ fRowProc = nullptr;

} else {

fRowProc = chooser(opts);

}

fDstRow = (char*)dst->getPixels();

fDstRowBytes = dst->rowBytes();

fCurrY = 0;

- return fRowProc != NULL;

+ return fRowProc != nullptr;

}

bool SkScaledBitmapSampler::begin(SkBitmap* dst, SrcConfig sc,

@@ -794,41 +794,41 @@ public:

// ~D~U D~U ~DU DU

SkScaledBitmapSampler::RowProc gTestProcs[] = {

// Gray

- Sample_Gray_DA8, Sample_Gray_DA8, NULL, NULL, // to A8

- NULL, NULL, NULL, NULL, // to Index8

+ Sample_Gray_DA8, Sample_Gray_DA8, nullptr, nullptr, // to A8

+ nullptr, nullptr, nullptr, nullptr, // to Index8

Sample_Gray_D565, Sample_Gray_D565_D, Sample_Gray_D565, Sample_Gray_D565_D, // to 565

Sample_Gray_D4444, Sample_Gray_D4444_D, Sample_Gray_D4444, Sample_Gray_D4444_D, // to 4444

Sample_Gray_D8888, Sample_Gray_D8888, Sample_Gray_D8888, Sample_Gray_D8888, // to 8888

// Index

- NULL, NULL, NULL, NULL, // to A8

- Sample_Index_DI, Sample_Index_DI, NULL, NULL, // to Index8

+ nullptr, nullptr, nullptr, nullptr, // to A8

+ Sample_Index_DI, Sample_Index_DI, nullptr, nullptr, // to Index8

Sample_Index_D565, Sample_Index_D565_D, Sample_Index_D565, Sample_Index_D565_D, // to 565

- Sample_Index_D4444, Sample_Index_D4444_D, NULL, NULL, // to 4444

+ Sample_Index_D4444, Sample_Index_D4444_D, nullptr, nullptr, // to 4444

Sample_Index_D8888, Sample_Index_D8888, Sample_Index_D8888, Sample_Index_D8888, // to 8888

// RGB

- NULL, NULL, NULL, NULL, // to A8

- NULL, NULL, NULL, NULL, // to Index8

+ nullptr, nullptr, nullptr, nullptr, // to A8

+ nullptr, nullptr, nullptr, nullptr, // to Index8

Sample_RGBx_D565, Sample_RGBx_D565_D, Sample_RGBx_D565, Sample_RGBx_D565_D, // to 565

Sample_RGBx_D4444, Sample_RGBx_D4444_D, Sample_RGBx_D4444, Sample_RGBx_D4444_D, // to 4444

Sample_RGBx_D8888, Sample_RGBx_D8888, Sample_RGBx_D8888, Sample_RGBx_D8888, // to 8888

// RGBx is the same as RGB

- NULL, NULL, NULL, NULL, // to A8

- NULL, NULL, NULL, NULL, // to Index8

+ nullptr, nullptr, nullptr, nullptr, // to A8

+ nullptr, nullptr, nullptr, nullptr, // to Index8

Sample_RGBx_D565, Sample_RGBx_D565_D, Sample_RGBx_D565, Sample_RGBx_D565_D, // to 565

Sample_RGBx_D4444, Sample_RGBx_D4444_D, Sample_RGBx_D4444, Sample_RGBx_D4444_D, // to 4444

Sample_RGBx_D8888, Sample_RGBx_D8888, Sample_RGBx_D8888, Sample_RGBx_D8888, // to 8888

// RGBA

- NULL, NULL, NULL, NULL, // to A8

- NULL, NULL, NULL, NULL, // to Index8

+ nullptr, nullptr, nullptr, nullptr, // to A8

+ nullptr, nullptr, nullptr, nullptr, // to Index8

Sample_RGBx_D565, Sample_RGBx_D565_D, Sample_RGBx_D565, Sample_RGBx_D565_D, // to 565

- Sample_RGBA_D4444, Sample_RGBA_D4444_D, NULL, NULL, // to 4444

+ Sample_RGBA_D4444, Sample_RGBA_D4444_D, nullptr, nullptr, // to 4444

Sample_RGBA_D8888, Sample_RGBA_D8888, Sample_RGBA_D8888_Unpremul, Sample_RGBA_D8888_Unpremul, // to 8888

// RGB_565

- NULL, NULL, NULL, NULL, // to A8

- NULL, NULL, NULL, NULL, // to Index8

+ nullptr, nullptr, nullptr, nullptr, // to A8

+ nullptr, nullptr, nullptr, nullptr, // to Index8

Sample_D565_D565, Sample_D565_D565, Sample_D565_D565, Sample_D565_D565, // to 565

- NULL, NULL, NULL, NULL, // to 4444

- NULL, NULL, NULL, NULL, // to 8888

+ nullptr, nullptr, nullptr, nullptr, // to 4444

+ nullptr, nullptr, nullptr, nullptr, // to 8888

};

// Dummy class that allows instantiation of an ImageDecoder, so begin can query its fields.

« no previous file with comments | « src/images/SkScaledBitmapSampler.h ('k') | src/images/bmpdecoderhelper.h » ('j') | no next file with comments »