src/codec/SkBmpStandardCodec.cpp - Issue 1288483002: Consolidate SkCodec functions for handling rewind

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/codec/SkBmpStandardCodec.cpp

Issue 1288483002: Consolidate SkCodec functions for handling rewind (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 4 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/codec/SkBmpStandardCodec.cpp

diff --git a/src/codec/SkBmpStandardCodec.cpp b/src/codec/SkBmpStandardCodec.cpp

index 70535a72ace74dbf7172f5095ca250644e9986ee..08146fc3e48f9a75f528044ade27e7fb497df13b 100644

--- a/src/codec/SkBmpStandardCodec.cpp

+++ b/src/codec/SkBmpStandardCodec.cpp

@@ -66,7 +66,7 @@ SkCodec::Result SkBmpStandardCodec::onGetPixels(const SkImageInfo& dstInfo,

const Options& opts,

SkPMColor* inputColorPtr,

int* inputColorCount) {

- if (!this->handleRewind(fInIco)) {

+ if (!this->rewindIfNeeded()) {

return kCouldNotRewind;

}

if (opts.fSubset) {