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

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

index aa8b8049c9a94e95d1c64224f859ec5ccadf98ec..c8959eecfbe01dbab865cc8e25e248fa3ddcc6e7 100644

--- a/src/effects/SkMatrixConvolutionImageFilter.cpp

+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp

@@ -265,7 +265,7 @@ static SkBitmap unpremultiplyBitmap(const SkBitmap& src)

return SkBitmap();

}

SkBitmap result;

- if (!result.allocPixels(src.info())) {

+ if (!result.tryAllocPixels(src.info())) {

return SkBitmap();

}

for (int y = 0; y < src.height(); ++y) {

@@ -307,7 +307,7 @@ bool SkMatrixConvolutionImageFilter::onFilterImage(Proxy* proxy,

return false;

}

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

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

return false;

}