src/image/SkImage.cpp - Issue 305483005: remove SkBitmap::asImageInfo

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/image/SkImage.cpp

Issue 305483005: remove SkBitmap::asImageInfo (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: rebase Created 6 years, 7 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/image/SkImage.cpp

diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp

index 4cbfd81bedbaa34f215d500399f9c8d536fea7dd..bdf4c490512c114aab51c0e3d38c20da86195ac4 100644

--- a/src/image/SkImage.cpp

+++ b/src/image/SkImage.cpp

@@ -106,7 +106,8 @@ bool SkImage_Base::onReadPixels(SkBitmap* bitmap, const SkIRect& subset) const {

SkImageInfo info;

if (bitmap->pixelRef()) {

- if (!bitmap->asImageInfo(&info)) {

+ const SkImageInfo info = bitmap->info();

+ if (kUnknown_SkColorType == info.colorType()) {

return false;

}

if (!raster_canvas_supports(info)) {