AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reland "Make WebP decoding independent of stream length."

Browse Source 
This reverts commit 1de924955b103c4f5dc9c46a06527d6a37e6cb70.

When reading the stream, only read as much as will fit in the
allocated buffer.

BUG=skia:1495

Review URL: https://codereview.chromium.org/22629010

git-svn-id: http://skia.googlecode.com/svn/trunk@10665 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
scroggo@google.com 2013-08-09 19:22:00 +00:00
parent a8797b966f
commit 80e18c93bb
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/images/SkImageDecoder_libwebp.cpp
View File

@ -203,31 +203,26 @@ static bool webp_idecode(SkStream* stream, WebPDecoderConfig* config) {
return false;
}
uint32_t bytesRemaining = contentSize;
while (bytesRemaining > 0) {
const uint32_t bytesToRead = (bytesRemaining < WEBP_IDECODE_BUFFER_SZ) ?
bytesRemaining : WEBP_IDECODE_BUFFER_SZ;
const size_t bytesRead = stream->read(input, bytesToRead);
bool success = true;
VP8StatusCode status = VP8_STATUS_SUSPENDED;
do {
const size_t bytesRead = stream->read(input, readBufferSize);
if (0 == bytesRead) {
success = false;
break;
}
VP8StatusCode status = WebPIAppend(idec, input, bytesRead);
if (VP8_STATUS_OK == status || VP8_STATUS_SUSPENDED == status) {
bytesRemaining -= bytesRead;
} else {
status = WebPIAppend(idec, input, bytesRead);
if (VP8_STATUS_OK != status && VP8_STATUS_SUSPENDED != status) {
success = false;
break;
}
}
} while (VP8_STATUS_OK != status);
srcStorage.free();
WebPIDelete(idec);
WebPFreeDecBuffer(&config->output);
if (bytesRemaining > 0) {
return false;
} else {
return true;
}
return success;
}
static bool webp_get_config_resize(WebPDecoderConfig* config,