dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-11-20 12:28:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

idec: simplify buffer size calculation

Browse Source 
Change-Id: Id0e20c44704ef9b0e14dcf5e71a05cea488fd95a
This commit is contained in:
James Zern 2012-02-07 18:49:26 -08:00
parent 85b6ff6897
commit a9c5cd4c97
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dec/idec.c
View File

@ -20,6 +20,8 @@
extern "C" { extern "C" {
#endif #endif
// In append mode, buffer allocations increase as multiples of this value.
// Needs to be a power of 2.
#define CHUNK_SIZE 4096 #define CHUNK_SIZE 4096
#define MAX_MB_SIZE 4096 #define MAX_MB_SIZE 4096
@ -97,14 +99,12 @@ static int AppendToMemBuffer(WebPIDecoder* const idec,
if (mem->end_ + data_size > mem->buf_size_) { // Need some free memory if (mem->end_ + data_size > mem->buf_size_) { // Need some free memory
int p; int p;
uint8_t* new_buf = NULL;
const size_t num_chunks =
(MemDataSize(mem) + data_size + CHUNK_SIZE - 1) / CHUNK_SIZE;
const size_t new_size = num_chunks * CHUNK_SIZE;
const uint8_t* const base = mem->buf_ + mem->start_; const uint8_t* const base = mem->buf_ + mem->start_;
const size_t new_size =
(MemDataSize(mem) + data_size + CHUNK_SIZE - 1) & ~(CHUNK_SIZE - 1);
uint8_t* const new_buf = (uint8_t*)malloc(new_size);
new_buf = (uint8_t*)malloc(new_size); if (new_buf == NULL) return 0;
if (!new_buf) return 0;
memcpy(new_buf, base, MemDataSize(mem)); memcpy(new_buf, base, MemDataSize(mem));
// adjust VP8BitReader pointers // adjust VP8BitReader pointers
@ -307,7 +307,7 @@ static int CopyParts0Data(WebPIDecoder* idec) {
if (mem->mode_ == MEM_MODE_APPEND) { if (mem->mode_ == MEM_MODE_APPEND) {
// We copy and grab ownership of the partition #0 data. // We copy and grab ownership of the partition #0 data.
uint8_t* const part0_buf = (uint8_t*)malloc(psize); uint8_t* const part0_buf = (uint8_t*)malloc(psize);
if (!part0_buf) { if (part0_buf == NULL) {
return 0; return 0;
} }
memcpy(part0_buf, br->buf_, psize); memcpy(part0_buf, br->buf_, psize);