Ladybird/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-09 09:34:57 +09:00
Code Activity

LibGfx: Fix incorrect colors in ICO-embedded BMPs

Browse source
This commit is contained in:
aplefull 2025-04-23 21:40:41 +02:00 • committed by Sam Atkins
parent 9bae24cc4a
commit e0ceb66580
Notes: github-actions[bot] 2025-04-24 12:47:55 +00:00
3 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Libraries/LibGfx/ImageFormats/BMPLoader.cpp
View file

@ -1379,12 +1379,18 @@ static ErrorOr<void> decode_bmp_pixel_data(BMPLoadingContext& context)
return Error::from_string_literal("Cannot read 24 bits");
u32 pixel = streamer.read_u24();
u8 b = (pixel & 0xFF0000) >> 16;
u8 g = (pixel & 0x00FF00) >> 8;
u8 r = (pixel & 0x0000FF);
u32 rgbx_pixel = (r << 16) | (g << 8) | b;
context.bitmap->scanline(row)[column++] = rgbx_pixel;
if (context.is_included_in_ico) {
// 24-bit ICO files already use BGRA8888 format
context.bitmap->scanline(row)[column++] = pixel;
} else {
u8 b = (pixel & 0x0000FF);
u8 g = (pixel & 0x00FF00) >> 8;
u8 r = (pixel & 0xFF0000) >> 16;
context.bitmap->scanline(row)[column++] = (b << 16) | (g << 8) | r;
}
break;
}
case 32: