Skip to content

IMG_webp: Incorrect frame composition in animated WebP loading #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 16 commits into
base: SDL2
Choose a base branch
from
27 changes: 20 additions & 7 deletions src/IMG_webp.c
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,13 @@ IMG_Animation *IMG_LoadWEBPAnimation_RW(SDL_RWops *src)
(bgcolor >> 24) & 0xFF);
#endif

// Initialize canvas - use bgcolor for non-alpha format, transparency for alpha
if (features.has_alpha) {
SDL_FillRect(canvas, NULL, SDL_MapRGBA(canvas->format, 0, 0, 0, 0));
} else {
SDL_FillRect(canvas, NULL, bgcolor);
}

SDL_zero(iter);
if (lib.WebPDemuxGetFrame(demuxer, 1, &iter)) {
do {
Expand All @@ -357,8 +364,16 @@ IMG_Animation *IMG_LoadWEBPAnimation_RW(SDL_RWops *src)
continue;
}

if (dispose_method == WEBP_MUX_DISPOSE_BACKGROUND) {
SDL_FillRect(canvas, NULL, bgcolor);
// Set up destination rect for current frame
dst.x = iter.x_offset;
dst.y = iter.y_offset;
dst.w = iter.width;
dst.h = iter.height;

// Handle disposal and prepare region for new frame
if (iter.dispose_method == WEBP_MUX_DISPOSE_BACKGROUND ||
iter.blend_method == WEBP_MUX_NO_BLEND) {
SDL_FillRect(canvas, &dst, bgcolor);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
SDL_FillRect(canvas, &dst, bgcolor);
SDL_FillRect(canvas, &dst, bgcolor);

}

curr = SDL_CreateRGBSurfaceWithFormat(0, iter.width, iter.height, 0, SDL_PIXELFORMAT_RGBA32);
Expand All @@ -376,21 +391,19 @@ IMG_Animation *IMG_LoadWEBPAnimation_RW(SDL_RWops *src)
goto error;
}

// Set blend mode based on the frame's blend method
if (iter.blend_method == WEBP_MUX_BLEND) {
SDL_SetSurfaceBlendMode(curr, SDL_BLENDMODE_BLEND);
} else {
SDL_SetSurfaceBlendMode(curr, SDL_BLENDMODE_NONE);
}
dst.x = iter.x_offset;
dst.y = iter.y_offset;
dst.w = iter.width;
dst.h = iter.height;

SDL_BlitSurface(curr, NULL, canvas, &dst);
SDL_FreeSurface(curr);

// Store complete frame state
anim->frames[frame_idx] = SDL_DuplicateSurface(canvas);
anim->delays[frame_idx] = iter.duration;
dispose_method = iter.dispose_method;

} while (lib.WebPDemuxNextFrame(&iter));

Expand Down
Loading