fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-04-22 04:40:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't try to create depth-32 pixmaps on non-Render servers. Fix massive memory leask in _cairo_surface_push_image.

Browse source
This commit is contained in:
Carl Worth 2003-09-15 07:29:44 +00:00
parent 4b30a924c9
commit 1154ac5b59
3 changed files with 22 additions and 8 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-12 Carl Worth <cworth@east.isi.edu>
* src/cairo_surface.c (cairo_surface_create_similar_solid): Don't
try to create depth-32 pixmaps on non-Render servers.
(_cairo_surface_push_image): Fixed massive memory leak.
2003-09-09 Carl Worth <cworth@isi.edu>
* configure.in (PKG_CHECK_MODULES): Updated calls to

12
src/cairo-surface.c
View file

@ -256,7 +256,14 @@ cairo_surface_create_similar_solid (cairo_surface_t *other,
cairo_surface_t *surface = NULL;
cairo_color_t color;
if (other->dpy) {
/* XXX: There's a pretty lame heuristic here. This assumes that
* all non-Render X servers do not support depth-32 pixmaps, (and
* that they do support depths 1, 8, and 24). Obviously, it would
* be much better to check the depths that are actually
* supported. */
if (other->dpy
&& (CAIRO_SURFACE_RENDER_HAS_COMPOSITE (other)
|| format != CAIRO_FORMAT_ARGB32)) {
Display *dpy = other->dpy;
int scr = DefaultScreen (dpy);
@ -458,9 +465,6 @@ _cairo_surface_push_image (cairo_surface_t *surface)
surface->width,
surface->height);
/* Foolish XDestroyImage thinks it can free my data, but I won't
stand for it. */
surface->ximage->data = NULL;
XDestroyImage(surface->ximage);
surface->ximage = NULL;
}

12
src/cairo_surface.c
View file

@ -256,7 +256,14 @@ cairo_surface_create_similar_solid (cairo_surface_t *other,
cairo_surface_t *surface = NULL;
cairo_color_t color;
if (other->dpy) {
/* XXX: There's a pretty lame heuristic here. This assumes that
* all non-Render X servers do not support depth-32 pixmaps, (and
* that they do support depths 1, 8, and 24). Obviously, it would
* be much better to check the depths that are actually
* supported. */
if (other->dpy
&& (CAIRO_SURFACE_RENDER_HAS_COMPOSITE (other)
|| format != CAIRO_FORMAT_ARGB32)) {
Display *dpy = other->dpy;
int scr = DefaultScreen (dpy);
@ -458,9 +465,6 @@ _cairo_surface_push_image (cairo_surface_t *surface)
surface->width,
surface->height);
/* Foolish XDestroyImage thinks it can free my data, but I won't
stand for it. */
surface->ximage->data = NULL;
XDestroyImage(surface->ximage);
surface->ximage = NULL;
}