src/codec/SkBmpStandardCodec.cpp - Issue 1365313002: Merge SkCodec with SkScanlineDecoder

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 1365313002: Merge SkCodec with SkScanlineDecoder (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Skip ICO in SkScaledCodec for now Created 5 years, 3 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 59bc917481698fb0a3caf5dab456312ac85631d7..02f2d4215a6b8d34b44b35a45683aaf7c79640a0 100644

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

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

@@ -8,7 +8,6 @@

#include "SkBmpStandardCodec.h"

#include "SkCodecPriv.h"

#include "SkColorPriv.h"

-#include "SkScanlineDecoder.h"

#include "SkStream.h"

@@ -18,7 +17,7 @@

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

uint16_t bitsPerPixel, uint32_t numColors,

uint32_t bytesPerColor, uint32_t offset,

- SkScanlineDecoder::SkScanlineOrder rowOrder, bool inIco)

+ SkCodec::SkScanlineOrder rowOrder, bool inIco)

: INHERITED(info, stream, bitsPerPixel, rowOrder)

, fColorTable(nullptr)

, fNumColors(this->computeNumColors(numColors))

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