[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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1f27fc7a6f9e00398ae350c9eb2b5f2af1cc5bab..0bcf392c58c3e21a33010c3a753420d77fcbe110 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/image.c b/src/image.c
index 879bbf745a3894b40168d67f57e24aa34aaf85ec..cbdff81eba77ca381696833d4e8465303d99b7d6 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -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)
     {