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

LibGfx: add support for interlaced GIFs

Browse source
This commit is contained in:
Peter Nelson 2020-08-29 16:05:24 +01:00 • committed by Andreas Kling
parent 1341025da7
commit 786872e4c9
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Libraries/LibGfx/GIFLoader.cpp
View file

@ -42,12 +42,17 @@ struct RGB {
u8 b; u8 b;
}; };
// Row strides and offsets for each interlace pass.
static const int INTERLACE_ROW_STRIDES[] = { 8, 8, 4, 2 };
static const int INTERLACE_ROW_OFFSETS[] = { 0, 4, 2, 1 };
struct ImageDescriptor { struct ImageDescriptor {
u16 x { 0 }; u16 x { 0 };
u16 y { 0 }; u16 y { 0 };
u16 width { 0 }; u16 width { 0 };
u16 height { 0 }; u16 height { 0 };
bool use_global_color_map { true }; bool use_global_color_map { true };
bool interlaced { false };
RGB color_map[256]; RGB color_map[256];
u8 lzw_min_code_size { 0 }; u8 lzw_min_code_size { 0 };
Vector<u8> lzw_encoded_bytes; Vector<u8> lzw_encoded_bytes;
@ -309,6 +314,8 @@ static bool decode_frames_up_to_index(GIFLoadingContext& context, size_t frame_i
} }
int pixel_index = 0; int pixel_index = 0;
int row = 0;
int interlace_pass = 0;
while (true) { while (true) {
Optional<u16> code = decoder.next_code(); Optional<u16> code = decoder.next_code();
if (!code.has_value()) { if (!code.has_value()) {
@ -329,7 +336,7 @@ static bool decode_frames_up_to_index(GIFLoadingContext& context, size_t frame_i
auto rgb = color_map[color]; auto rgb = color_map[color];
int x = pixel_index % image.width + image.x; int x = pixel_index % image.width + image.x;
int y = pixel_index / image.width + image.y; int y = row + image.y;
Color c = Color(rgb.r, rgb.g, rgb.b); Color c = Color(rgb.r, rgb.g, rgb.b);
@ -342,6 +349,18 @@ static bool decode_frames_up_to_index(GIFLoadingContext& context, size_t frame_i
} }
++pixel_index; ++pixel_index;
if (pixel_index % image.width == 0) {
if (image.interlaced) {
if (row + INTERLACE_ROW_STRIDES[interlace_pass] >= image.height) {
++interlace_pass;
row = INTERLACE_ROW_OFFSETS[interlace_pass];
} else {
row += INTERLACE_ROW_STRIDES[interlace_pass];
}
} else {
++row;
}
}
} }
} }
@ -506,6 +525,7 @@ static bool load_gif_frame_descriptors(GIFLoadingContext& context)
return false; return false;
image.use_global_color_map = !(packed_fields & 0x80); image.use_global_color_map = !(packed_fields & 0x80);
image.interlaced = (packed_fields & 0x40) != 0;
if (!image.use_global_color_map) { if (!image.use_global_color_map) {
size_t local_color_table_size = pow(2, (packed_fields & 7) + 1); size_t local_color_table_size = pow(2, (packed_fields & 7) + 1);