src/codec/SkBmpStandardCodec.cpp - Issue 1895383002: Revert of Add SkEncodedInfo to report properties of encoded image data

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 1895383002: Revert of Add SkEncodedInfo to report properties of encoded image data (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 4 years, 8 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:

View side-by-side diff with in-line comments

Download patch

Index: src/codec/SkBmpStandardCodec.cpp

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

index a509c75b6da8206bc42726bcc53b3b1cf69d2bdc..80a989ae4d6ea4b2be98a1147a76ace2214d1c76 100644

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

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

@@ -14,12 +14,12 @@

* Creates an instance of the decoder

* Called only by NewFromStream

-SkBmpStandardCodec::SkBmpStandardCodec(int width, int height, const SkEncodedInfo& info,

- SkStream* stream, uint16_t bitsPerPixel, uint32_t numColors,

+SkBmpStandardCodec::SkBmpStandardCodec(const SkImageInfo& info, SkStream* stream,

+ uint16_t bitsPerPixel, uint32_t numColors,

uint32_t bytesPerColor, uint32_t offset,

SkCodec::SkScanlineOrder rowOrder,

bool isOpaque, bool inIco)

- : INHERITED(width, height, info, stream, bitsPerPixel, rowOrder)

+ : INHERITED(info, stream, bitsPerPixel, rowOrder)

, fColorTable(nullptr)

, fNumColors(numColors)

, fBytesPerColor(bytesPerColor)

« no previous file with comments | « src/codec/SkBmpStandardCodec.h ('k') | src/codec/SkCodec.cpp » ('j') | no next file with comments »