mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-01 22:58:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

img: don't abort with non-ARGB32 PNG files

Browse source 
Cairo surfaces loaded with cairo_image_surface_create_from_png() are not
always ARGB32 format.
This commit is contained in:
tokyo4j 2025-01-03 21:58:35 +09:00 • committed by Hiroaki Yamamoto
parent a1e2e19a8f
commit 7364de2ac5
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/img/img-png.c
View file

@ -59,5 +59,22 @@ img_png_load(const char *filename)
return NULL;
}
return buffer_adopt_cairo_surface(image);
if (cairo_image_surface_get_format(image) == CAIRO_FORMAT_ARGB32) {
return buffer_adopt_cairo_surface(image);
} else {
/* Copy non-ARGB32 surface to ARGB32 buffer */
/* TODO: directly set non-ARGB32 surface in lab_data_buffer */
struct lab_data_buffer *buffer = buffer_create_cairo(
cairo_image_surface_get_width(image),
cairo_image_surface_get_height(image), 1);
cairo_t *cairo = cairo_create(buffer->surface);
cairo_set_source_surface(cairo, image, 0, 0);
cairo_paint(cairo);
cairo_surface_flush(cairo_get_target(cairo));
cairo_destroy(cairo);
cairo_surface_destroy(image);
return buffer;
}
}