[Scummvm-git-logs] scummvm master -> 3853bcf2628912e98681fda26d121c2b1f161c7a

[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:
3853bcf262 MOHAWK: MYST: Fix for Uncompressed Bitmap Loading


Commit: 3853bcf2628912e98681fda26d121c2b1f161c7a
    https://github.com/scummvm/scummvm/commit/3853bcf2628912e98681fda26d121c2b1f161c7a
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-21T03:40:13Z

Commit Message:
MOHAWK: MYST: Fix for Uncompressed Bitmap Loading

This fixes the loading of the map in the Polish language variant of
Myst 25th Anniversary Edition. However, a further fix is likely needed
as the map which is 24bpp with no palette renders with inverted colors.

Changed paths:
    engines/mohawk/bitmap.cpp


diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp
index d8dddd3c5c..396982cbb2 100644
--- a/engines/mohawk/bitmap.cpp
+++ b/engines/mohawk/bitmap.cpp
@@ -642,8 +642,13 @@ void MohawkBitmap::drawRLE8(Graphics::Surface *surface, bool isLE) {
 
 MohawkSurface *MystBitmap::decodeImage(Common::SeekableReadStream *stream) {
 	uint32 uncompressedSize = stream->readUint32LE();
-	Common::SeekableReadStream *bmpStream = decompressLZ(stream, uncompressedSize);
-	delete stream;
+	Common::SeekableReadStream *bmpStream;
+	if (uncompressedSize) {
+		bmpStream = decompressLZ(stream, uncompressedSize);
+		delete stream;
+	} else {
+		bmpStream = stream;
+	}
 
 	Image::BitmapDecoder bitmapDecoder;
 	if (!bitmapDecoder.loadStream(*bmpStream))