diff options
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/image.c b/src/image.c index 38a92277299..e1c6e5df3cd 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -264,7 +264,7 @@ x_create_bitmap_from_data (struct frame *f, char *bits, unsigned int width, unsi | |||
| 264 | 264 | ||
| 265 | #ifdef HAVE_X_WINDOWS | 265 | #ifdef HAVE_X_WINDOWS |
| 266 | dpyinfo->bitmaps[id - 1].pixmap = bitmap; | 266 | dpyinfo->bitmaps[id - 1].pixmap = bitmap; |
| 267 | dpyinfo->bitmaps[id - 1].have_mask = 0; | 267 | dpyinfo->bitmaps[id - 1].have_mask = false; |
| 268 | dpyinfo->bitmaps[id - 1].depth = 1; | 268 | dpyinfo->bitmaps[id - 1].depth = 1; |
| 269 | #endif /* HAVE_X_WINDOWS */ | 269 | #endif /* HAVE_X_WINDOWS */ |
| 270 | 270 | ||
| @@ -339,7 +339,7 @@ x_create_bitmap_from_file (struct frame *f, Lisp_Object file) | |||
| 339 | 339 | ||
| 340 | id = x_allocate_bitmap_record (f); | 340 | id = x_allocate_bitmap_record (f); |
| 341 | dpyinfo->bitmaps[id - 1].pixmap = bitmap; | 341 | dpyinfo->bitmaps[id - 1].pixmap = bitmap; |
| 342 | dpyinfo->bitmaps[id - 1].have_mask = 0; | 342 | dpyinfo->bitmaps[id - 1].have_mask = false; |
| 343 | dpyinfo->bitmaps[id - 1].refcount = 1; | 343 | dpyinfo->bitmaps[id - 1].refcount = 1; |
| 344 | dpyinfo->bitmaps[id - 1].file = xlispstrdup (file); | 344 | dpyinfo->bitmaps[id - 1].file = xlispstrdup (file); |
| 345 | dpyinfo->bitmaps[id - 1].depth = 1; | 345 | dpyinfo->bitmaps[id - 1].depth = 1; |
| @@ -515,7 +515,7 @@ x_create_bitmap_mask (struct frame *f, ptrdiff_t id) | |||
| 515 | width, height); | 515 | width, height); |
| 516 | XFreeGC (FRAME_X_DISPLAY (f), gc); | 516 | XFreeGC (FRAME_X_DISPLAY (f), gc); |
| 517 | 517 | ||
| 518 | dpyinfo->bitmaps[id - 1].have_mask = 1; | 518 | dpyinfo->bitmaps[id - 1].have_mask = true; |
| 519 | dpyinfo->bitmaps[id - 1].mask = mask; | 519 | dpyinfo->bitmaps[id - 1].mask = mask; |
| 520 | 520 | ||
| 521 | XDestroyImage (ximg); | 521 | XDestroyImage (ximg); |
| @@ -3446,7 +3446,7 @@ x_create_bitmap_from_xpm_data (struct frame *f, const char **bits) | |||
| 3446 | 3446 | ||
| 3447 | id = x_allocate_bitmap_record (f); | 3447 | id = x_allocate_bitmap_record (f); |
| 3448 | dpyinfo->bitmaps[id - 1].pixmap = bitmap; | 3448 | dpyinfo->bitmaps[id - 1].pixmap = bitmap; |
| 3449 | dpyinfo->bitmaps[id - 1].have_mask = 1; | 3449 | dpyinfo->bitmaps[id - 1].have_mask = true; |
| 3450 | dpyinfo->bitmaps[id - 1].mask = mask; | 3450 | dpyinfo->bitmaps[id - 1].mask = mask; |
| 3451 | dpyinfo->bitmaps[id - 1].file = NULL; | 3451 | dpyinfo->bitmaps[id - 1].file = NULL; |
| 3452 | dpyinfo->bitmaps[id - 1].height = attrs.height; | 3452 | dpyinfo->bitmaps[id - 1].height = attrs.height; |
| @@ -3974,7 +3974,7 @@ xpm_load_image (struct frame *f, | |||
| 3974 | Lisp_Object (*get_color_table) (Lisp_Object, const unsigned char *, int); | 3974 | Lisp_Object (*get_color_table) (Lisp_Object, const unsigned char *, int); |
| 3975 | Lisp_Object frame, color_symbols, color_table; | 3975 | Lisp_Object frame, color_symbols, color_table; |
| 3976 | int best_key; | 3976 | int best_key; |
| 3977 | bool have_mask = 0; | 3977 | bool have_mask = false; |
| 3978 | XImagePtr ximg = NULL, mask_img = NULL; | 3978 | XImagePtr ximg = NULL, mask_img = NULL; |
| 3979 | 3979 | ||
| 3980 | #define match() \ | 3980 | #define match() \ |
| @@ -4146,7 +4146,7 @@ xpm_load_image (struct frame *f, | |||
| 4146 | #ifndef HAVE_NS | 4146 | #ifndef HAVE_NS |
| 4147 | XPutPixel (mask_img, x, y, | 4147 | XPutPixel (mask_img, x, y, |
| 4148 | (!EQ (color_val, Qt) ? PIX_MASK_DRAW | 4148 | (!EQ (color_val, Qt) ? PIX_MASK_DRAW |
| 4149 | : (have_mask = 1, PIX_MASK_RETAIN))); | 4149 | : (have_mask = true, PIX_MASK_RETAIN))); |
| 4150 | #else | 4150 | #else |
| 4151 | if (EQ (color_val, Qt)) | 4151 | if (EQ (color_val, Qt)) |
| 4152 | ns_set_alpha (ximg, x, y, 0); | 4152 | ns_set_alpha (ximg, x, y, 0); |