diff options
| -rw-r--r-- | generic/tkImgPhoto.c | 31 | ||||
| -rw-r--r-- | xlib/ximage.c | 26 |
2 files changed, 19 insertions, 38 deletions
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index e9e5b0c..15662eb 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -17,7 +17,7 @@ * Department of Computer Science, * Australian National University. * - * RCS: @(#) $Id: tkImgPhoto.c,v 1.69 2007/05/14 20:58:27 dgp Exp $ + * RCS: @(#) $Id: tkImgPhoto.c,v 1.70 2007/06/23 00:25:38 das Exp $ */ #include "tkInt.h" @@ -2260,7 +2260,7 @@ ImgPhotoConfigureInstance( if ((instancePtr->imagePtr == NULL) || (instancePtr->imagePtr->bits_per_pixel != bitsPerPixel)) { if (instancePtr->imagePtr != NULL) { - XFree((char *) instancePtr->imagePtr); + XDestroyImage(instancePtr->imagePtr); } imagePtr = XCreateImage(instancePtr->display, instancePtr->visualInfo.visual, (unsigned) bitsPerPixel, @@ -2269,25 +2269,18 @@ ImgPhotoConfigureInstance( instancePtr->imagePtr = imagePtr; /* - * Determine the endianness of this machine. We create images - * using the local host's endianness, rather than the endianness - * of the server; otherwise we would have to byte-swap any 16 or - * 32 bit values that we store in the image in those situations - * where the server's endianness is different from ours. - * - * FIXME: use autoconf to figure this out. + * We create images using the local host's endianness, rather than + * the endianness of the server; otherwise we would have to + * byte-swap any 16 or 32 bit values that we store in the image + * if the server's endianness is different from ours. */ if (imagePtr != NULL) { - union { - int i; - char c[sizeof(int)]; - } kludge; - - imagePtr->bitmap_unit = sizeof(pixel) * NBBY; - kludge.i = 0; - kludge.c[0] = 1; - imagePtr->byte_order = (kludge.i == 1) ? LSBFirst : MSBFirst; +#ifdef WORDS_BIGENDIAN + imagePtr->byte_order = MSBFirst; +#else + imagePtr->byte_order = LSBFirst; +#endif _XInitImageFuncPtrs(imagePtr); } } @@ -4006,7 +3999,7 @@ DisposeInstance( Tk_FreeGC(instancePtr->display, instancePtr->gc); } if (instancePtr->imagePtr != NULL) { - XFree((char *) instancePtr->imagePtr); + XDestroyImage(instancePtr->imagePtr); } if (instancePtr->error != NULL) { ckfree((char *) instancePtr->error); diff --git a/xlib/ximage.c b/xlib/ximage.c index 6f0c7ee..e6e4866 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.6 2007/01/02 23:39:40 dkf Exp $ + * RCS: @(#) $Id: ximage.c,v 1.7 2007/06/23 00:25:38 das Exp $ */ #include "tkInt.h" @@ -42,7 +42,7 @@ XCreateBitmapFromData( unsigned int width, unsigned int height) { - XImage ximage; + XImage *ximage; GC gc; Pixmap pix; @@ -51,23 +51,11 @@ XCreateBitmapFromData( 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; } |