aboutsummaryrefslogtreecommitdiffstats
path: root/src/image.c
diff options
context:
space:
mode:
authorPaul Eggert2016-11-05 20:41:37 -0700
committerPaul Eggert2016-11-05 20:42:10 -0700
commit84c53436ab25b6c8f76c133e59b34e533ea33cc7 (patch)
tree0591d8e26be72e5c36a221c6642c614d43cb8c30 /src/image.c
parentbb61e50533a4dd1f2f93de1f8ca55d31f9094e6d (diff)
downloademacs-84c53436ab25b6c8f76c133e59b34e533ea33cc7.tar.gz
emacs-84c53436ab25b6c8f76c133e59b34e533ea33cc7.zip
Prefer comments /* like this */ in C code
Emacs C code assumes C99 features, but has long used traditional comments /* like this */ instead of C99-style comments // like this. Stick with traditional comments for now, partly for style, partly as it may be safer with compilers that are not fully in C99 mode.
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 78539d91d2b..6a62235673a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3712,7 +3712,7 @@ xpm_load (struct frame *f, struct image *img)
3712 } 3712 }
3713 3713
3714#ifdef USE_CAIRO 3714#ifdef USE_CAIRO
3715 // Load very specific Xpm:s. 3715 /* Load very specific Xpm:s. */
3716 if (rc == XpmSuccess 3716 if (rc == XpmSuccess
3717 && img->ximg->format == ZPixmap 3717 && img->ximg->format == ZPixmap
3718 && img->ximg->bits_per_pixel == 32 3718 && img->ximg->bits_per_pixel == 32
@@ -3736,7 +3736,7 @@ xpm_load (struct frame *f, struct image *img)
3736 int maskidx = mid ? i * img->mask_img->bytes_per_line + k/8 : 0; 3736 int maskidx = mid ? i * img->mask_img->bytes_per_line + k/8 : 0;
3737 int mask = mid ? mid[maskidx] & (1 << (k % 8)) : 1; 3737 int mask = mid ? mid[maskidx] & (1 << (k % 8)) : 1;
3738 3738
3739 if (mask) od[idx] = id[idx] + 0xff000000; // ff => full alpha 3739 if (mask) od[idx] = id[idx] + 0xff000000; /* ff => full alpha */
3740 else od[idx] = bgcolor; 3740 else od[idx] = bgcolor;
3741 } 3741 }
3742 } 3742 }