mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-15 05:52:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibPDF: Invert image masks used as alpha too

Browse source 
Fixes #23824, a regression from the first commit in #23781.
This commit is contained in:
Nico Weber 2024-04-03 13:00:20 -07:00 • committed by Tim Flynn
commit f570678bf0
Notes: sideshowbarker 2024-07-17 21:26:19 +09:00
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibPDF/Renderer.cpp
View file

@ -1315,7 +1315,7 @@ void Renderer::show_empty_image(Gfx::IntSize size)
m_painter.stroke_path(rect_path(image_border), Color::Black, 1); m_painter.stroke_path(rect_path(image_border), Color::Black, 1);
} }
static ErrorOr<NonnullRefPtr<Gfx::Bitmap>> apply_alpha_channel(NonnullRefPtr<Gfx::Bitmap> image_bitmap, NonnullRefPtr<const Gfx::Bitmap> mask_bitmap) static ErrorOr<NonnullRefPtr<Gfx::Bitmap>> apply_alpha_channel(NonnullRefPtr<Gfx::Bitmap> image_bitmap, NonnullRefPtr<const Gfx::Bitmap> mask_bitmap, bool invert_alpha = false)
{ {
// Make alpha mask same size as image. // Make alpha mask same size as image.
if (mask_bitmap->size() != image_bitmap->size()) { if (mask_bitmap->size() != image_bitmap->size()) {
@ -1333,7 +1333,10 @@ static ErrorOr<NonnullRefPtr<Gfx::Bitmap>> apply_alpha_channel(NonnullRefPtr<Gfx
for (int i = 0; i < image_bitmap->width(); ++i) { for (int i = 0; i < image_bitmap->width(); ++i) {
auto image_color = image_bitmap->get_pixel(i, j); auto image_color = image_bitmap->get_pixel(i, j);
auto mask_color = mask_bitmap->get_pixel(i, j); auto mask_color = mask_bitmap->get_pixel(i, j);
image_color = image_color.with_alpha(mask_color.luminosity()); u8 alpha = mask_color.luminosity();
if (invert_alpha)
alpha = 255 - alpha;
image_color = image_color.with_alpha(alpha);
image_bitmap->set_pixel(i, j, image_color); image_bitmap->set_pixel(i, j, image_color);
} }
} }
@ -1377,7 +1380,8 @@ PDFErrorOr<void> Renderer::show_image(NonnullRefPtr<StreamObject> image)
auto mask_object = TRY(image_dict->get_object(m_document, CommonNames::Mask)); auto mask_object = TRY(image_dict->get_object(m_document, CommonNames::Mask));
if (mask_object->is<StreamObject>()) { if (mask_object->is<StreamObject>()) {
auto mask_bitmap = TRY(load_image(mask_object->cast<StreamObject>())); auto mask_bitmap = TRY(load_image(mask_object->cast<StreamObject>()));
image_bitmap.bitmap = TRY(apply_alpha_channel(image_bitmap.bitmap, mask_bitmap.bitmap)); bool invert_alpha = mask_bitmap.is_image_mask;
image_bitmap.bitmap = TRY(apply_alpha_channel(image_bitmap.bitmap, mask_bitmap.bitmap, invert_alpha));
} else if (mask_object->is<ArrayObject>()) { } else if (mask_object->is<ArrayObject>()) {
auto mask_bitmap = TRY(make_mask_bitmap_from_array(mask_object->cast<ArrayObject>(), image)); auto mask_bitmap = TRY(make_mask_bitmap_from_array(mask_object->cast<ArrayObject>(), image));
image_bitmap.bitmap = TRY(apply_alpha_channel(image_bitmap.bitmap, mask_bitmap)); image_bitmap.bitmap = TRY(apply_alpha_channel(image_bitmap.bitmap, mask_bitmap));