Mercurial > hg > xemacs-beta
diff src/glyphs-gtk.c @ 4982:3c3c1d139863
Automatic merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 05 Feb 2010 11:25:00 -0600 |
parents | 4aebb0131297 16112448d484 |
children | 6f2158fa75ed |
line wrap: on
line diff
--- a/src/glyphs-gtk.c Fri Feb 05 11:02:24 2010 -0600 +++ b/src/glyphs-gtk.c Fri Feb 05 11:25:00 2010 -0600 @@ -268,7 +268,7 @@ #endif } } - xfree(qtable, quant_table *); + xfree (qtable); } else { unsigned long rshift,gshift,bshift,rbits,gbits,bbits,junk; junk = vis->red_mask; @@ -422,7 +422,7 @@ gdk_pixmap_unref (IMAGE_INSTANCE_GTK_PIXMAP_SLICE (p,i)); IMAGE_INSTANCE_GTK_PIXMAP_SLICE (p, i) = 0; } - xfree (IMAGE_INSTANCE_GTK_PIXMAP_SLICES (p), GdkPixmap **); + xfree (IMAGE_INSTANCE_GTK_PIXMAP_SLICES (p)); IMAGE_INSTANCE_GTK_PIXMAP_SLICES (p) = 0; } @@ -450,11 +450,11 @@ && IMAGE_INSTANCE_TYPE (p) != IMAGE_SUBWINDOW && IMAGE_INSTANCE_GTK_PIXELS (p)) { - xfree (IMAGE_INSTANCE_GTK_PIXELS (p), unsigned long *); + xfree (IMAGE_INSTANCE_GTK_PIXELS (p)); IMAGE_INSTANCE_GTK_PIXELS (p) = 0; } - xfree (p->data, void *); + xfree (p->data); p->data = 0; } @@ -907,7 +907,7 @@ if (!gdk_image) { if (pixtbl) - xfree (pixtbl, unsigned long *); + xfree (pixtbl); signal_image_error("EImage to GdkImage conversion failed", instantiator); } @@ -1300,7 +1300,7 @@ } if (color_symbols) - xfree (color_symbols, struct color_symbol *); + xfree (color_symbols); if (!pixmap) signal_image_error ("Error reading pixmap", data);