summaryrefslogtreecommitdiffstats
path: root/generic/tkImgPhoto.c
diff options
context:
space:
mode:
Diffstat (limited to 'generic/tkImgPhoto.c')
-rw-r--r--generic/tkImgPhoto.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 34d0d46..fc3aa76 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -17,7 +17,7 @@
* Department of Computer Science,
* Australian National University.
*
- * RCS: @(#) $Id: tkImgPhoto.c,v 1.53 2004/12/03 13:09:39 dkf Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.54 2004/12/09 10:13:28 dkf Exp $
*/
#include "tkInt.h"
@@ -4590,7 +4590,9 @@ Tk_PhotoPutBlock(interp, handle, blockPtr, x, y, width, height, compRule)
* Check if display code needs alpha blending...
*/
- ToggleComplexAlphaIfNeeded(masterPtr);
+ if (alphaOffset != 0 || masterPtr->flags & COMPLEX_ALPHA) {
+ ToggleComplexAlphaIfNeeded(masterPtr);
+ }
/*
* Update each instance.
@@ -4890,7 +4892,9 @@ Tk_PhotoPutZoomedBlock(interp, handle, blockPtr, x, y, width, height,
* Check if display code needs alpha blending...
*/
- ToggleComplexAlphaIfNeeded(masterPtr);
+ if (alphaOffset != 0 || masterPtr->flags & COMPLEX_ALPHA) {
+ ToggleComplexAlphaIfNeeded(masterPtr);
+ }
/*
* Update each instance.