src/codec/SkBmpCodec.cpp - Issue 1472123002: Make SkCodec support peek() and read()

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/SkBmpCodec.cpp

Issue 1472123002: Make SkCodec support peek() and read() (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Add comments, test, and accessor for needed buffer bytes 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/SkBmpCodec.cpp

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

index 191c2ad8009cbc39e713a2a56452e632a7e84012..a5ec44f36d2e05558bc959a337cef4e94df2065e 100644

--- a/src/codec/SkBmpCodec.cpp

+++ b/src/codec/SkBmpCodec.cpp

@@ -56,12 +56,10 @@ enum BmpInputFormat {

* Checks the start of the stream to see if the image is a bitmap

-bool SkBmpCodec::IsBmp(SkStream* stream) {

+bool SkBmpCodec::IsBmp(const char* buffer, size_t bytesRead) {

// TODO: Support "IC", "PT", "CI", "CP", "BA"

const char bmpSig[] = { 'B', 'M' };

- char buffer[sizeof(bmpSig)];

- return stream->read(buffer, sizeof(bmpSig)) == sizeof(bmpSig) &&

- !memcmp(buffer, bmpSig, sizeof(bmpSig));

+ return bytesRead >= sizeof(bmpSig) && !memcmp(buffer, bmpSig, sizeof(bmpSig));

}