diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2013-01-28 16:01:22 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-01-28 16:02:04 -0500 |
| commit | 3c2360ff9d7409190636cb5f9376af42f05d6e50 (patch) | |
| tree | 6d9b2ddec7b619620bf301dcdf4d04eb93431d7e /shared/cairo-util.h | |
| parent | 78fd32b7a2d90299f05bbd4aad6afcfde2e87b70 (diff) | |
| download | weston-3c2360ff9d7409190636cb5f9376af42f05d6e50.tar.gz | |
Add new shared/image-loader.h to separate include dependencies
Before, cairo-util.h would combine pixman and cairo includes. X11 and
Wayland compositors uses this to load an image as a pixman_image_t but are
forced to include cairo headers. Clients use load_cairo_surface to
load images as cairo_surface_t's, but are forced to include pixman.h.
We move the load_image pixman prototype to its own header, so compositors
can get at the pixman prototype without including cairo.h and clients
can include the cairo based function without including pixman.h.
Diffstat (limited to 'shared/cairo-util.h')
| -rw-r--r-- | shared/cairo-util.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/shared/cairo-util.h b/shared/cairo-util.h index 3b93d40d..aff46690 100644 --- a/shared/cairo-util.h +++ b/shared/cairo-util.h @@ -24,7 +24,6 @@ #define _CAIRO_UTIL_H #include <cairo.h> -#include <pixman.h> void surface_flush_device(cairo_surface_t *surface); @@ -90,7 +89,4 @@ enum theme_location { enum theme_location theme_get_location(struct theme *t, int x, int y, int width, int height, int flags); -pixman_image_t * -load_image(const char *filename); - #endif |