src/effects/SkMagnifierImageFilter.cpp - Issue 234833003: Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

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/effects/SkMagnifierImageFilter.cpp

Issue 234833003: Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 8 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:

Index: src/effects/SkMagnifierImageFilter.cpp

diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp

index 5096640166b679152493bd11ea9d941798bb127f..51ade99e34ef866bc667ad926b63beb60d083889 100644

--- a/src/effects/SkMagnifierImageFilter.cpp

+++ b/src/effects/SkMagnifierImageFilter.cpp

@@ -282,11 +282,11 @@

bool SkMagnifierImageFilter::onFilterImage(Proxy*, const SkBitmap& src,

const Context&, SkBitmap* dst,

SkIPoint* offset) const {

- SkASSERT(src.colorType() == kN32_SkColorType);

+ SkASSERT(src.colorType() == kPMColor_SkColorType);

SkASSERT(fSrcRect.width() < src.width());

SkASSERT(fSrcRect.height() < src.height());

- if ((src.colorType() != kN32_SkColorType) ||

+ if ((src.colorType() != kPMColor_SkColorType) ||

(fSrcRect.width() >= src.width()) ||

(fSrcRect.height() >= src.height())) {

return false;