src/core/SkBitmapProcState_sample.h - Issue 1316233002: Style Change: NULL->nullptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/core/SkBitmapProcState_sample.h

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

Download patch

Index: src/core/SkBitmapProcState_sample.h

diff --git a/src/core/SkBitmapProcState_sample.h b/src/core/SkBitmapProcState_sample.h

index 5322a3605c3d3eddc75446b7c2bae9ea1ccbc9ca..f70b758ac2310bcbbeefdddca3823626d2715cea 100644

--- a/src/core/SkBitmapProcState_sample.h

+++ b/src/core/SkBitmapProcState_sample.h

@@ -41,7 +41,7 @@ void MAKENAME(_filter_DXDY)(const SkBitmapProcState& s,

void MAKENAME(_nofilter_DXDY)(const SkBitmapProcState& s,

const uint32_t* SK_RESTRICT xy,

int count, DSTTYPE* SK_RESTRICT colors) {

- SkASSERT(count > 0 && colors != NULL);

+ SkASSERT(count > 0 && colors != nullptr);

SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);

SkDEBUGCODE(CHECKSTATE(s);)

@@ -83,7 +83,7 @@ void MAKENAME(_nofilter_DXDY)(const SkBitmapProcState& s,

void MAKENAME(_nofilter_DX)(const SkBitmapProcState& s,

const uint32_t* SK_RESTRICT xy,

int count, DSTTYPE* SK_RESTRICT colors) {

- SkASSERT(count > 0 && colors != NULL);

+ SkASSERT(count > 0 && colors != nullptr);

SkASSERT(s.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask));

SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);

SkDEBUGCODE(CHECKSTATE(s);)

@@ -138,7 +138,7 @@ void MAKENAME(_nofilter_DX)(const SkBitmapProcState& s,

void MAKENAME(_filter_DX)(const SkBitmapProcState& s,

const uint32_t* SK_RESTRICT xy,

int count, DSTTYPE* SK_RESTRICT colors) {

- SkASSERT(count > 0 && colors != NULL);

+ SkASSERT(count > 0 && colors != nullptr);

SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);

SkDEBUGCODE(CHECKSTATE(s);)

@@ -184,7 +184,7 @@ void MAKENAME(_filter_DX)(const SkBitmapProcState& s,

void MAKENAME(_filter_DXDY)(const SkBitmapProcState& s,

const uint32_t* SK_RESTRICT xy,

int count, DSTTYPE* SK_RESTRICT colors) {

- SkASSERT(count > 0 && colors != NULL);

+ SkASSERT(count > 0 && colors != nullptr);

SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);

SkDEBUGCODE(CHECKSTATE(s);)

« no previous file with comments | « src/core/SkBitmapProcState.cpp ('k') | src/core/SkBitmapProcState_shaderproc.h » ('j') | no next file with comments »