From e3a00f1e1f662b21efebd793c22235a966c81cd9 Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Fri, 31 Oct 2003 18:56:29 +0000
Subject:         * generic/tkImgPhoto.c (ImgPhotoBlendComplexAlpha): OS X uses
         32bpp images internally always, so make use of the assumption.

---
 ChangeLog            | 5 +++++
 generic/tkImgPhoto.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 396c0c8..b859779 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-31  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* generic/tkImgPhoto.c (ImgPhotoBlendComplexAlpha): OS X uses
+	32bpp images internally always, so make use of the assumption.
+
 2003-10-31  Vince Darley <vincentdarley@users.sourceforge.net>
 
 	* generic/tkText.c
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
-- 
cgit v0.12