aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2006-04-21 07:56:33 +0000
committerYAMAMOTO Mitsuharu2006-04-21 07:56:33 +0000
commit0b8ac8420248493a9dbf19aced274492ee030fe0 (patch)
tree119eaf34dad208fca0ac6f10b6f535dee49bbc9c /src
parentf67d6742cb77a21087e40ae7ee4c84556ca18970 (diff)
downloademacs-0b8ac8420248493a9dbf19aced274492ee030fe0.tar.gz
emacs-0b8ac8420248493a9dbf19aced274492ee030fe0.zip
[MAC_OS] (xpm_load_image): Fill in background field
while we have ximg handy.
Diffstat (limited to 'src')
-rw-r--r--src/image.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/image.c b/src/image.c
index 10c402be119..e1962d87b0f 100644
--- a/src/image.c
+++ b/src/image.c
@@ -4460,6 +4460,10 @@ xpm_load_image (f, img, contents, end)
4460 img->width = width; 4460 img->width = width;
4461 img->height = height; 4461 img->height = height;
4462 4462
4463 /* Maybe fill in the background field while we have ximg handy. */
4464 if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
4465 IMAGE_BACKGROUND (img, f, ximg);
4466
4463 x_put_x_image (f, ximg, img->pixmap, width, height); 4467 x_put_x_image (f, ximg, img->pixmap, width, height);
4464 x_destroy_x_image (ximg); 4468 x_destroy_x_image (ximg);
4465 if (have_mask) 4469 if (have_mask)