src/codec/SkBmpStandardCodec.h - Issue 1472933002: Make SkAndroidCodec support ico

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.h

Issue 1472933002: Make SkAndroidCodec support ico (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Rebase: Make this CL depend on previous CL Created 5 years 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.h

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

index d687eaad287a8c602219905c3810a9e3154f922a..22e73487f790404d6d751ab19476f00e663c5115 100644

--- a/src/codec/SkBmpStandardCodec.h

+++ b/src/codec/SkBmpStandardCodec.h

@@ -75,7 +75,8 @@ private:

int decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,

const Options& opts) override;

- Result decodeIcoMask(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes);

+ void decodeIcoMask(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,

+ size_t srcRowBytes);

SkAutoTUnref<SkColorTable> fColorTable; // owned

const uint32_t fNumColors;