mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-22 14:31:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

PNG: Allow support for premultiplied alpha.

Browse Source 
LibPNG doesn't support premultiplied alpha, so now that the core
supports it, we can't just say that the decoded PNG is in the
core bitmap format.

So we now say it's in the core pixel layout, and if it's opaque
we say it has the same premultipled alpha setting as core bitmaps
because the conversion is costly and makes no difference.

On the other hand if it is not opaque we now admit that it is
not premultipled alpha so it gets converted if needed.
This commit is contained in:
Michael Drake 2022-03-28 15:59:26 +01:00
parent c93ed6d63a
commit 4307230331
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
content/handlers/image/png.c
View File

@ -538,8 +538,13 @@ png_cache_convert_error:
}
if (bitmap != NULL) {
bitmap_format_to_client((struct bitmap *)bitmap, &bitmap_fmt);
guit->bitmap->modified((struct bitmap *)bitmap);
bool opaque = guit->bitmap->test_opaque((void *)bitmap);
guit->bitmap->set_opaque((void *)bitmap, opaque);
bitmap_format_to_client((void *)bitmap, &(bitmap_fmt_t) {
.layout = bitmap_fmt.layout,
.pma = opaque ? bitmap_fmt.pma : false,
});
guit->bitmap->modified((void *)bitmap);
}
return (struct bitmap *)bitmap;
@ -566,8 +571,12 @@ static bool nspng_convert(struct content *c)
}
if (png_c->bitmap != NULL) {
guit->bitmap->set_opaque(png_c->bitmap, guit->bitmap->test_opaque(png_c->bitmap));
bitmap_format_to_client(png_c->bitmap, &bitmap_fmt);
bool opaque = guit->bitmap->test_opaque(png_c->bitmap);
guit->bitmap->set_opaque(png_c->bitmap, opaque);
bitmap_format_to_client(png_c->bitmap, &(bitmap_fmt_t) {
.layout = bitmap_fmt.layout,
.pma = opaque ? bitmap_fmt.pma : false,
});
guit->bitmap->modified(png_c->bitmap);
}