[Scummvm-cvs-logs] scummvm master -> 82a553a12c033489939c031bb104e37e77ee0797

[lordhoto]

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

Summary:
984e0012d9 GRAPHICS: Fix colorToARGB's alpha value when no alpha channel is present
82a553a12c Merge pull request #247 from clone2727/pixelformat-argb-fix


Commit: 984e0012d9b96a752b40a008aa1689d43d9a9920
    https://github.com/scummvm/scummvm/commit/984e0012d9b96a752b40a008aa1689d43d9a9920
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-06-15T20:11:28-07:00

Commit Message:
GRAPHICS: Fix colorToARGB's alpha value when no alpha channel is present

Changed paths:
    graphics/pixelformat.h



diff --git a/graphics/pixelformat.h b/graphics/pixelformat.h
index e0cf6ce..ca4ef11 100644
--- a/graphics/pixelformat.h
+++ b/graphics/pixelformat.h
@@ -97,7 +97,7 @@ struct PixelFormat {
 	}
 
 	inline void colorToARGB(uint32 color, uint8 &a, uint8 &r, uint8 &g, uint8 &b) const {
-		a = ((color >> aShift) << aLoss) & 0xFF;
+		a = (aBits() == 0) ? 0xFF : (((color >> aShift) << aLoss) & 0xFF);
 		r = ((color >> rShift) << rLoss) & 0xFF;
 		g = ((color >> gShift) << gLoss) & 0xFF;
 		b = ((color >> bShift) << bLoss) & 0xFF;


Commit: 82a553a12c033489939c031bb104e37e77ee0797
    https://github.com/scummvm/scummvm/commit/82a553a12c033489939c031bb104e37e77ee0797
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2012-06-20T09:24:08-07:00

Commit Message:
Merge pull request #247 from clone2727/pixelformat-argb-fix

GRAPHICS: Fix colorToARGB's alpha value when no alpha channel is present

Changed paths:
    graphics/pixelformat.h