diff options
| author | dgp@users.sourceforge.net <dgp> | 2014-10-14 19:12:25 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2014-10-14 19:12:25 (GMT) |
| commit | 3742afd218896e8a9adc062ff18afe43ee68a789 (patch) | |
| tree | 46d1ff8d48b3157fb3767eb177bce2bf225f4247 | |
| parent | 60a8f84a4748053f298dbf0b2a3f34956df0ec4f (diff) | |
| parent | ef9f2785337716d51aaed60791541e8e3007327f (diff) | |
| download | tk-3742afd218896e8a9adc062ff18afe43ee68a789.zip tk-3742afd218896e8a9adc062ff18afe43ee68a789.tar.gz tk-3742afd218896e8a9adc062ff18afe43ee68a789.tar.bz2 | |
merge 8.5; update changes
| -rw-r--r-- | changes | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXDraw.c | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -6962,4 +6962,6 @@ Many revisions to better support a Cygwin environment (nijtmans) 2014-10-11 (bug)[810c43] [text] elide changes advance epoch (vogel) +2014-10-14 (bug)[fb35eb] fix PNG transparency appearance (walton,culler) + --- Released 8.5.17, October 25, 2014 --- http://core.tcl.tk/tk/ for details diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c index 2d725a7..d4b2c85 100644 --- a/macosx/tkMacOSXDraw.c +++ b/macosx/tkMacOSXDraw.c @@ -463,13 +463,13 @@ CreateCGImageWithXImage( * Color image */ - CGColorSpaceRef colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); + CGColorSpaceRef colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); bitsPerComponent = 8; bitsPerPixel = 32; bitmapInfo = (image->byte_order == MSBFirst ? kCGBitmapByteOrder32Big : kCGBitmapByteOrder32Little) | - kCGImageAlphaNoneSkipFirst; + kCGImageAlphaNoneSkipFirst; data = memcpy(ckalloc(len), image->data + image->xoffset, len); if (data) { provider = CGDataProviderCreateWithData(data, data, len, releaseData); |