src/effects/SkMorphologyImageFilter.cpp - Issue 510423005: make allocPixels throw on failure

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/SkMorphologyImageFilter.cpp

Issue 510423005: make allocPixels throw on failure (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: can't use (void) to suppress the "must check return result" Created 6 years, 3 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/SkMorphologyImageFilter.cpp

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

index 2b9c91eb533b03b79d268f2027eca323265aa0f2..c6c470c390cb9f059b69b0e1d5ebf26113358e96 100644

--- a/src/effects/SkMorphologyImageFilter.cpp

+++ b/src/effects/SkMorphologyImageFilter.cpp

@@ -166,7 +166,7 @@ bool SkMorphologyImageFilter::filterImageGeneric(SkMorphologyImageFilter::Proc p

return false;

}

- if (!dst->allocPixels(src.info().makeWH(bounds.width(), bounds.height()))) {

+ if (!dst->tryAllocPixels(src.info().makeWH(bounds.width(), bounds.height()))) {

return false;

}

@@ -191,7 +191,7 @@ bool SkMorphologyImageFilter::filterImageGeneric(SkMorphologyImageFilter::Proc p

}

SkBitmap temp;

- if (!temp.allocPixels(dst->info())) {

+ if (!temp.tryAllocPixels(dst->info())) {

return false;

}