Andy Piper <andy(a)xemacs.org> wrote:
At 09:47 AM 10/8/99 +0200, Didier Verna wrote:
> It looks very much like the same:
Ok, I've got it.
Yup. The following patch is needed on top of yours in order to fix a
couple of XErrors (freeing null pixmaps). I'll apply it to cvs.
Index: src/glyphs-x.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/glyphs-x.c,v
retrieving revision 1.49.2.35
diff -u -u -r1.49.2.35 glyphs-x.c
--- glyphs-x.c 1999/10/11 13:47:30 1.49.2.35
+++ glyphs-x.c 1999/10/14 08:49:46
@@ -416,10 +416,11 @@
if (IMAGE_INSTANCE_X_PIXMAP_SLICES (p))
{
for (i = 0; i < IMAGE_INSTANCE_PIXMAP_MAXSLICE (p); i++)
- {
- XFreePixmap (dpy, IMAGE_INSTANCE_X_PIXMAP_SLICE (p,i));
- IMAGE_INSTANCE_X_PIXMAP_SLICE (p, i) = 0;
- }
+ if (IMAGE_INSTANCE_X_PIXMAP_SLICE (p,i))
+ {
+ XFreePixmap (dpy, IMAGE_INSTANCE_X_PIXMAP_SLICE (p,i));
+ IMAGE_INSTANCE_X_PIXMAP_SLICE (p, i) = 0;
+ }
xfree (IMAGE_INSTANCE_X_PIXMAP_SLICES (p));
IMAGE_INSTANCE_X_PIXMAP_SLICES (p) = 0;
}
--
/ / _ _ Didier Verna
http://www.inf.enst.fr/~verna/
- / / - / / /_/ / ENST, INFRES C201.1 mailto:verna@inf.enst.fr
/_/ / /_/ / /__ / 46 rue Barrault Tel. +33 (1) 45 81 73 46
75013 Paris, France Fax. +33 (1) 45 81 31 19