[Scummvm-git-logs] scummvm master -> e5f558f2dcfb1339e8203058d9d6be720322c1d4

[sev-]

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:
8640f14e58 DIRECTOR: Do not remap palette 8bpp -> 8bpp
e5f558f2dc IMAGE: Hid debug ouptut deeper and improve wording


Commit: 8640f14e58fae7fe95607d714e28d74b429fb5b4
    https://github.com/scummvm/scummvm/commit/8640f14e58fae7fe95607d714e28d74b429fb5b4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-07-09T13:35:51+02:00

Commit Message:
DIRECTOR: Do not remap palette 8bpp -> 8bpp

Changed paths:
    engines/director/castmember.cpp


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index e53a5490b9e..cb099a6f4ce 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -238,13 +238,18 @@ Graphics::MacWidget *BitmapCastMember::createWidget(Common::Rect &bbox, Channel
 	// Check if we need to dither the image
 	int dstBpp = g_director->_wm->_pixelformat.bytesPerPixel;
 	int srcBpp = _img->getSurface()->format.bytesPerPixel;
-	int palSize = _img->getPaletteColorCount();
 
 	const byte *pal = _img->getPalette();
 
 	if (dstBpp == 1) {
-		if (srcBpp > 1 || (srcBpp == 1 &&
-			memcmp(g_director->_wm->getPalette(), _img->getPalette(), palSize * 3))) {
+		if (srcBpp > 1
+		// At least early directors were not remapping 8bpp images. But in case it is
+		// needed, here is the code
+#if 0
+		|| (srcBpp == 1 &&
+			memcmp(g_director->_wm->getPalette(), _img->getPalette(), _img->getPaletteColorCount() * 3))
+#endif
+			) {
 
 			ditherFloydImage();
 


Commit: e5f558f2dcfb1339e8203058d9d6be720322c1d4
    https://github.com/scummvm/scummvm/commit/e5f558f2dcfb1339e8203058d9d6be720322c1d4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-07-09T13:35:55+02:00

Commit Message:
IMAGE: Hid debug ouptut deeper and improve wording

Changed paths:
    image/pict.cpp


diff --git a/image/pict.cpp b/image/pict.cpp
index d0295cd4822..7ad657e69e8 100644
--- a/image/pict.cpp
+++ b/image/pict.cpp
@@ -250,7 +250,7 @@ bool PICTDecoder::loadStream(Common::SeekableReadStream &stream) {
 	_imageRect.left = stream.readUint16BE();
 	_imageRect.bottom = stream.readUint16BE();
 	_imageRect.right = stream.readUint16BE();
-	_imageRect.debugPrint(0, "PICT Rect:");
+	_imageRect.debugPrint(8, "PICTDecoder::loadStream(): loaded rect: ");
 
 	// NOTE: This is only a subset of the full PICT format.
 	//     - Only V2 (Extended) Images Supported