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

[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:
46c933d953 IMAGE: Fix TGA copy and paste error.
a9e91aac0d Merge pull request #480 from klusark/patch-2


Commit: 46c933d9536fc79703792a00a88b5ee460877e0a
    https://github.com/scummvm/scummvm/commit/46c933d9536fc79703792a00a88b5ee460877e0a
Author: Joel Teichroeb (joel at teichroeb.net)
Date: 2014-07-09T22:28:43-07:00

Commit Message:
IMAGE: Fix TGA copy and paste error.

Changed paths:
    image/tga.cpp



diff --git a/image/tga.cpp b/image/tga.cpp
index e251f64..f22cfcb 100644
--- a/image/tga.cpp
+++ b/image/tga.cpp
@@ -159,7 +159,7 @@ bool TGADecoder::readHeader(Common::SeekableReadStream &tga, byte &imageType, by
 			warning("Unsupported pixel depth: %d, %d", imageType, pixelDepth);
 			return false;
 		}
-	} else if (imageType == TYPE_BW || TYPE_RLE_BW) {
+	} else if (imageType == TYPE_BW || imageType == TYPE_RLE_BW) {
 		if (pixelDepth == 8) {
 			_format = Graphics::PixelFormat(4, 8, 8, 8, 0, 16, 8, 0, 0);
 		} else {


Commit: a9e91aac0d45c1fb61ebadab6bdcf3604d3e1d8e
    https://github.com/scummvm/scummvm/commit/a9e91aac0d45c1fb61ebadab6bdcf3604d3e1d8e
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2014-07-10T21:37:05+02:00

Commit Message:
Merge pull request #480 from klusark/patch-2

IMAGE: Fix TGA copy and paste error.

Changed paths:
    image/tga.cpp