diff options
Diffstat (limited to 'macosx/tkMacOSXImage.c')
-rw-r--r-- | macosx/tkMacOSXImage.c | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c index fc0ffdf..0b63148 100644 --- a/macosx/tkMacOSXImage.c +++ b/macosx/tkMacOSXImage.c @@ -460,15 +460,16 @@ XCreateImage( * TkPutImage, XPutImage, TkpPutRGBAImage -- * * These functions, which all have the same signature, copy a rectangular - * subimage of an XImage into a drawable. The first two are identical on - * macOS. They assume that the XImage data has the structure of a 32bpp - * ZPixmap in which the image data is an array of 32bit integers packed - * with 8 bit values for the Red Green and Blue channels. They ignore the - * fourth byte. The function TkpPutRGBAImage assumes that the XImage data - * has been extended by using the fourth byte to store an 8-bit Alpha - * value. (The Alpha data is assumed not to pre-multiplied). The image - * is then drawn into the drawable using standard Porter-Duff Source Atop - * Composition (kCGBlendModeSourceAtop in Apple's Core Graphics). + * subimage of an XImage into a drawable. TkPutImage is an alias for + * XPutImage, which assumes that the XImage data has the structure of a + * 32bpp ZPixmap in which the image data is an array of 32bit integers + * packed with 8 bit values for the Red Green and Blue channels. The + * fourth byte is ignored. The function TkpPutRGBAImage assumes that the + * XImage data has been extended by using the fourth byte to store an + * 8-bit Alpha value. (The Alpha data is assumed not to pre-multiplied). + * The image is then drawn into the drawable using standard Porter-Duff + * Source Atop Composition (kCGBlendModeSourceAtop in Apple's Core + * Graphics). * * The TkpPutRGBAImage function is used by TkImgPhotoDisplay to render photo * images if the compile-time variable TK_CAN_RENDER_RGBA is defined in @@ -503,6 +504,7 @@ TkMacOSXPutImage( TkMacOSXDrawingContext dc; MacDrawable *macDraw = (MacDrawable *)drawable; int result = Success; + display->request++; if (!TkMacOSXSetupDrawingContext(drawable, gc, &dc)) { return BadDrawable; @@ -553,23 +555,6 @@ int XPutImage( src_x, src_y, dest_x, dest_y, width, height); } -int TkPutImage( - TCL_UNUSED(unsigned long *), - TCL_UNUSED(int), - Display* display, - Drawable drawable, - GC gc, - XImage* image, - int src_x, - int src_y, - int dest_x, - int dest_y, - unsigned int width, - unsigned int height) { - return TkMacOSXPutImage(IGNORE_ALPHA, display, drawable, gc, image, - src_x, src_y, dest_x, dest_y, width, height); -} - int TkpPutRGBAImage( Display* display, Drawable drawable, |