diff options
| author | fvogel <fvogelnew1@free.fr> | 2023-12-03 18:49:36 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2023-12-03 18:49:36 (GMT) |
| commit | c0764ea9cc2d2af68135605eda1a8214d0afa571 (patch) | |
| tree | b61a7dfadd3568e38440059541e21ddd547e4930 /macosx | |
| parent | 5141d1a7d374a8bf342737ca4777891b499c0c64 (diff) | |
| parent | 4ba9a6d13a84325cf9f4644eba76651df846aeae (diff) | |
| download | tk-c0764ea9cc2d2af68135605eda1a8214d0afa571.zip tk-c0764ea9cc2d2af68135605eda1a8214d0afa571.tar.gz tk-c0764ea9cc2d2af68135605eda1a8214d0afa571.tar.bz2 | |
Fix [fe942372aa]: Aqua: XPutImage() swaps red and blue channels. Patch from Christopher Chavez.
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXImage.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c index 32f3db9..55cb99e 100644 --- a/macosx/tkMacOSXImage.c +++ b/macosx/tkMacOSXImage.c @@ -122,13 +122,12 @@ static void ReleaseData( static CGImageRef TkMacOSXCreateCGImageWithXImage( XImage *image, - uint32_t alphaInfo) + uint32_t bitmapInfo) { CGImageRef img = NULL; size_t bitsPerComponent, bitsPerPixel; size_t len = image->bytes_per_line * image->height; const CGFloat *decode = NULL; - CGBitmapInfo bitmapInfo; CGDataProviderRef provider = NULL; char *data = NULL; CGDataProviderReleaseDataCallback releaseData = ReleaseData; @@ -184,7 +183,6 @@ TkMacOSXCreateCGImageWithXImage( CGColorSpaceRef colorspace = CGColorSpaceCreateDeviceRGB(); bitsPerComponent = 8; bitsPerPixel = 32; - bitmapInfo = kCGBitmapByteOrder32Big | alphaInfo; data = (char *)ckalloc(len); if (data) { memcpy(data, image->data + image->xoffset, len); @@ -483,8 +481,8 @@ XCreateImage( *---------------------------------------------------------------------- */ -#define USE_ALPHA kCGImageAlphaLast -#define IGNORE_ALPHA kCGImageAlphaNoneSkipLast +#define USE_ALPHA (kCGImageAlphaLast | kCGBitmapByteOrder32Big) +#define IGNORE_ALPHA (kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little) static int TkMacOSXPutImage( |