system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-09-30 05:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

shared: make load_cairo_surface() also load the embedded ICC profile

Browse source 
Instead of loading only the pixman image through load_image(), load both
the pixman image and the ICC profile with weston_image_load().

It also sets the struct weston_image as the cairo surface user data and
adds a function so that users can retrieve this.

Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
This commit is contained in:
Leandro Ribeiro 2024-04-25 10:20:42 -03:00
parent 312efb2acb
commit e015081f5d
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
shared/cairo-util.c
View file

@ -351,9 +351,9 @@ rounded_rect(cairo_t *cr, int x0, int y0, int x1, int y1, int radius)
static void
loaded_cairo_surface_destructor(void *data)
{
pixman_image_t *image = data;
struct weston_image *image = data;
pixman_image_unref(image);
weston_image_destroy(image);
}
static const cairo_user_data_key_t weston_cairo_util_load_cairo_surface_key;
@ -363,19 +363,20 @@ load_cairo_surface(const char *filename)
{
cairo_surface_t *surface;
cairo_status_t ret;
pixman_image_t *image;
struct weston_image *image;
int width, height, stride;
void *data;
image = load_image(filename);
image = weston_image_load(filename, WESTON_IMAGE_LOAD_IMAGE |
WESTON_IMAGE_LOAD_ICC);
if (image == NULL) {
return NULL;
}
data = pixman_image_get_data(image);
width = pixman_image_get_width(image);
height = pixman_image_get_height(image);
stride = pixman_image_get_stride(image);
data = pixman_image_get_data(image->pixman_image);
width = pixman_image_get_width(image->pixman_image);
height = pixman_image_get_height(image->pixman_image);
stride = pixman_image_get_stride(image->pixman_image);
surface = cairo_image_surface_create_for_data(data, CAIRO_FORMAT_ARGB32,
width, height, stride);
@ -394,10 +395,17 @@ load_cairo_surface(const char *filename)
fail:
cairo_surface_destroy(surface);
pixman_image_unref(image);
weston_image_destroy(image);
return NULL;
}
struct weston_image *
load_cairo_surface_get_user_data(cairo_surface_t *surface)
{
return cairo_surface_get_user_data(surface,
&weston_cairo_util_load_cairo_surface_key);
}
void
theme_set_background_source(struct theme *t, cairo_t *cr, uint32_t flags)
{

3
shared/cairo-util.h
View file

@ -52,6 +52,9 @@ rounded_rect(cairo_t *cr, int x0, int y0, int x1, int y1, int radius);
cairo_surface_t *
load_cairo_surface(const char *filename);
struct weston_image *
load_cairo_surface_get_user_data(cairo_surface_t *surface);
struct theme {
cairo_surface_t *active_frame;
cairo_surface_t *inactive_frame;