diff options
Diffstat (limited to 'xlib/ximage.c')
| -rw-r--r-- | xlib/ximage.c | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/xlib/ximage.c b/xlib/ximage.c index 8519597..c869332 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.8.1 2004/02/23 10:49:29 das Exp $ + * RCS: @(#) $Id: ximage.c,v 1.4.8.2 2007/06/23 00:26:42 das Exp $ */ #include "tkInt.h" @@ -43,7 +43,7 @@ XCreateBitmapFromData(display, d, data, width, height) unsigned int width; unsigned int height; { - XImage ximage; + XImage *ximage; GC gc; Pixmap pix; @@ -52,23 +52,11 @@ XCreateBitmapFromData(display, d, data, width, height) if (gc == NULL) { return None; } - ximage.height = height; - ximage.width = width; - ximage.depth = 1; - ximage.bits_per_pixel = 1; - ximage.xoffset = 0; - ximage.format = XYBitmap; - ximage.data = (char *)data; - ximage.byte_order = LSBFirst; - ximage.bitmap_unit = 8; - 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); + ximage = XCreateImage(display, NULL, 1, XYBitmap, 0, (char*) data, width, + height, 8, (width + 7) / 8); + TkPutImage(NULL, 0, display, pix, gc, ximage, 0, 0, 0, 0, width, height); + ximage->data = NULL; + XDestroyImage(ximage); XFreeGC(display, gc); return pix; } |