1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-27 07:41:28 -08:00

[MAC_OS] (XPutPixel): Set alpha channel bits if pixmap depth is 32.

[MAC_OS] (XGetPixel): Strip off alpha channel bits if pixmap depth is 32.
This commit is contained in:
YAMAMOTO Mitsuharu 2006-03-08 03:25:26 +00:00
parent 4299d849d8
commit 4cdffedfae
2 changed files with 9 additions and 2 deletions

View file

@ -1,3 +1,10 @@
2006-03-08 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* image.c [MAC_OS] (XPutPixel): Set alpha channel bits if pixmap
depth is 32.
[MAC_OS] (XGetPixel): Strip off alpha channel bits if pixmap
depth is 32.
2006-03-06 Chong Yidong <cyd@stupidchicken.com>
* xdisp.c (handle_invisible_prop): Don't update it->position with

View file

@ -194,7 +194,7 @@ XPutPixel (ximage, x, y, pixel)
char *base_addr = GetPixBaseAddr (pixmap);
short row_bytes = GetPixRowBytes (pixmap);
((unsigned long *) (base_addr + y * row_bytes))[x] = pixel;
((unsigned long *) (base_addr + y * row_bytes))[x] = 0xff000000 | pixel;
}
else if (depth == 1)
{
@ -238,7 +238,7 @@ XGetPixel (ximage, x, y)
char *base_addr = GetPixBaseAddr (pixmap);
short row_bytes = GetPixRowBytes (pixmap);
return ((unsigned long *) (base_addr + y * row_bytes))[x];
return ((unsigned long *) (base_addr + y * row_bytes))[x] & 0x00ffffff;
}
else if (depth == 1)
{