Mercurial > hg > xemacs-beta

comparison src/glyphs-gtk.c @ 4982:3c3c1d139863

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Fri, 05 Feb 2010 11:25:00 -0600
parents 4aebb0131297 16112448d484
children 6f2158fa75ed
comparison
equal deleted inserted replaced
4981:4aebb0131297 4982:3c3c1d139863
266 else 266 else
267 for (q = 0; q < byte_cnt; q++) *dp++ = conv.cp[q]; 267 for (q = 0; q < byte_cnt; q++) *dp++ = conv.cp[q];
268 #endif 268 #endif
269 } 269 }
270 } 270 }
271 xfree(qtable, quant_table *); 271 xfree (qtable);
272 } else { 272 } else {
273 unsigned long rshift,gshift,bshift,rbits,gbits,bbits,junk; 273 unsigned long rshift,gshift,bshift,rbits,gbits,bbits,junk;
274 junk = vis->red_mask; 274 junk = vis->red_mask;
275 rshift = 0; 275 rshift = 0;
276 while ((junk & 0x1) == 0) 276 while ((junk & 0x1) == 0)
420 if (IMAGE_INSTANCE_GTK_PIXMAP_SLICE (p,i)) 420 if (IMAGE_INSTANCE_GTK_PIXMAP_SLICE (p,i))
421 { 421 {
422 gdk_pixmap_unref (IMAGE_INSTANCE_GTK_PIXMAP_SLICE (p,i)); 422 gdk_pixmap_unref (IMAGE_INSTANCE_GTK_PIXMAP_SLICE (p,i));
423 IMAGE_INSTANCE_GTK_PIXMAP_SLICE (p, i) = 0; 423 IMAGE_INSTANCE_GTK_PIXMAP_SLICE (p, i) = 0;
424 } 424 }
425 xfree (IMAGE_INSTANCE_GTK_PIXMAP_SLICES (p), GdkPixmap **); 425 xfree (IMAGE_INSTANCE_GTK_PIXMAP_SLICES (p));
426 IMAGE_INSTANCE_GTK_PIXMAP_SLICES (p) = 0; 426 IMAGE_INSTANCE_GTK_PIXMAP_SLICES (p) = 0;
427 } 427 }
428 428
429 if (IMAGE_INSTANCE_GTK_CURSOR (p)) 429 if (IMAGE_INSTANCE_GTK_CURSOR (p))
430 { 430 {
448 448
449 if (IMAGE_INSTANCE_TYPE (p) != IMAGE_WIDGET 449 if (IMAGE_INSTANCE_TYPE (p) != IMAGE_WIDGET
450 && IMAGE_INSTANCE_TYPE (p) != IMAGE_SUBWINDOW 450 && IMAGE_INSTANCE_TYPE (p) != IMAGE_SUBWINDOW
451 && IMAGE_INSTANCE_GTK_PIXELS (p)) 451 && IMAGE_INSTANCE_GTK_PIXELS (p))
452 { 452 {
453 xfree (IMAGE_INSTANCE_GTK_PIXELS (p), unsigned long *); 453 xfree (IMAGE_INSTANCE_GTK_PIXELS (p));
454 IMAGE_INSTANCE_GTK_PIXELS (p) = 0; 454 IMAGE_INSTANCE_GTK_PIXELS (p) = 0;
455 } 455 }
456 456
457 xfree (p->data, void *); 457 xfree (p->data);
458 p->data = 0; 458 p->data = 0;
459 } 459 }
460 460
461 static int 461 static int
462 gtk_image_instance_equal (struct Lisp_Image_Instance *p1, 462 gtk_image_instance_equal (struct Lisp_Image_Instance *p1,
905 gdk_image = convert_EImage_to_GDKImage (device, width, height, eimage, 905 gdk_image = convert_EImage_to_GDKImage (device, width, height, eimage,
906 &pixtbl, &npixels); 906 &pixtbl, &npixels);
907 if (!gdk_image) 907 if (!gdk_image)
908 { 908 {
909 if (pixtbl) 909 if (pixtbl)
910 xfree (pixtbl, unsigned long *); 910 xfree (pixtbl);
911 signal_image_error("EImage to GdkImage conversion failed", instantiator); 911 signal_image_error("EImage to GdkImage conversion failed", instantiator);
912 } 912 }
913 913
914 if (slice == 0) 914 if (slice == 0)
915 /* Now create the pixmap and set up the image instance */ 915 /* Now create the pixmap and set up the image instance */
1298 pixmap = gdk_pixmap_create_from_xpm_d (window, &mask, NULL, 1298 pixmap = gdk_pixmap_create_from_xpm_d (window, &mask, NULL,
1299 data); 1299 data);
1300 } 1300 }
1301 1301
1302 if (color_symbols) 1302 if (color_symbols)
1303 xfree (color_symbols, struct color_symbol *); 1303 xfree (color_symbols);
1304 1304
1305 if (!pixmap) 1305 if (!pixmap)
1306 signal_image_error ("Error reading pixmap", data); 1306 signal_image_error ("Error reading pixmap", data);
1307 1307
1308 gdk_window_get_geometry (pixmap, NULL, NULL, &w, &h, &depth); 1308 gdk_window_get_geometry (pixmap, NULL, NULL, &w, &h, &depth);