summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2007-06-10 00:15:35 (GMT)
committerhobbs <hobbs>2007-06-10 00:15:35 (GMT)
commitceaab853c21c70ff37a506c244e5f4210438f16a (patch)
tree8b0689bbb5790077829f5c14632da44ec6827cfb
parent0ab8c6c4cef834af9a8d49cc5f80e26b5f4d7f8a (diff)
downloadtk-ceaab853c21c70ff37a506c244e5f4210438f16a.zip
tk-ceaab853c21c70ff37a506c244e5f4210438f16a.tar.gz
tk-ceaab853c21c70ff37a506c244e5f4210438f16a.tar.bz2
* win/tkWinWm.c (WmIconphotoCmd): fix wm iconphoto RGBA issues.
[Bug 1467997] (janssen)
-rw-r--r--ChangeLog3
-rw-r--r--win/tkWinWm.c19
2 files changed, 18 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fad1b93..21aafb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2007-06-09 Jeff Hobbs <jeffh@ActiveState.com>
+ * win/tkWinWm.c (WmIconphotoCmd): fix wm iconphoto RGBA issues.
+ [Bug 1467997] (janssen)
+
* win/tkWinMenu.c (TkWinHandleMenuEvent): improve handling to
allow for unicode char menu indices and not use CharUpper on Tcl
utf strings. [Bug #1734223]
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 3525b1a..72f1cb2 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinWm.c,v 1.54.2.26 2006/12/01 19:47:42 hobbs Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.54.2.27 2007/06/10 00:15:35 hobbs Exp $
*/
#include "tkWinInt.h"
@@ -4030,7 +4030,8 @@ WmIconphotoCmd(tkwin, winPtr, interp, objc, objv)
TkWindow *useWinPtr = winPtr; /* window to apply to (NULL if -default) */
Tk_PhotoHandle photo;
Tk_PhotoImageBlock block;
- int i, size, width, height, startObj = 3;
+ int i, size, width, height, idx, bufferSize, startObj = 3;
+ unsigned char *bgraPixelPtr;
BlockOfIconImagesPtr lpIR;
WinIconPtr titlebaricon = NULL;
HICON hIcon;
@@ -4077,10 +4078,20 @@ WmIconphotoCmd(tkwin, winPtr, interp, objc, objv)
Tk_PhotoGetImage(photo, &block);
/*
- * Encode the image data into an HICON.
+ * Convert the image data into BGRA format (RGBQUAD) and then
+ * encode the image data into an HICON.
*/
+ bufferSize = height * width * block.pixelSize;
+ bgraPixelPtr = ckalloc(bufferSize);
+ for (idx = 0 ; idx < bufferSize ; idx += 4) {
+ bgraPixelPtr[idx] = block.pixelPtr[idx+2];
+ bgraPixelPtr[idx+1] = block.pixelPtr[idx+1];
+ bgraPixelPtr[idx+2] = block.pixelPtr[idx+0];
+ bgraPixelPtr[idx+3] = block.pixelPtr[idx+3];
+ }
hIcon = CreateIcon(Tk_GetHINSTANCE(), width, height, 1, 32,
- NULL, (BYTE *) block.pixelPtr);
+ NULL, (BYTE *) bgraPixelPtr);
+ ckfree(bgraPixelPtr);
if (hIcon == NULL) {
/* XXX should free up created icons */
Tcl_Free((char *) lpIR);