Merge "anim_util: quiet implicit conv warnings in 32-bit"

This commit is contained in:
Pascal Massimino 2016-12-13 06:14:56 +00:00 committed by Gerrit Code Review
commit dc0c01fbd3

View File

@ -55,8 +55,8 @@ static int AllocateFrames(AnimatedImage* const image, uint32_t num_frames) {
!CheckSizeForOverflow(total_frame_size)) { !CheckSizeForOverflow(total_frame_size)) {
return 0; return 0;
} }
mem = (uint8_t*)malloc(total_size); mem = (uint8_t*)malloc((size_t)total_size);
frames = (DecodedFrame*)malloc(total_frame_size); frames = (DecodedFrame*)malloc((size_t)total_frame_size);
if (mem == NULL || frames == NULL) { if (mem == NULL || frames == NULL) {
free(mem); free(mem);