summaryrefslogtreecommitdiffstats
path: root/xlib/ximage.c
diff options
context:
space:
mode:
authordas <das>2004-02-23 10:49:29 (GMT)
committerdas <das>2004-02-23 10:49:29 (GMT)
commit297090b448fe798845d0a7c7e9427e9ef7dbc8ca (patch)
treeb311d4d99e05537a622c27159bf7d6b0c74ef3a3 /xlib/ximage.c
parent27f215c03a679ec897bd96a5fa2daa40fb42b7db (diff)
downloadtk-297090b448fe798845d0a7c7e9427e9ef7dbc8ca.zip
tk-297090b448fe798845d0a7c7e9427e9ef7dbc8ca.tar.gz
tk-297090b448fe798845d0a7c7e9427e9ef7dbc8ca.tar.bz2
* macosx/tkMacOSXDraw.c:
* macosx/tkMacOSXXStubs.c: * xlib/ximage.c: fixed MacOSX XGetImage/XPutImage and related functions to deal properly with XImages copied from screen. * generic/tkCanvPs.c (TkImageGetColor): MacOSX fix. * generic/tkImgPhoto.c (ImgPhotoDisplay): enabled alpha blending for images with partial transparency on MacOSX. [Bug 809157]
Diffstat (limited to 'xlib/ximage.c')
-rw-r--r--xlib/ximage.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/xlib/ximage.c b/xlib/ximage.c
index d2214ba..8519597 100644
--- a/xlib/ximage.c
+++ b/xlib/ximage.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: ximage.c,v 1.4 2000/07/06 03:17:45 mo Exp $
+ * RCS: @(#) $Id: ximage.c,v 1.4.8.1 2004/02/23 10:49:29 das Exp $
*/
#include "tkInt.h"
@@ -64,6 +64,9 @@ XCreateBitmapFromData(display, d, data, width, height)
ximage.bitmap_bit_order = LSBFirst;
ximage.bitmap_pad = 8;
ximage.bytes_per_line = (width+7)/8;
+#ifdef MAC_OSX_TK
+ ximage.obdata = NULL;
+#endif
TkPutImage(NULL, 0, display, pix, gc, &ximage, 0, 0, 0, 0, width, height);
XFreeGC(display, gc);