]> git.eshelyaron.com Git - emacs.git/commitdiff
[MAC_OS] (xpm_load_image): Fill in background field
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Fri, 21 Apr 2006 07:56:33 +0000 (07:56 +0000)
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Fri, 21 Apr 2006 07:56:33 +0000 (07:56 +0000)
while we have ximg handy.

src/image.c

index 10c402be119ed7ec9ff43bfd302a7f86cad59507..e1962d87b0fe70b13e48d68c6161de3e5b2b85f8 100644 (file)
@@ -4460,6 +4460,10 @@ xpm_load_image (f, img, contents, end)
   img->width = width;
   img->height = height;
 
+  /* Maybe fill in the background field while we have ximg handy. */
+  if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
+    IMAGE_BACKGROUND (img, f, ximg);
+
   x_put_x_image (f, ximg, img->pixmap, width, height);
   x_destroy_x_image (ximg);
   if (have_mask)