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

only allocate alpha_plane_ up to crop_bottom row

Browse Source 
-> reduces memory consumption in case of cropping

work for bug #288

Change-Id: Icab6eb8e67e3c5c184a9363fffcd9f6acd0b311c
This commit is contained in:
Pascal Massimino 2016-04-06 13:43:01 +02:00
parent 774dfbdc34
commit aa809cfeb3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dec/alpha.c
View File

@ -113,7 +113,7 @@ static int ALPHInit(ALPHDecoder* const dec, const uint8_t* data,
static int ALPHDecode(VP8Decoder* const dec, int row, int num_rows) { static int ALPHDecode(VP8Decoder* const dec, int row, int num_rows) {
ALPHDecoder* const alph_dec = dec->alph_dec_; ALPHDecoder* const alph_dec = dec->alph_dec_;
const int width = alph_dec->width_; const int width = alph_dec->width_;
const int height = alph_dec->height_; const int height = alph_dec->io_.crop_bottom;
uint8_t* const output = dec->alpha_plane_; uint8_t* const output = dec->alpha_plane_;
if (alph_dec->method_ == ALPHA_NO_COMPRESSION) { if (alph_dec->method_ == ALPHA_NO_COMPRESSION) {
const size_t offset = row * width; const size_t offset = row * width;
@ -131,7 +131,7 @@ static int ALPHDecode(VP8Decoder* const dec, int row, int num_rows) {
} }
} }
if (row + num_rows >= alph_dec->io_.crop_bottom) { if (row + num_rows >= height) {
dec->is_alpha_decoded_ = 1; dec->is_alpha_decoded_ = 1;
} }
return 1; return 1;
@ -139,12 +139,14 @@ static int ALPHDecode(VP8Decoder* const dec, int row, int num_rows) {
static int AllocateAlphaPlane(VP8Decoder* const dec, const VP8Io* const io) { static int AllocateAlphaPlane(VP8Decoder* const dec, const VP8Io* const io) {
const int stride = io->width; const int stride = io->width;
const int height = io->height; const int height = io->crop_bottom;
const uint64_t alpha_size = (uint64_t)stride * height; const uint64_t alpha_size = (uint64_t)stride * height;
assert(dec->alpha_plane_mem_ == NULL); assert(dec->alpha_plane_mem_ == NULL);
dec->alpha_plane_mem_ = dec->alpha_plane_mem_ =
(uint8_t*)WebPSafeMalloc(alpha_size, sizeof(*dec->alpha_plane_)); (uint8_t*)WebPSafeMalloc(alpha_size, sizeof(*dec->alpha_plane_));
if (dec->alpha_plane_mem_ == NULL) return 0; if (dec->alpha_plane_mem_ == NULL) {
return 0;
}
dec->alpha_plane_ = dec->alpha_plane_mem_; dec->alpha_plane_ = dec->alpha_plane_mem_;
return 1; return 1;
} }