[Scummvm-cvs-logs] scummvm master -> f2926412fe7966bc34ceea1f87f2a4dae51df2eb

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f2926412fe GRAPHICS: Fix fast ALPHA_BINARY blitting with TransparentSurface.


Commit: f2926412fe7966bc34ceea1f87f2a4dae51df2eb
    https://github.com/scummvm/scummvm/commit/f2926412fe7966bc34ceea1f87f2a4dae51df2eb
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-14T02:15:28+01:00

Commit Message:
GRAPHICS: Fix fast ALPHA_BINARY blitting with TransparentSurface.

This is a regression from 5d0f38d747e7583d0ca5959cd642468ba67cd04c and caused
color glitches in Wintermute.

Changed paths:
    graphics/transparent_surface.cpp



diff --git a/graphics/transparent_surface.cpp b/graphics/transparent_surface.cpp
index 992a5dc..19e7655 100644
--- a/graphics/transparent_surface.cpp
+++ b/graphics/transparent_surface.cpp
@@ -116,7 +116,7 @@ void doBlitBinaryFast(byte *ino, byte *outo, uint32 width, uint32 height, uint32
 		in = ino;
 		for (uint32 j = 0; j < width; j++) {
 			uint32 pix = *(uint32 *)in;
-			int a = (pix >> kAModShift) & 0xff;
+			int a = in[kAIndex];
 
 			if (a != 0) {   // Full opacity (Any value not exactly 0 is Opaque here)
 				*(uint32 *)out = pix;