diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-01-29 17:12:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-01-29 17:12:36 (GMT) |
| commit | da25a7797c2973374084e2d355ac41ae55146902 (patch) | |
| tree | e430c0c140e494b55c4c2f61681a3467d98305b8 /generic | |
| parent | 46cbc2bb40339b5da6b413fdd1373f316b6c6913 (diff) | |
| download | tk-da25a7797c2973374084e2d355ac41ae55146902.zip tk-da25a7797c2973374084e2d355ac41ae55146902.tar.gz tk-da25a7797c2973374084e2d355ac41ae55146902.tar.bz2 | |
Bug 3480634: PNG Images missing in menus on Mac
FossilOrigin-Name: 11b15014f5ea22e5a0704fca93d123fda43a239a
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkImgPhoto.c | 4 |
1 files changed, 3 insertions, 1 deletions
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, |