summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--generic/tkImgPhoto.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dd2bd82..3673abf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-29 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * win/tkImgPhoto.c: [Bug 3480634]: PNG Images missing in menus on Mac
+
2012-01-27 Jan Nijtmans <nijtmans@users.sf.net>
* win/tkWinDialog.c: [Bug 3480471]: tk_getOpenFile crashes on Win64
@@ -29,7 +33,7 @@
2012-01-22 Francois Vogel <fvogelnew1@free.fr>
- * generic/tkTextMark.c: [Bug-3288113,3288121]: Missing marks/endless
+ * generic/tkTextMark.c: [Bug-3288113,3288121]: Missing marks/endless
* tests/textMark.test: loop in text mark prev/next
2012-01-19 Francois Vogel <fvogelnew1@free.fr>
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index a6df6ef..6075da8 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -2791,7 +2791,8 @@ ImgPhotoDisplay(
(unsigned int)width, (unsigned int)height, AllPlanes, ZPixmap);
if (bgImg == NULL) {
Tk_DeleteErrorHandler(handler);
- return;
+ /* We failed to get the image so draw without blending alpha. It's the best we can do */
+ goto fallBack;
}
ImgPhotoBlendComplexAlpha(bgImg, instancePtr, imageX, imageY, width,
@@ -2814,6 +2815,7 @@ ImgPhotoDisplay(
* origin appropriately, and use it when drawing the image.
*/
+ fallBack:
TkSetRegion(display, instancePtr->gc,
instancePtr->masterPtr->validRegion);
XSetClipOrigin(display, instancePtr->gc, drawableX - imageX,