summaryrefslogtreecommitdiffstats
path: root/xlib/ximage.c
diff options
context:
space:
mode:
authordas <das>2004-02-23 10:48:09 (GMT)
committerdas <das>2004-02-23 10:48:09 (GMT)
commit424068d0e8dd6fcb04ef498c011262dd8466f3b5 (patch)
tree8af091f49a419ae3eaa1eefd6d0e21df85524f33 /xlib/ximage.c
parent326d3447f96c8bbd0e2f1956eddfc532ab6a0853 (diff)
downloadtk-424068d0e8dd6fcb04ef498c011262dd8466f3b5.zip
tk-424068d0e8dd6fcb04ef498c011262dd8466f3b5.tar.gz
tk-424068d0e8dd6fcb04ef498c011262dd8466f3b5.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. [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..97a79c1 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.5 2004/02/23 10:48:11 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);