RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 14:07:46 +00:00
Code Issues Activity Actions

LibGfx: clear previous GIF frame to transparent instead of whole image

Browse source
This commit is contained in:
Peter Nelson 2020-08-30 16:49:59 +01:00 • committed by Andreas Kling
parent f63592f871
commit c3ee5e3451
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Libraries/LibGfx/GIFLoader.cpp
View file

@ -30,6 +30,7 @@
#include <AK/MappedFile.h> #include <AK/MappedFile.h>
#include <AK/NonnullOwnPtrVector.h> #include <AK/NonnullOwnPtrVector.h>
#include <LibGfx/GIFLoader.h> #include <LibGfx/GIFLoader.h>
#include <LibGfx/Painter.h>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -63,6 +64,11 @@ struct ImageDescriptor {
u16 duration { 0 }; u16 duration { 0 };
bool transparent { false }; bool transparent { false };
bool user_input { false }; bool user_input { false };
const IntRect rect() const
{
return { this->x, this->y, this->width, this->height };
}
}; };
struct LogicalScreen { struct LogicalScreen {
@ -299,7 +305,8 @@ static bool decode_frame(GIFLoadingContext& context, size_t frame_index)
const auto previous_image_disposal_method = i > 0 ? context.images.at(i - 1).disposal_method : ImageDescriptor::DisposalMethod::None; const auto previous_image_disposal_method = i > 0 ? context.images.at(i - 1).disposal_method : ImageDescriptor::DisposalMethod::None;
if (previous_image_disposal_method == ImageDescriptor::DisposalMethod::RestoreBackground) { if (previous_image_disposal_method == ImageDescriptor::DisposalMethod::RestoreBackground) {
context.frame_buffer->fill(Color(Color::NamedColor::Transparent)); Painter painter(*context.frame_buffer);
painter.clear_rect(context.images.at(i - 1).rect(), Color::Transparent);
} else if (i > 1 && previous_image_disposal_method == ImageDescriptor::DisposalMethod::RestorePrevious) { } else if (i > 1 && previous_image_disposal_method == ImageDescriptor::DisposalMethod::RestorePrevious) {
// TODO: tricky as it potentially requires remembering _all_ previous frames. // TODO: tricky as it potentially requires remembering _all_ previous frames.
// Luckily it seems GIFs with this mode are rare in the wild. // Luckily it seems GIFs with this mode are rare in the wild.