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

Merge "VP8GetHeaders(): initialize VP8Io with sane value for crop/scale dimensions"

Browse Source
This commit is contained in:
Vincent Rabaud 2016-04-04 13:50:05 +00:00 committed by Gerrit Code Review
commit b95ac0a221
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dec/vp8.c
View File

@ -303,15 +303,22 @@ int VP8GetHeaders(VP8Decoder* const dec, VP8Io* const io) {
dec->mb_w_ = (pic_hdr->width_ + 15) >> 4; dec->mb_w_ = (pic_hdr->width_ + 15) >> 4;
dec->mb_h_ = (pic_hdr->height_ + 15) >> 4; dec->mb_h_ = (pic_hdr->height_ + 15) >> 4;
// Setup default output area (can be later modified during io->setup()) // Setup default output area (can be later modified during io->setup())
io->width = pic_hdr->width_; io->width = pic_hdr->width_;
io->height = pic_hdr->height_; io->height = pic_hdr->height_;
io->use_scaling = 0; // IMPORTANT! use some sane dimensions in crop_* and scaled_* fields.
// So they can be used interchangeably without always testing for
// 'use_cropping'.
io->use_cropping = 0; io->use_cropping = 0;
io->crop_top = 0; io->crop_top = 0;
io->crop_left = 0; io->crop_left = 0;
io->crop_right = io->width; io->crop_right = io->width;
io->crop_bottom = io->height; io->crop_bottom = io->height;
io->use_scaling = 0;
io->scaled_width = io->width;
io->scaled_height = io->height;
io->mb_w = io->width; // sanity check io->mb_w = io->width; // sanity check
io->mb_h = io->height; // ditto io->mb_h = io->height; // ditto