[Scummvm-cvs-logs] scummvm master -> 25aa19b2721e2f776d75219272217106817c95b3

somaen einarjohan at somadalen.com
Sat Sep 15 18:09:34 CEST 2012


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:
25aa19b272 GRAPHICS: Reinsert attributeBits as a comment to the TGA-decoder


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

Commit Message:
GRAPHICS: Reinsert attributeBits as a comment to the TGA-decoder

Changed paths:
    graphics/decoders/tga.cpp



diff --git a/graphics/decoders/tga.cpp b/graphics/decoders/tga.cpp
index 0c07770..c3b9d84 100644
--- a/graphics/decoders/tga.cpp
+++ b/graphics/decoders/tga.cpp
@@ -148,7 +148,7 @@ bool TGADecoder::readHeader(Common::SeekableReadStream &tga, byte &imageType, by
 			// 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);
+			_format = PixelFormat(4, 8, 8, 8, /* attributeBits */ 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);






More information about the Scummvm-git-logs mailing list