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

[somaen]

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:
cffda7710c GRAPHICS: Force alphaBits to 8 for 32bpp TGAs for now


Commit: cffda7710c7c0ba720797dbb025048e21e821708
    https://github.com/scummvm/scummvm/commit/cffda7710c7c0ba720797dbb025048e21e821708
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2012-09-15T08:57:08-07:00

Commit Message:
GRAPHICS: Force alphaBits to 8 for 32bpp TGAs for now

Changed paths:
    graphics/decoders/tga.cpp



diff --git a/graphics/decoders/tga.cpp b/graphics/decoders/tga.cpp
index 0b2318e..0c07770 100644
--- a/graphics/decoders/tga.cpp
+++ b/graphics/decoders/tga.cpp
@@ -145,7 +145,10 @@ bool TGADecoder::readHeader(Common::SeekableReadStream &tga, byte &imageType, by
 		if (pixelDepth == 24) {
 			_format = PixelFormat(3, 8, 8, 8, 0, 16, 8, 0, 0);
 		} else if (pixelDepth == 32) {
-			_format = PixelFormat(4, 8, 8, 8, attributeBits, 16, 8, 0, 24);
+			// HACK: According to the spec, attributeBits should determine the amount
+			// of alpha-bits, however, as the game files that use this decoder seems
+			// to ignore that fact, we force the amount to 8 for 32bpp files for now.
+			_format = PixelFormat(4, 8, 8, 8, 8, 16, 8, 0, 24);
 		} else if (pixelDepth == 16 && imageType == TYPE_TRUECOLOR) {
 			// 16bpp TGA is ARGB1555
 			_format = PixelFormat(2, 5, 5, 5, attributeBits, 10, 5, 0, 15);