aboutsummaryrefslogtreecommitdiffstats
path: root/src/image.c
diff options
context:
space:
mode:
authorJan D2015-05-17 16:46:34 +0200
committerJan D2015-05-17 16:46:34 +0200
commit6445ee0fb751ae2c1dfef900d44721b3d952812f (patch)
treed43006cb93d9ea7b00ea02aabcd5577c41ff827f /src/image.c
parentf92ac2e82ed199d6f25d2a59508e08addb1150ac (diff)
parentc9c4708ed47b18987940a71b98eb9873150d2b95 (diff)
downloademacs-6445ee0fb751ae2c1dfef900d44721b3d952812f.tar.gz
emacs-6445ee0fb751ae2c1dfef900d44721b3d952812f.zip
Merge branch 'master' into cairo
Diffstat (limited to 'src/image.c')
-rw-r--r--src/image.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/image.c b/src/image.c
index ffbed747590..87029bfa1b0 100644
--- a/src/image.c
+++ b/src/image.c
@@ -237,7 +237,7 @@ x_create_bitmap_from_data (struct frame *f, char *bits, unsigned int width, unsi
237#endif /* HAVE_NTGUI */ 237#endif /* HAVE_NTGUI */
238 238
239#ifdef HAVE_NS 239#ifdef HAVE_NS
240 void *bitmap = ns_image_from_XBM (bits, width, height); 240 void *bitmap = ns_image_from_XBM (bits, width, height, 0, 0);
241 if (!bitmap) 241 if (!bitmap)
242 return -1; 242 return -1;
243#endif 243#endif
@@ -2706,7 +2706,7 @@ Create_Pixmap_From_Bitmap_Data (struct frame *f, struct image *img, char *data,
2706 convert_mono_to_color_image (f, img, fg, bg); 2706 convert_mono_to_color_image (f, img, fg, bg);
2707 2707
2708#elif defined (HAVE_NS) 2708#elif defined (HAVE_NS)
2709 img->pixmap = ns_image_from_XBM (data, img->width, img->height); 2709 img->pixmap = ns_image_from_XBM (data, img->width, img->height, fg, bg);
2710 2710
2711#else 2711#else
2712 img->pixmap = 2712 img->pixmap =