summaryrefslogtreecommitdiffstats
path: root/generic/tkImgPhoto.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2003-10-31 18:56:29 (GMT)
committerhobbs <hobbs>2003-10-31 18:56:29 (GMT)
commit18ddf8256ad88c16f5249dc6145dea48dcb1958e (patch)
treeb7e603be3e40525e96c59ad5c080c38c086b6d2d /generic/tkImgPhoto.c
parenta49a14794dfde7043b0c9ec047ff65b131e20276 (diff)
downloadtk-18ddf8256ad88c16f5249dc6145dea48dcb1958e.zip
tk-18ddf8256ad88c16f5249dc6145dea48dcb1958e.tar.gz
tk-18ddf8256ad88c16f5249dc6145dea48dcb1958e.tar.bz2
* generic/tkImgPhoto.c (ImgPhotoBlendComplexAlpha): OS X uses
32bpp images internally always, so make use of the assumption.
Diffstat (limited to 'generic/tkImgPhoto.c')
-rw-r--r--generic/tkImgPhoto.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 1176cf9..a2afd81 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.41 2003/10/31 02:05:21 hobbs Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.42 2003/10/31 18:56:30 hobbs Exp $
*/
#include "tkInt.h"
@@ -2580,7 +2580,7 @@ static void ImgPhotoBlendComplexAlpha (
#define ALPHA_BLEND(bgPix, imgPix, alpha, unalpha) \
((bgPix * unalpha + imgPix * alpha) / 255)
-#ifndef __WIN32__
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
/*
* Only unix requires the special case for <24bpp. It varies with
* 3 extra shifts and uses RGB15. The 24+bpp version could also