src/images/SkScaledBitmapSampler.cpp - Issue 647023006: Qualify the return value of SkImageDecoder::decode

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/images/SkScaledBitmapSampler.cpp

Issue 647023006: Qualify the return value of SkImageDecoder::decode (Closed) Base URL: https://skia.googlesource.com/skia.git/+/master

Patch Set: Fix a piece of code only built on Android. Created 6 years, 2 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/images/SkScaledBitmapSampler.cpp

diff --git a/src/images/SkScaledBitmapSampler.cpp b/src/images/SkScaledBitmapSampler.cpp

index d78502d2bbd6a3727de5081fcdf3652cfcd6ba45..fe425d58b1cab09ac744114a18b8d0184049391a 100644

--- a/src/images/SkScaledBitmapSampler.cpp

+++ b/src/images/SkScaledBitmapSampler.cpp

@@ -835,8 +835,8 @@ class DummyDecoder : public SkImageDecoder {

public:

DummyDecoder() {}

protected:

- virtual bool onDecode(SkStream*, SkBitmap*, SkImageDecoder::Mode) SK_OVERRIDE {

- return false;

+ virtual Result onDecode(SkStream*, SkBitmap*, SkImageDecoder::Mode) SK_OVERRIDE {

+ return kFailure;

}

};