generic-library/webp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

additional fix for stride type as size_t

Browse Source 
- remove the inclusion of format_constants.h
 - use incremental update of pointer, instead of arithmetic

(follow-up to e2affacc35)

Change-Id: I48420c8defc8d47339f54bc00e9da9617f08ab32
(cherry picked from commit 9f5c8eca79)
This commit is contained in:
Pascal Massimino
2016-10-12 00:03:59 -07:00
committed by James Zern
parent bb2336170b
commit c222a053af
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
examples/gifdec.c
View File

@@ -20,7 +20,6 @@
#include "webp/encode.h"
#include "webp/mux_types.h"
#include "webp/format_constants.h"
#define GIF_TRANSPARENT_COLOR 0x00ffffff
#define GIF_WHITE_COLOR 0xffffffff
@@ -111,8 +110,7 @@ int GIFReadFrame(GifFileType* const gif, int transparent_index,
int ok = 0;
*gif_rect = rect;
if (memory_needed != (size_t)memory_needed ||
memory_needed > 4 * MAX_IMAGE_AREA) {
if (memory_needed != (size_t)memory_needed || memory_needed > (4ULL << 32)) {
fprintf(stderr, "Image is too large (%d x %d).", rect.width, rect.height);
return 0;
}
@@ -135,12 +133,13 @@ int GIFReadFrame(GifFileType* const gif, int transparent_index,
const int interlace_jumps[] = { 8, 8, 4, 2 };
int pass;
for (pass = 0; pass < 4; ++pass) {
int y;
for (y = interlace_offsets[pass]; y < rect.height;
y += interlace_jumps[pass]) {
const size_t stride = (size_t)sub_image.argb_stride;
int y = interlace_offsets[pass];
uint32_t* row = dst + y * stride;
const size_t jump = interlace_jumps[pass] * stride;
for (; y < rect.height; y += interlace_jumps[pass], row += jump) {
if (DGifGetLine(gif, tmp, rect.width) == GIF_ERROR) goto End;
Remap(gif, tmp, rect.width, transparent_index,
dst + y * (size_t)sub_image.argb_stride);
Remap(gif, tmp, rect.width, transparent_index, row);
}
}
} else { // Non-interlaced image.