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

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

index 6e2fc84ec8b58983bdc2b5ff5311171149f862f9..53fcbbe2795ba4b92435f16f36aea4b214f05a56 100644

--- a/src/codec/SkJpegCodec.cpp

+++ b/src/codec/SkJpegCodec.cpp

@@ -23,11 +23,9 @@ extern "C" {

#include "jpeglib.h"

}

-bool SkJpegCodec::IsJpeg(SkStream* stream) {

+bool SkJpegCodec::IsJpeg(const char* buffer, size_t bytesRead) {

static const uint8_t jpegSig[] = { 0xFF, 0xD8, 0xFF };

- char buffer[sizeof(jpegSig)];

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

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

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

}

bool SkJpegCodec::ReadHeader(SkStream* stream, SkCodec** codecOut,