[Scummvm-cvs-logs] scummvm master -> 5fecf5bcb53e253980cb82b4dac7d2c2e0d86eab

[digitall]

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:
5fecf5bcb5 GRAPHICS: Allow ILBM bitmap loading for images with 6 planes.


Commit: 5fecf5bcb53e253980cb82b4dac7d2c2e0d86eab
    https://github.com/scummvm/scummvm/commit/5fecf5bcb53e253980cb82b4dac7d2c2e0d86eab
Author: D G Turner (digitall at scummvm.org)
Date: 2012-12-25T18:09:33-08:00

Commit Message:
GRAPHICS: Allow ILBM bitmap loading for images with 6 planes.

Thanks to Tomaz^ for this.

Changed paths:
    graphics/iff.cpp



diff --git a/graphics/iff.cpp b/graphics/iff.cpp
index 4a74b63..eea051f 100644
--- a/graphics/iff.cpp
+++ b/graphics/iff.cpp
@@ -50,7 +50,7 @@ void ILBMDecoder::loadHeader(Common::ReadStream *stream) {
 void ILBMDecoder::loadBitmap(uint32 mode, byte *buffer, Common::ReadStream *stream) {
 	assert(stream);
 	uint32 numPlanes = MIN(mode & ILBM_UNPACK_PLANES, (uint32)_header.depth);
-	assert(numPlanes == 1 || numPlanes == 2 || numPlanes == 3 || numPlanes == 4 || numPlanes == 5 || numPlanes == 8);
+	assert(numPlanes >= 1 && numPlanes <= 8 && numPlanes != 7);
 
 	bool packPixels = (mode & ILBM_PACK_PLANES) != 0;
 	if (numPlanes != 1 && numPlanes != 2 && numPlanes != 4) {