[Scummvm-git-logs] scummvm master -> 3f6efbb84babc3ef9da80f0cc74f7f9e699b8bda

[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:
81975911f7 CINE: Fix compilation
3f6efbb84b COMMON: Attempt to solve diamong class hierarchy in MemoryReadStreamEndian. by athrxx


Commit: 81975911f7ec560bd48748da39c7e9c82e354a02
    https://github.com/scummvm/scummvm/commit/81975911f7ec560bd48748da39c7e9c82e354a02
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-22T22:58:43+02:00

Commit Message:
CINE: Fix compilation

Changed paths:
    engines/cine/pal.cpp


diff --git a/engines/cine/pal.cpp b/engines/cine/pal.cpp
index 9d18548b1c..8507246423 100644
--- a/engines/cine/pal.cpp
+++ b/engines/cine/pal.cpp
@@ -204,7 +204,7 @@ bool Palette::ensureContrast(byte &minBrightnessColorIndex) {
 	minBrightnessColorIndex = findMinBrightnessColorIndex();
 	if (_colors.size() >= 3 && isEqual(2, minBrightnessColorIndex)) {
 		Color black = {0, 0, 0};
-		Color white = {_format.rMax(), _format.gMax(), _format.bMax()};
+		Color white = {static_cast<uint8>(_format.rMax()), static_cast<uint8>(_format.gMax()), static_cast<uint8>(_format.bMax())};
 
 		_colors[2] = white;
 		if (isEqual(2, minBrightnessColorIndex)) {
@@ -242,7 +242,7 @@ void Palette::setGlobalOSystemPalette() const {
 	if (g_cine->mayHave256Colors()) {
 		memset(buf, 0, sizeof(buf)); // Clear whole palette
 	}
-	
+
 	// The color format used by OSystem's setPalette-function:
 	save(buf, sizeof(buf), Graphics::PixelFormat(3, 8, 8, 8, 0, 0, 8, 16, 0), CINE_LITTLE_ENDIAN);
 


Commit: 3f6efbb84babc3ef9da80f0cc74f7f9e699b8bda
    https://github.com/scummvm/scummvm/commit/3f6efbb84babc3ef9da80f0cc74f7f9e699b8bda
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-22T22:58:43+02:00

Commit Message:
COMMON: Attempt to solve diamong class hierarchy in MemoryReadStreamEndian. by athrxx

Changed paths:
    common/memstream.h


diff --git a/common/memstream.h b/common/memstream.h
index f4f0fdc1a4..9452e4f24b 100644
--- a/common/memstream.h
+++ b/common/memstream.h
@@ -33,7 +33,7 @@ namespace Common {
  * Simple memory based 'stream', which implements the ReadStream interface for
  * a plain memory block.
  */
-class MemoryReadStream : public SeekableReadStream {
+class MemoryReadStream : virtual public SeekableReadStream {
 private:
 	const byte * const _ptrOrig;
 	const byte *_ptr;