fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-09 13:30:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Force explicit dependency on Xrender >= 0.6. Make _cairo_x11_surface_put_image static.

Browse source
This commit is contained in:
Carl Worth 2003-09-15 13:17:32 +00:00
parent 9c5be2cf31
commit ee4bb02015
4 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2003-09-15 Carl Worth <cworth@east.isi.edu>
* configure.in: Require xrender >= 0.6.0
* src/cairo_surface.c (_cairo_x11_surface_put_image): Make static.
2003-09-15 Carl Worth <cworth@isi.edu>
* src/cairo.c (cairo_restore): Fix to catch invalid restore rather

2
configure.in
View file

@ -40,7 +40,7 @@ AC_PATH_XTRA
dnl ===========================================================================
PKG_CHECK_MODULES(CAIRO, slim >= 0.2.0 libic >= 0.1.1 xft)
PKG_CHECK_MODULES(CAIRO, slim >= 0.2.0 libic >= 0.1.1 xft xrender >= 0.6)
AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(CAIRO_LIBS)

22
src/cairo-surface.c
View file

@ -355,12 +355,12 @@ _cairo_surface_ensure_gc (cairo_surface_t *surface)
surface->gc = XCreateGC (surface->dpy, surface->drawable, 0, NULL);
}
cairo_status_t
cairo_x11_surface_put_image (cairo_surface_t *surface,
char *data,
int width,
int height,
int stride)
static cairo_status_t
_cairo_x11_surface_put_image (cairo_surface_t *surface,
char *data,
int width,
int height,
int stride)
{
if (surface->picture) {
XImage *image;
@ -629,11 +629,11 @@ _cairo_surface_composite (cairo_operator_t operator,
cairo_surface_get_matrix (src, &matrix);
cairo_surface_set_matrix (src_on_server, &matrix);
cairo_x11_surface_put_image (src_on_server,
(char *) IcImageGetData (src->icimage),
IcImageGetWidth (src->icimage),
IcImageGetHeight (src->icimage),
IcImageGetStride (src->icimage));
_cairo_x11_surface_put_image (src_on_server,
(char *) IcImageGetData (src->icimage),
IcImageGetWidth (src->icimage),
IcImageGetHeight (src->icimage),
IcImageGetStride (src->icimage));
}
XRenderComposite (dst->dpy, operator,

22
src/cairo_surface.c
View file

@ -355,12 +355,12 @@ _cairo_surface_ensure_gc (cairo_surface_t *surface)
surface->gc = XCreateGC (surface->dpy, surface->drawable, 0, NULL);
}
cairo_status_t
cairo_x11_surface_put_image (cairo_surface_t *surface,
char *data,
int width,
int height,
int stride)
static cairo_status_t
_cairo_x11_surface_put_image (cairo_surface_t *surface,
char *data,
int width,
int height,
int stride)
{
if (surface->picture) {
XImage *image;
@ -629,11 +629,11 @@ _cairo_surface_composite (cairo_operator_t operator,
cairo_surface_get_matrix (src, &matrix);
cairo_surface_set_matrix (src_on_server, &matrix);
cairo_x11_surface_put_image (src_on_server,
(char *) IcImageGetData (src->icimage),
IcImageGetWidth (src->icimage),
IcImageGetHeight (src->icimage),
IcImageGetStride (src->icimage));
_cairo_x11_surface_put_image (src_on_server,
(char *) IcImageGetData (src->icimage),
IcImageGetWidth (src->icimage),
IcImageGetHeight (src->icimage),
IcImageGetStride (src->icimage));
}
XRenderComposite (dst->dpy, operator,