commit 5257c3001cc19b17e6fba321a13013ed7b9bc6aa
author Jesse Hall <jessehall@google.com> Wed Dec 19 14:05:59 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 19 14:06:00 2012 -0800
tree 82791080cab6870996188aedeb9103c84a680692
parent b5a48ebabe7cdca1ea03a81caca12dea436baf17
parent 90b30dc00de3e8a2ba3bec2bc7bd10daef042dff

Merge "Fix assumption that pixel alpha is in upper 8 bits"

distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzWindow.m

diff --git a/distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzWindow.m b/distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzWindow.m
index 375833f..078aebc 100644
--- a/distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzWindow.m
+++ b/distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzWindow.m
@@ -33,11 +33,10 @@
 static void QZ_SetPortAlphaOpaque () {
     
     SDL_Surface *surface = current_video->screen;
-    int bpp;
-    
-    bpp = surface->format->BitsPerPixel;
-    
-    if (bpp == 32) {
+    int bpp = surface->format->BitsPerPixel;
+    Uint32 amask = surface->format->Amask;
+
+    if (bpp == 32 && amask != 0) {
     
         Uint32    *pixels = (Uint32*) surface->pixels;
         Uint32    rowPixels = surface->pitch / 4;
@@ -46,7 +45,7 @@
         for (i = 0; i < surface->h; i++)
             for (j = 0; j < surface->w; j++) {
         
-                pixels[ (i * rowPixels) + j ] |= 0xFF000000;
+                pixels[ (i * rowPixels) + j ] |= amask;
             }
     }
 }