[Scummvm-git-logs] scummvm master -> 09ed67d7f0247e72cf7f1dd3a242d9e6a86e0bae

[bgK]

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:
6a627e3e98 COMMON: Fix very noisy warning when building with GCC 9 in C++11 mode
09ed67d7f0 MOHAWK: MYST: Use OSystem::fillScreen now it works with all pixel formats


Commit: 6a627e3e98c468a7652d79eedfb141ed11ffb8c5
    https://github.com/scummvm/scummvm/commit/6a627e3e98c468a7652d79eedfb141ed11ffb8c5
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2019-11-10T21:04:29+01:00

Commit Message:
COMMON: Fix very noisy warning when building with GCC 9 in C++11 mode

Changed paths:
    common/rational.cpp
    common/rational.h


diff --git a/common/rational.cpp b/common/rational.cpp
index 90e4457..84c1e4b 100644
--- a/common/rational.cpp
+++ b/common/rational.cpp
@@ -51,6 +51,11 @@ Rational::Rational(int num, int denom) {
 	cancel();
 }
 
+Rational::Rational(const Rational &rational) {
+	_num   = rational._num;
+	_denom = rational._denom;
+}
+
 void Rational::cancel() {
 	// Cancel the fraction by dividing both the num and the denom
 	// by their greatest common divisor.
diff --git a/common/rational.h b/common/rational.h
index 89caaf2..bd240c9 100644
--- a/common/rational.h
+++ b/common/rational.h
@@ -34,6 +34,7 @@ public:
 	Rational();
 	Rational(int num);
 	Rational(int num, int denom);
+	Rational(const Rational &rational);
 
 	Rational &operator=(const Rational &right);
 	Rational &operator=(int right);


Commit: 09ed67d7f0247e72cf7f1dd3a242d9e6a86e0bae
    https://github.com/scummvm/scummvm/commit/09ed67d7f0247e72cf7f1dd3a242d9e6a86e0bae
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2019-11-10T21:04:29+01:00

Commit Message:
MOHAWK: MYST: Use OSystem::fillScreen now it works with all pixel formats

Changed paths:
    engines/mohawk/myst_graphics.cpp


diff --git a/engines/mohawk/myst_graphics.cpp b/engines/mohawk/myst_graphics.cpp
index b5222c6..c25fd28 100644
--- a/engines/mohawk/myst_graphics.cpp
+++ b/engines/mohawk/myst_graphics.cpp
@@ -892,15 +892,7 @@ void MystGraphics::replaceImageWithRect(uint16 destImage, uint16 sourceImage, co
 }
 
 void MystGraphics::clearScreen() {
-	Graphics::Surface *screen = _vm->_system->lockScreen();
-	if (screen) {
-		if (_vm->getFeatures() & GF_ME)
-			screen->fillRect(_viewport, _pixelFormat.RGBToColor(0, 0, 0));
-		else
-			screen->fillRect(_viewport, 0);
-
-		_vm->_system->unlockScreen();
-	}
+	_vm->_system->fillScreen(_pixelFormat.RGBToColor(0, 0, 0));
 }
 
 } // End of namespace Mohawk